From ec0baa9701bc97b76b927e71b1b5678e9e428e82 Mon Sep 17 00:00:00 2001
From: Udam Saini <udam@google.com>
Date: Mon, 21 Mar 2016 15:32:24 -0700
Subject: [PATCH] Updates spacing on redaction interstitial

Cleans up the look and feel on the redaction interstitial page

bug:27534261
Change-Id: I9495cfc9493f0d199b30335985761d069a29d42d
---
 res/layout/redaction_interstitial.xml | 86 +++++++++++++--------------
 res/values/dimens.xml                 |  3 +
 res/values/styles.xml                 |  6 ++
 3 files changed, 52 insertions(+), 43 deletions(-)

diff --git a/res/layout/redaction_interstitial.xml b/res/layout/redaction_interstitial.xml
index e7678ce004d..f48b917ec2c 100644
--- a/res/layout/redaction_interstitial.xml
+++ b/res/layout/redaction_interstitial.xml
@@ -17,61 +17,61 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:paddingStart="?attr/side_margin"
-        android:paddingEnd="?attr/side_margin">
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingStart="?attr/side_margin"
+    android:paddingEnd="?attr/side_margin">
 
     <TextView
-            android:id="@+id/message"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/redaction_vertical_margins"
-            android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
-            android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
-            android:text="@string/lock_screen_notifications_interstitial_message"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
+        android:id="@+id/message"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/redaction_vertical_margins"
+        android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
+        android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:text="@string/lock_screen_notifications_interstitial_message"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
 
     <RadioGroup
-            android:id="@+id/radio_group"
-            android:layout_width="wrap_content"
+        android:id="@+id/radio_group"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/redaction_vertical_margins"
+        android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
+        android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:checkedButton="@+id/redact_sensitive">
+
+        <com.android.settings.RestrictedRadioButton
+            android:id="@+id/show_all"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/redaction_vertical_margins"
-            android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
-            android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
-            android:checkedButton="@+id/redact_sensitive">
+            style="@style/RedactionItemAndLabel"
+            android:text="@string/lock_screen_notifications_summary_show" />
 
         <com.android.settings.RestrictedRadioButton
-                android:id="@+id/show_all"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/redaction_vertical_margins"
-                android:text="@string/lock_screen_notifications_summary_show" />
-
-        <com.android.settings.RestrictedRadioButton
-                android:id="@+id/redact_sensitive"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/redaction_vertical_margins"
-                android:text="@string/lock_screen_notifications_summary_hide" />
+            android:id="@+id/redact_sensitive"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            style="@style/RedactionItemAndLabel"
+            android:text="@string/lock_screen_notifications_summary_hide" />
 
         <RadioButton
-                android:id="@+id/hide_all"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/redaction_vertical_margins"
-                android:text="@string/lock_screen_notifications_summary_disable" />
+            android:id="@+id/hide_all"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            style="@style/RedactionItemAndLabel"
+            android:text="@string/lock_screen_notifications_summary_disable" />
 
     </RadioGroup>
 
     <CheckBox
-            android:id="@+id/lockscreen_remote_input"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/redaction_vertical_margins"
-            android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
-            android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
-            android:text="@string/lockscreen_remote_input" />
+        android:id="@+id/lockscreen_remote_input"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        style="@style/RedactionItemAndLabel"
+        android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
+        android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:text="@string/lockscreen_remote_input" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 9d4a97c75f2..3cd55038815 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -295,4 +295,7 @@
     <!-- Display Size and Font Size preview screen -->
     <dimen name="preview_pager_padding">8dp</dimen>
 
+    <!-- Padding between the radio buttons/checkbox and text on the redaction interstitial -->
+    <dimen name="redaction_padding_start">16dp</dimen>
+
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index acd658f3b46..45d2c1178a6 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -386,4 +386,10 @@
         <item name="android:gravity">center_vertical</item>
     </style>
 
+    <style name="RedactionItemAndLabel">
+        <item name="android:layout_marginTop">@dimen/redaction_vertical_margins</item>
+        <item name="android:paddingStart">@dimen/redaction_padding_start</item>
+        <item name="android:textAppearance">@android:style/TextAppearance.Material.Subhead</item>
+    </style>
+
 </resources>