Removes duplicated checkbox and fixes text alignment.

bug:27560337
bug:27534777
Change-Id: I2c4192dedcbcaec36f1bd5b507e984f7bf35b12e
This commit is contained in:
Udam Saini
2016-03-09 12:04:48 -08:00
parent 179a57b21f
commit c8787937f8
2 changed files with 8 additions and 19 deletions

View File

@@ -72,7 +72,6 @@
android:layout_marginTop="@dimen/redaction_vertical_margins" android:layout_marginTop="@dimen/redaction_vertical_margins"
android:layout_marginStart="?android:attr/listPreferredItemPaddingStart" android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd" android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
android:text="@string/lockscreen_remote_input" android:text="@string/lockscreen_remote_input" />
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout> </LinearLayout>

View File

@@ -44,7 +44,7 @@
<RadioGroup <RadioGroup
android:id="@+id/radio_group" android:id="@+id/radio_group"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/redaction_vertical_margins" android:layout_marginTop="@dimen/redaction_vertical_margins"
android:layout_marginStart="?android:attr/listPreferredItemPaddingStart" android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
@@ -72,27 +72,17 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/lock_screen_notifications_summary_disable" /> android:text="@string/lock_screen_notifications_summary_disable" />
<!-- CheckBox is styled with SuwRadioButton to make it line up nicely with the radios <!-- Place the checkbox inside RadioGroup and use SuwRadioButton style instead of
above. --> SuwCheckBox style so that the checkbox and text is aligned with radio buttons. -->
<CheckBox <CheckBox
android:id="@+id/lockscreen_remote_input" 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_height="wrap_content"
android:layout_marginTop="@dimen/suw_check_box_margin_top" android:layout_marginTop="@dimen/redaction_vertical_margins"
android:text="@string/lockscreen_remote_input" android:text="@string/lockscreen_remote_input" />
style="@style/SuwRadioButton" />
</RadioGroup> </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> </LinearLayout>
</com.android.setupwizardlib.SetupWizardLayout> </com.android.setupwizardlib.SetupWizardLayout>