PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Removes duplicated checkbox and fixes text alignment." into nyc-dev

Browse Source 
am: 22848ac901

* commit '22848ac90104bb668b6f2836e39a9ba141ee8a2f':
  Removes duplicated checkbox and fixes text alignment.
This commit is contained in:
Udam Saini
2016-03-10 00:49:21 +00:00
committed by android-build-merger
parent dd9187fcae 22848ac901
commit 66f1da6a26
2 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/layout/redaction_interstitial.xml
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>

24
res/layout/setup_redaction_interstitial.xml
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>