From c8787937f875e55b7ad7943dd67cd5025ac7e60f Mon Sep 17 00:00:00 2001
From: Udam Saini <udam@google.com>
Date: Wed, 9 Mar 2016 12:04:48 -0800
Subject: [PATCH] Removes duplicated checkbox and fixes text alignment.

bug:27560337
bug:27534777
Change-Id: I2c4192dedcbcaec36f1bd5b507e984f7bf35b12e
---
 res/layout/redaction_interstitial.xml       |  3 +--
 res/layout/setup_redaction_interstitial.xml | 24 ++++++---------------
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/res/layout/redaction_interstitial.xml b/res/layout/redaction_interstitial.xml
index aafeb1b79e0..1d30b6dae18 100644
--- a/res/layout/redaction_interstitial.xml
+++ b/res/layout/redaction_interstitial.xml
@@ -72,7 +72,6 @@
             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:textAppearance="?android:attr/textAppearanceMedium" />
+            android:text="@string/lockscreen_remote_input" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/setup_redaction_interstitial.xml b/res/layout/setup_redaction_interstitial.xml
index 59b7e084a0f..e0f2d94b361 100644
--- a/res/layout/setup_redaction_interstitial.xml
+++ b/res/layout/setup_redaction_interstitial.xml
@@ -44,7 +44,7 @@
 
         <RadioGroup
             android:id="@+id/radio_group"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/redaction_vertical_margins"
             android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
@@ -72,27 +72,17 @@
                 android:layout_height="wrap_content"
                 android:text="@string/lock_screen_notifications_summary_disable" />
 
-            <!-- CheckBox is styled with SuwRadioButton to make it line up nicely with the radios
-                 above. -->
+            <!-- Place the checkbox inside RadioGroup and use SuwRadioButton style instead of
+                 SuwCheckBox style so that the checkbox and text is aligned with radio buttons. -->
             <CheckBox
                 android:id="@+id/lockscreen_remote_input"
-                android:layout_width="match_parent"
+                style="@style/SuwRadioButton"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/suw_check_box_margin_top"
-                android:text="@string/lockscreen_remote_input"
-                style="@style/SuwRadioButton" />
+                android:layout_marginTop="@dimen/redaction_vertical_margins"
+                android:text="@string/lockscreen_remote_input" />
         </RadioGroup>
 
-        <CheckBox
-            android:id="@+id/lockscreen_remote_input"
-            style="@style/SuwCheckBox"
-            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" />
-
     </LinearLayout>
 
 </com.android.setupwizardlib.SetupWizardLayout>