karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Add menu items to Help and Feedback page

Browse Source
This commit is contained in:
Jimmy Shih
2014-01-08 15:46:41 -08:00
parent 33886cc2ad
commit 68f84c5d39
9 changed files with 87 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/res/layout/about.xml
-49
View File
@@ -1,49 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2008 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/ScrollView" >
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:orientation="vertical"
android:padding="8dp" >
<TextView
android:drawableLeft="@drawable/ic_launcher_my_tracks"
android:text="@string/about_copyright_notice"
style="@style/TextMedium.WithIcon" />
<TextView
android:text="@string/about_version"
style="@style/TextLarge" />
<TextView
android:id="@+id/about_version"
style="@style/AboutValue" />
<TextView
android:text="@string/about_support"
style="@style/TextLarge" />
<TextView
android:autoLink="web"
android:text="@string/my_tracks_support_url"
style="@style/AboutValue" />
<TextView
android:text="@string/about_privacy"
style="@style/TextLarge" />
<TextView
android:autoLink="web"
android:text="@string/my_tracks_privacy_url"
style="@style/AboutValue" />
</LinearLayout>
</ScrollView>
MyTracks/res/layout/help.xml
+8 -1
View File
@@ -26,6 +26,13 @@ limitations under the License.
</ScrollView>
<View style="@style/BottomButtonDivider" />
<LinearLayout style="@style/BottomButtonBar" >
<include layout="@layout/help_buttons" />
<Button
android:id="@+id/help_feedback"
android:layout_gravity="center"
android:text="@string/menu_feedback"
android:textAllCaps="true"
android:textColor="@android:color/white"
android:textSize="14sp"
style="@style/BottomButton" />
</LinearLayout>
</LinearLayout>
MyTracks/res/layout/help_buttons.xml
-28
View File
@@ -1,28 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2012 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<merge xmlns:android="http://schemas.android.com/apk/res/android" >
<Button
android:id="@+id/help_ok"
android:layout_gravity="left"
android:text="@string/generic_ok"
style="@style/BottomButton" />
<Button
android:id="@+id/help_about"
android:layout_gravity="right"
android:text="@string/help_about"
style="@style/BottomButton" />
</merge>