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

Merge "Allow DPMs to restrict Remote Input on Keyguard" into nyc-dev

Browse Source 
am: ef505d628a

* commit 'ef505d628ae96f175fca871013da8c24271667dc':
  Allow DPMs to restrict Remote Input on Keyguard

Change-Id: Ieaa1f148c3db5fc41e1bb51faf987eac1b896bd4
This commit is contained in:
Adrian Roos
2016-05-12 21:00:03 +00:00
committed by android-build-merger
parent d9dffc6080 ef505d628a
commit e7c67aae22
8 changed files with 138 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
res/layout/lockscreen_remote_input.xml
View File

@@ -15,14 +15,15 @@
~ limitations under the License
-->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<CheckBox
android:id="@+id/lockscreen_remote_input"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginStart="20dp"
android:paddingStart="20dp"
android:paddingEnd="?android:attr/dialogPreferredPadding"
@@ -32,4 +33,13 @@
android:gravity="center_vertical"
android:text="@string/lockscreen_remote_input"
/>
</FrameLayout>
<ImageView
android:id="@+id/restricted_lock_icon_remote_input"
android:layout_width="@dimen/restricted_icon_size"
android:layout_height="@dimen/restricted_icon_size"
android:src="@drawable/ic_info"
android:layout_marginEnd="?android:attr/dialogPreferredPadding"
android:layout_gravity="center_vertical"
android:scaleType="centerInside" />
</LinearLayout>

2
res/layout/redaction_interstitial.xml
View File

@@ -65,7 +65,7 @@
</RadioGroup>
<CheckBox
<com.android.settings.RestrictedCheckBox
android:id="@+id/lockscreen_remote_input"
android:layout_width="match_parent"
android:layout_height="wrap_content"

2
res/layout/setup_redaction_interstitial.xml
View File

@@ -74,7 +74,7 @@
<!-- 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
<com.android.settings.RestrictedRadioButton
android:id="@+id/lockscreen_remote_input"
style="@style/SuwRadioButton"
android:layout_width="wrap_content"