From ce80f4e39a1656a660b068d68dc79060f32322b5 Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Mon, 29 Apr 2013 12:33:54 -0700
Subject: [PATCH] merge heads

---
 MyTracks/res/values-v11/styles.xml | 22 ++++++++++++++----
 MyTracks/res/values-v13/styles.xml | 36 ++++++++++++++++++++++++++++++
 MyTracks/res/values-v14/styles.xml | 36 +++++++++++++++++++++++++++---
 MyTracks/res/values/styles.xml     | 13 +++++------
 4 files changed, 93 insertions(+), 14 deletions(-)
 create mode 100644 MyTracks/res/values-v13/styles.xml

diff --git a/MyTracks/res/values-v11/styles.xml b/MyTracks/res/values-v11/styles.xml
index 4d3342642..97ec9f98c 100644
--- a/MyTracks/res/values-v11/styles.xml
+++ b/MyTracks/res/values-v11/styles.xml
@@ -15,11 +15,25 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
-  <style name="ThemeSelector" parent="android:Theme.Holo">>
-    <item name="android:actionBarStyle">@style/MyTracksActionBar</item>
-  </style> 
+  <style name="BottomButton" parent="@android:style/Widget.Holo.Button.Borderless">
+    <!-- Same as BottomButton in values/styles.xml except inheriting from a parent -->
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:layout_weight">1</item>
+    <item name="android:layout_width">0dp</item>
+    <item name="android:maxLines">2</item>
+  </style>
+  <style name="BottomButtonBar" parent="@android:style/Holo.ButtonBar">
+    <!-- Same as BottomButtonBar in values/styles.xml except inheriting from a parent -->
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:layout_width">match_parent</item>
+    <item name="android:orientation">horizontal</item>
+    <item name="android:measureWithLargestChild">true</item>
+  </style>
   <style name="MyTracksActionBar" parent="@android:style/Widget.Holo.ActionBar">
     <!-- Same image as the source except using a grey line instead of a blue line -->
     <item name="android:background">@drawable/ab_transparent_dark_holo</item>
   </style>
-</resources>
+  <style name="ThemeSelector" parent="android:Theme.Holo">
+    <item name="android:actionBarStyle">@style/MyTracksActionBar</item>
+  </style>
+</resources>
\ No newline at end of file
diff --git a/MyTracks/res/values-v13/styles.xml b/MyTracks/res/values-v13/styles.xml
new file mode 100644
index 000000000..75d3add23
--- /dev/null
+++ b/MyTracks/res/values-v13/styles.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2013 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.
+-->
+<resources>
+  <!-- The style for large size text -->
+  <style name="TextLarge" parent="@android:style/TextAppearance.Holo.Large">
+    <!-- same as TextLarge in values/styles.xml except inheriting from a parent instead of specifying textSize -->
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:layout_width">wrap_content</item>
+  </style>
+  <!-- The style for medium size text -->
+  <style name="TextMedium" parent="@android:style/TextAppearance.Holo.Medium">
+    <!-- same as TextMedium in values/styles.xml except inheriting from a parent instead of specifying textSize -->
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:layout_width">wrap_content</item>
+  </style>
+  <!-- The style for small size text -->
+  <style name="TextSmall" parent="@android:style/TextAppearance.Holo.Small">
+    <!-- same as TextSmall in values/styles.xml except inheriting from a parent instead of specifying textSize -->
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:layout_width">wrap_content</item>
+  </style>
+</resources>
\ No newline at end of file
diff --git a/MyTracks/res/values-v14/styles.xml b/MyTracks/res/values-v14/styles.xml
index 02a87f9e3..b3fb1217b 100644
--- a/MyTracks/res/values-v14/styles.xml
+++ b/MyTracks/res/values-v14/styles.xml
@@ -14,23 +14,53 @@ 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.
 -->
-<resources>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
   <!-- The style for choose activity text -->
-  <style name="TextChooseActivity">
+  <style name="BottomButton" parent="@android:style/Widget.DeviceDefault.Button.Borderless">
+    <!-- Same as BottomButton in values/styles.xml except inheriting from a parent -->
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:layout_weight">1</item>
+    <item name="android:layout_width">0dp</item>
+    <item name="android:maxLines">2</item>
+  </style>
+  <style name="BottomButtonBar" parent="@android:style/DeviceDefault.ButtonBar">
+    <!-- Same as BottomButtonBar in values/styles.xml except inheriting from a parent and adding measureWithLargestChild -->
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:layout_width">match_parent</item>
+    <item name="android:orientation">horizontal</item>
+    <item name="android:measureWithLargestChild">true</item>
+  </style>
+  <style name="TextChooseActivity"> 
+    <!-- Same as TextChooseActivity in values/styles.xml except removing textSize and using textAppearance -->
+    <!-- However, not able to specify textAppearance to @android:attr/textAppearanceListItemSmall -->
   </style>
   <!-- The style for large size text -->
   <style name="TextLarge" parent="@android:style/TextAppearance.DeviceDefault.Large">
+    <!-- same as TextLarge in values/styles.xml except inheriting from a parent instead of specifying textSize -->
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_width">wrap_content</item>
   </style>
   <!-- The style for medium size text -->
   <style name="TextMedium" parent="@android:style/TextAppearance.DeviceDefault.Medium">
+    <!-- same as TextMedium in values/styles.xml except inheriting from a parent instead of specifying textSize -->
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_width">wrap_content</item>
   </style>
   <!-- The style for small size text -->
   <style name="TextSmall" parent="@android:style/TextAppearance.DeviceDefault.Small">
+    <!-- same as TextSmall in values/styles.xml except inheriting from a parent instead of specifying textSize -->
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_width">wrap_content</item>
   </style>
-</resources>
+  <style name="TrackWidgetLabel">
+    <!-- same as TrackWidgetLabel in values/styles.xml except adding textAllCaps -->
+    <item name="android:layout_gravity">center_horizontal</item>
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:layout_width">wrap_content</item>
+    <item name="android:singleLine">true</item>
+    <item name="android:textColor">@color/orange</item>
+    <item name="android:textSize">10dp</item>
+    <item name="android:textStyle">bold</item>
+    <item name="android:textAllCaps">true</item>
+  </style>
+</resources>
\ No newline at end of file
diff --git a/MyTracks/res/values/styles.xml b/MyTracks/res/values/styles.xml
index 9d4206235..07ebb8e61 100644
--- a/MyTracks/res/values/styles.xml
+++ b/MyTracks/res/values/styles.xml
@@ -20,18 +20,17 @@ limitations under the License.
     <item name="android:paddingLeft">48dp</item>
   </style>
   <!-- bottom button -->
-  <style name="BottomButton" parent="@android:style/Widget.DeviceDefault.Button.Borderless">
+  <style name="BottomButton">
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_weight">1</item>
     <item name="android:layout_width">0dp</item>
     <item name="android:maxLines">2</item>
   </style>
   <!-- bottom button bar -->
-  <style name="BottomButtonBar" parent="@android:style/DeviceDefault.ButtonBar">
+  <style name="BottomButtonBar">
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_width">match_parent</item>
     <item name="android:orientation">horizontal</item>
-    <item name="android:measureWithLargestChild">true</item>
   </style>
   <!-- choose upload service checkbox -->
   <style name="ChooseUploadServiceCheckBox" parent="@style/TextMedium">
@@ -290,7 +289,6 @@ limitations under the License.
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_width">wrap_content</item>
     <item name="android:singleLine">true</item>
-    <item name="android:textAllCaps">true</item>
     <item name="android:textColor">@color/orange</item>
     <item name="android:textSize">10dp</item>
     <item name="android:textStyle">bold</item>
@@ -348,21 +346,22 @@ limitations under the License.
     <item name="android:textSize">18dp</item>
   </style>
   <!-- track widget value -->
-  <style name="TrackWidgetValue" parent="@style/TextMedium">
+  <style name="TrackWidgetValue">    
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_weight">2</item>
     <item name="android:layout_width">0dp</item>
     <item name="android:singleLine">true</item>
     <item name="android:textColor">@android:color/white</item>
+    <item name="android:textSize">18dp</item>
     <item name="android:textStyle">bold</item>
   </style>
   <!-- track widget value 4x3 -->
   <style name="TrackWidgetValue4x3" parent="@style/TrackWidgetValue">
-    <item name="android:textSize">28sp</item>
+    <item name="android:textSize">28dp</item>
   </style>
   <!-- track widget value 4x4 -->
   <style name="TrackWidgetValue4x4" parent="@style/TrackWidgetValue">
-    <item name="android:textSize">36sp</item>
+    <item name="android:textSize">36dp</item>
   </style>
   <!-- track widget value container -->
   <style name="TrackWidgetValueContainer">