From 191fdf88ea828c9e40df93fa61953f9d2ffb1fb3 Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Wed, 20 Jun 2012 16:34:33 -0700
Subject: [PATCH] Fix text size in choose activity for API level less than 14.

---
 MyTracks/res/layout/choose_activity_list_item.xml | 6 ++++--
 MyTracks/res/values-v14/styles.xml                | 5 ++++-
 MyTracks/res/values/styles.xml                    | 8 +++++++-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/MyTracks/res/layout/choose_activity_list_item.xml b/MyTracks/res/layout/choose_activity_list_item.xml
index 86bff7de9..60b4758c9 100644
--- a/MyTracks/res/layout/choose_activity_list_item.xml
+++ b/MyTracks/res/layout/choose_activity_list_item.xml
@@ -39,13 +39,15 @@ limitations under the License.
       android:layout_width="wrap_content"
       android:maxLines="2"
       android:paddingLeft="16dp"
-      android:textAppearance="?android:attr/textAppearanceListItemSmall" />
+      android:textAppearance="?android:attr/textAppearanceListItemSmall"
+      style="@style/TextChooseActivity" />
     <TextView
       android:id="@+id/choose_activity_list_item_text2"
       android:layout_height="wrap_content"
       android:layout_width="wrap_content"
       android:maxLines="2"
       android:paddingLeft="16dp"
-      android:textAppearance="?android:attr/textAppearanceSmall" />
+      android:textAppearance="?android:attr/textAppearanceListItemSmall"
+      style="@style/TextChooseActivity" />
   </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/MyTracks/res/values-v14/styles.xml b/MyTracks/res/values-v14/styles.xml
index 535c36411..02a87f9e3 100644
--- a/MyTracks/res/values-v14/styles.xml
+++ b/MyTracks/res/values-v14/styles.xml
@@ -15,6 +15,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources>
+  <!-- The style for choose activity text -->
+  <style name="TextChooseActivity">
+  </style>
   <!-- The style for large size text -->
   <style name="TextLarge" parent="@android:style/TextAppearance.DeviceDefault.Large">
     <item name="android:layout_height">wrap_content</item>
@@ -25,7 +28,7 @@ limitations under the License.
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_width">wrap_content</item>
   </style>
-  <!-- The style for large size text -->
+  <!-- The style for small size text -->
   <style name="TextSmall" parent="@android:style/TextAppearance.DeviceDefault.Small">
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_width">wrap_content</item>
diff --git a/MyTracks/res/values/styles.xml b/MyTracks/res/values/styles.xml
index f733025ba..b48e93846 100644
--- a/MyTracks/res/values/styles.xml
+++ b/MyTracks/res/values/styles.xml
@@ -143,10 +143,15 @@ limitations under the License.
     <item name="android:paddingRight">8dp</item>
     <item name="android:textColor">@android:color/primary_text_light</item>
   </style>
+  <!-- The style for choose activity text -->
+  <style name="TextChooseActivity">
+    <item name="android:textSize">18sp</item>
+  </style>
   <!-- The style for large size text -->
   <style name="TextLarge">
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_width">wrap_content</item>
+    <item name="android:textColor">?android:textColorPrimary</item>
     <item name="android:textSize">22sp</item>
   </style>
   <!-- The style for large size text with top margin -->
@@ -157,6 +162,7 @@ limitations under the License.
   <style name="TextMedium">
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_width">wrap_content</item>
+    <item name="android:textColor">?android:textColorPrimary</item>
     <item name="android:textSize">18sp</item>
   </style>
   <!-- The style for medium size text with an icon on the left -->
@@ -164,7 +170,7 @@ limitations under the License.
     <item name="android:drawablePadding">8dp</item>
     <item name="android:gravity">center_vertical</item>
   </style>
-  <!-- The style for large size text -->
+  <!-- The style for small size text -->
   <style name="TextSmall">
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_width">wrap_content</item>