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

Fix buttons so that they can support 2 lines of text.

Browse Source
This commit is contained in:
Jimmy Shih
2012-09-06 14:53:59 -07:00
parent eef7279319
commit 868a42f106
7 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/res/layout-v14/help_buttons.xml
+2
View File
@@ -17,10 +17,12 @@ limitations under the License.
<merge xmlns:android="http://schemas.android.com/apk/res/android" > <merge xmlns:android="http://schemas.android.com/apk/res/android" >
<Button <Button
android:id="@+id/help_about" android:id="@+id/help_about"
android:layout_gravity="left"
android:text="@string/help_about" android:text="@string/help_about"
style="@style/BottomButton" /> style="@style/BottomButton" />
<Button <Button
android:id="@+id/help_ok" android:id="@+id/help_ok"
android:layout_gravity="right"
android:text="@string/generic_ok" android:text="@string/generic_ok"
style="@style/BottomButton" /> style="@style/BottomButton" />
</merge> </merge>
MyTracks/res/layout-v14/marker_edit_buttons.xml
+2
View File
@@ -17,9 +17,11 @@ limitations under the License.
<merge xmlns:android="http://schemas.android.com/apk/res/android" > <merge xmlns:android="http://schemas.android.com/apk/res/android" >
<Button <Button
android:id="@+id/marker_edit_cancel" android:id="@+id/marker_edit_cancel"
android:layout_gravity="left"
android:text="@string/generic_cancel" android:text="@string/generic_cancel"
style="@style/BottomButton" /> style="@style/BottomButton" />
<Button <Button
android:id="@+id/marker_edit_done" android:id="@+id/marker_edit_done"
android:layout_gravity="right"
style="@style/BottomButton" /> style="@style/BottomButton" />
</merge> </merge>
MyTracks/res/layout-v14/track_edit_buttons.xml
+2
View File
@@ -17,10 +17,12 @@ limitations under the License.
<merge xmlns:android="http://schemas.android.com/apk/res/android" > <merge xmlns:android="http://schemas.android.com/apk/res/android" >
<Button <Button
android:id="@+id/track_edit_cancel" android:id="@+id/track_edit_cancel"
android:layout_gravity="left"
android:text="@string/generic_cancel" android:text="@string/generic_cancel"
style="@style/BottomButton" /> style="@style/BottomButton" />
<Button <Button
android:id="@+id/track_edit_save" android:id="@+id/track_edit_save"
android:layout_gravity="right"
android:text="@string/generic_save" android:text="@string/generic_save"
style="@style/BottomButton" /> style="@style/BottomButton" />
</merge> </merge>
MyTracks/res/layout/help_buttons.xml
+2
View File
@@ -17,10 +17,12 @@ limitations under the License.
<merge xmlns:android="http://schemas.android.com/apk/res/android" > <merge xmlns:android="http://schemas.android.com/apk/res/android" >
<Button <Button
android:id="@+id/help_ok" android:id="@+id/help_ok"
android:layout_gravity="left"
android:text="@string/generic_ok" android:text="@string/generic_ok"
style="@style/BottomButton" /> style="@style/BottomButton" />
<Button <Button
android:id="@+id/help_about" android:id="@+id/help_about"
android:layout_gravity="right"
android:text="@string/help_about" android:text="@string/help_about"
style="@style/BottomButton" /> style="@style/BottomButton" />
</merge> </merge>
MyTracks/res/layout/marker_edit_buttons.xml
+2
View File
@@ -17,9 +17,11 @@ limitations under the License.
<merge xmlns:android="http://schemas.android.com/apk/res/android" > <merge xmlns:android="http://schemas.android.com/apk/res/android" >
<Button <Button
android:id="@+id/marker_edit_done" android:id="@+id/marker_edit_done"
android:layout_gravity="left"
style="@style/BottomButton" /> style="@style/BottomButton" />
<Button <Button
android:id="@+id/marker_edit_cancel" android:id="@+id/marker_edit_cancel"
android:layout_gravity="right"
android:text="@string/generic_cancel" android:text="@string/generic_cancel"
style="@style/BottomButton" /> style="@style/BottomButton" />
</merge> </merge>
MyTracks/res/layout/track_edit_buttons.xml
+2
View File
@@ -17,10 +17,12 @@ limitations under the License.
<merge xmlns:android="http://schemas.android.com/apk/res/android" > <merge xmlns:android="http://schemas.android.com/apk/res/android" >
<Button <Button
android:id="@+id/track_edit_save" android:id="@+id/track_edit_save"
android:layout_gravity="left"
android:text="@string/generic_save" android:text="@string/generic_save"
style="@style/BottomButton" /> style="@style/BottomButton" />
<Button <Button
android:id="@+id/track_edit_cancel" android:id="@+id/track_edit_cancel"
android:layout_gravity="right"
android:text="@string/generic_cancel" android:text="@string/generic_cancel"
style="@style/BottomButton" /> style="@style/BottomButton" />
</merge> </merge>
MyTracks/res/values/styles.xml
+2
View File
@@ -24,12 +24,14 @@ limitations under the License.
<item name="android:layout_height">wrap_content</item> <item name="android:layout_height">wrap_content</item>
<item name="android:layout_weight">1</item> <item name="android:layout_weight">1</item>
<item name="android:layout_width">0dp</item> <item name="android:layout_width">0dp</item>
<item name="android:maxLines">2</item>
</style> </style>
<!-- The style for the bottom button bar --> <!-- The style for the bottom button bar -->
<style name="BottomButtonBar" parent="@android:style/DeviceDefault.ButtonBar"> <style name="BottomButtonBar" parent="@android:style/DeviceDefault.ButtonBar">
<item name="android:layout_height">wrap_content</item> <item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">fill_parent</item> <item name="android:layout_width">fill_parent</item>
<item name="android:orientation">horizontal</item> <item name="android:orientation">horizontal</item>
<item name="android:measureWithLargestChild">true</item>
</style> </style>
<!-- The style for choose upload service check box --> <!-- The style for choose upload service check box -->
<style name="ChooseUploadServiceCheckBox" parent="@style/TextMedium"> <style name="ChooseUploadServiceCheckBox" parent="@style/TextMedium">