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

resolve merge conflicts of 333ba2d to nyc-mr1-dev

Browse Source 
Change-Id: I32f284bb2216755ae0ddbea4b7fc76a38c7aa7e2
This commit is contained in:
Adrian Roos
2016-06-16 18:54:50 -07:00
parent eddcd7d085 333ba2df01
commit bd470255d0
6 changed files with 31 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
res/layout/redaction_interstitial.xml
View File

@@ -64,16 +64,6 @@
android:layout_height="wrap_content"
android:text="@string/lock_screen_notifications_summary_disable" />
<!-- Place the checkbox inside RadioGroup and use SuwRadioButton style instead of
SuwCheckBox style so that the checkbox and text is aligned with radio buttons. -->
<com.android.settings.RestrictedCheckBox
android:id="@+id/lockscreen_remote_input"
style="@style/SuwRadioButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/redaction_vertical_margins"
android:text="@string/lockscreen_remote_input" />
</RadioGroup>
<Button