From 2082fea1fbad21dc9d6e07c98151640bfbc169c2 Mon Sep 17 00:00:00 2001
From: d34d <clark@cyngn.com>
Date: Tue, 21 Apr 2015 20:19:30 -0700
Subject: Remove direct references to private framework resources

This will allow us to distribute the chooser.  Private resources
were either redefined in our xml or reflection is used to retrieve
these values in code.

Change-Id: I8c901abef6a5492094d4b86752368625a385bb47
---
 res/layout/bottom_actions.xml      |  2 +-
 res/layout/component_selector.xml  |  2 +-
 res/layout/fragment_pager_list.xml |  2 +-
 res/layout/navbar_card.xml         |  2 +-
 res/layout/save_apply_button.xml   |  2 +-
 res/layout/status_bar_card.xml     | 10 +++++-----
 res/values/dimens.xml              |  7 ++++++-
 res/values/styles.xml              |  4 +++-
 8 files changed, 19 insertions(+), 12 deletions(-)

(limited to 'res')

diff --git a/res/layout/bottom_actions.xml b/res/layout/bottom_actions.xml
index b2eb936..0797ced 100644
--- a/res/layout/bottom_actions.xml
+++ b/res/layout/bottom_actions.xml
@@ -77,5 +77,5 @@
 
     <com.cyngn.theme.widget.NavBarSpace
         android:layout_width="match_parent"
-        android:layout_height="@*android:dimen/navigation_bar_height"/>
+        android:layout_height="@dimen/navigation_bar_height"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/component_selector.xml b/res/layout/component_selector.xml
index 7c2bd53..747e776 100644
--- a/res/layout/component_selector.xml
+++ b/res/layout/component_selector.xml
@@ -30,5 +30,5 @@
 
     <com.cyngn.theme.widget.NavBarSpace
         android:layout_width="match_parent"
-        android:layout_height="@*android:dimen/navigation_bar_height"/>
+        android:layout_height="@dimen/navigation_bar_height"/>
 </com.cyngn.theme.chooser.ComponentSelector>
\ No newline at end of file
diff --git a/res/layout/fragment_pager_list.xml b/res/layout/fragment_pager_list.xml
index 5e30f13..fc08626 100644
--- a/res/layout/fragment_pager_list.xml
+++ b/res/layout/fragment_pager_list.xml
@@ -198,7 +198,7 @@
 
                 <com.cyngn.theme.widget.NavBarSpace
                     android:layout_width="match_parent"
-                    android:layout_height="@*android:dimen/navigation_bar_height" />
+                    android:layout_height="@dimen/navigation_bar_height" />
             </LinearLayout>
         </LinearLayout>
     </com.cyngn.theme.widget.LockableScrollView>
diff --git a/res/layout/navbar_card.xml b/res/layout/navbar_card.xml
index bc95df0..729d789 100644
--- a/res/layout/navbar_card.xml
+++ b/res/layout/navbar_card.xml
@@ -27,7 +27,7 @@
             android:id="@+id/navigation_bar"
             android:orientation="horizontal"
             android:layout_width="match_parent"
-            android:layout_height="@*android:dimen/navigation_bar_height"
+            android:layout_height="@dimen/navigation_bar_height"
             android:paddingStart="6dp"
             android:paddingEnd="6dp"
             android:background="#000">
diff --git a/res/layout/save_apply_button.xml b/res/layout/save_apply_button.xml
index c1791f1..edbe962 100644
--- a/res/layout/save_apply_button.xml
+++ b/res/layout/save_apply_button.xml
@@ -32,6 +32,6 @@
 
     <com.cyngn.theme.widget.NavBarSpace
         android:layout_width="match_parent"
-        android:layout_height="@*android:dimen/navigation_bar_height"/>
+        android:layout_height="@dimen/navigation_bar_height"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/status_bar_card.xml b/res/layout/status_bar_card.xml
index ad50167..96e4113 100644
--- a/res/layout/status_bar_card.xml
+++ b/res/layout/status_bar_card.xml
@@ -28,7 +28,7 @@
             android:id="@+id/status_bar"
             android:orientation="horizontal"
             android:layout_width="match_parent"
-            android:layout_height="@*android:dimen/status_bar_height"
+            android:layout_height="@dimen/status_bar_height"
             android:paddingEnd="6dp"
             android:background="#000">
 
@@ -41,7 +41,7 @@
             <ImageView
                 android:id="@+id/bluetooth_icon"
                 android:layout_width="wrap_content"
-                android:layout_height="@*android:dimen/status_bar_icon_size"
+                android:layout_height="@dimen/status_bar_icon_size"
                 android:layout_gravity="center_vertical"
                 android:paddingEnd="6dp"
                 android:scaleType="fitCenter"/>
@@ -49,14 +49,14 @@
             <ImageView
                 android:id="@+id/wifi_icon"
                 android:layout_width="wrap_content"
-                android:layout_height="@*android:dimen/status_bar_icon_size"
+                android:layout_height="@dimen/status_bar_icon_size"
                 android:layout_gravity="center_vertical"
                 android:scaleType="fitCenter"/>
 
             <ImageView
                 android:id="@+id/signal_icon"
                 android:layout_width="wrap_content"
-                android:layout_height="@*android:dimen/status_bar_icon_size"
+                android:layout_height="@dimen/status_bar_icon_size"
                 android:layout_gravity="center_vertical"
                 android:paddingEnd="6dp"
                 android:scaleType="fitCenter"/>
@@ -64,7 +64,7 @@
             <ImageView
                 android:id="@+id/battery"
                 android:layout_width="wrap_content"
-                android:layout_height="@*android:dimen/status_bar_icon_size"
+                android:layout_height="@dimen/status_bar_icon_size"
                 android:layout_gravity="center_vertical"
                 android:paddingEnd="6dp"
                 android:scaleType="fitCenter"/>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 8c9ee88..e5b909b 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -62,7 +62,12 @@
     <dimen name="apply_progress_padding">10dp</dimen>
     <dimen name="apply_progress_height">24dp</dimen>
 
-    <dimen name="system_bar_height">@*android:dimen/navigation_bar_height</dimen>
+    <!-- Height of the bottom navigation / system bar. -->
+    <dimen name="navigation_bar_height">48dp</dimen>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">25dp</dimen>
+    <!-- Height of notification icons in the status bar -->
+    <dimen name="status_bar_icon_size">24dp</dimen>
     <dimen name="expand_collapse_child_offset">12dp</dimen>
 
     <dimen name="shop_themes_margin_bottom">24dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 71dd055..124bd8e 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -39,10 +39,12 @@
         <item name="android:textSize">16sp</item>
     </style>
 
-    <style name="TextAppearance.StatusBar.Clock" parent="@*android:style/TextAppearance.StatusBar.Icon">
+    <style name="TextAppearance.StatusBar.Clock" parent="">
+        <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
         <!-- Note: must be dp to fit in status bar -->
         <item name="android:textSize">16dp</item>
         <item name="android:textStyle">normal</item>
+        <item name="android:fontFamily">sans-serif</item>
     </style>
 
     <style name="status_bar_component_icon">
-- 
cgit v1.1