Expose values for themes.

Move category margin dimension to exposed value. Add background
to category title textview and make value accessible via
cm_colors. Clean up formatting in cm_colors.

Ticket: CYNGNOS-2154
Change-Id: Ie9241cae3ea067fccbedd43231b52e3c80f8bd97

diff --git a/res/layout/dashboard_category.xml b/res/layout/dashboard_category.xml
index 1ceeebf..730f18e 100644 (file)
--- a/res/layout/dashboard_category.xml
+++ b/res/layout/dashboard_category.xml
@@ -22,7 +22,7 @@
         android:paddingEnd="@dimen/dashboard_category_padding_end"
         android:orientation="vertical"
         android:background="@color/dashboard_category_background_color"
-        android:layout_marginBottom="8dip"
+        android:layout_marginBottom="@dimen/dashboard_category_margin_bottom"
         android:elevation="@dimen/dashboard_category_elevation">
 
     <TextView android:id="@+id/category_title"
@@ -34,6 +34,7 @@
             android:gravity="center_vertical"
             android:textAppearance="@style/TextAppearance.CategoryTitle"
             android:textAlignment="viewStart"
+            android:background="@color/dashboard_category_title_bg_color"
             />
 
     <com.android.settings.dashboard.DashboardContainerView

diff --git a/res/values/cm_colors.xml b/res/values/cm_colors.xml
index 6eddc52..914cf4a 100644 (file)
--- a/res/values/cm_colors.xml
+++ b/res/values/cm_colors.xml
@@ -99,4 +99,7 @@ limitations under the License.
     <!-- App Name Text Color -->
     <color name="app_name_text_color">@color/text_color_white</color>
 
+    <!-- Dashboard Category Title Background Color -->
+    <color name="dashboard_category_title_bg_color">@android:color/transparent</color>
+
 </resources>

diff --git a/res/values/cm_dimens.xml b/res/values/cm_dimens.xml
index 4298d79..b1f11d7 100644 (file)
--- a/res/values/cm_dimens.xml
+++ b/res/values/cm_dimens.xml
@@ -22,4 +22,7 @@
     <dimen name="pa_security_width">320dp</dimen>
     <!-- Height of the sliding KeyguardSecurityContainer (includes 2x keyguard_security_view_margin) -->
     <dimen name="pa_security_height">400dp</dimen>
+
+    <!-- Dashboard Category Margin Bottom -->
+    <dimen name="dashboard_category_margin_bottom">8dip</dimen>
 </resources>