Merge "Support remote device credentials validation in UI." (a56e6c87) · Commits · e / os / android_packages_apps_Settings

Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -87,6 +87,7 @@ android_library {
		"fuelgauge-log-protos-lite",
		"fuelgauge-usage-state-protos-lite",
		"contextualcards",
		"securebox",
		"settings-logtags",
		"statslog-settings",
		"zxing-core-1.7",

+12 −0

Original line number	Diff line number	Diff line
		@@ -90,6 +90,7 @@
		<uses-permission android:name="android.permission.MANAGE_DEVICE_ADMINS" />
		<uses-permission android:name="android.permission.READ_SEARCH_INDEXABLES" />
		<uses-permission android:name="android.permission.BIND_SETTINGS_SUGGESTIONS_SERVICE" />
		<uses-permission android:name="android.permission.BIND_REMOTE_LOCKSCREEN_VALIDATION_SERVICE" />
		<uses-permission android:name="android.permission.OEM_UNLOCK_STATE" />
		<uses-permission android:name="android.permission.MANAGE_USER_OEM_UNLOCK_STATE" />
		<uses-permission android:name="android.permission.OVERRIDE_WIFI_CONFIG" />
		@@ -2372,6 +2373,17 @@
		<activity-alias android:name=".ConfirmDeviceCredentialActivity"
		android:targetActivity=".password.ConfirmDeviceCredentialActivity"
		android:exported="true" />
		<!-- Activity alias for remote lockscreen validation. Enforces required permission -->
		<activity-alias
		android:name=".ConfirmRemoteDeviceCredentialActivity"
		android:targetActivity=".password.ConfirmDeviceCredentialActivity"
		android:permission="android.permission.CHECK_REMOTE_LOCKSCREEN"
		android:exported="true">
		<intent-filter>
		<action android:name="android.app.action.CONFIRM_REMOTE_DEVICE_CREDENTIAL"/>
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		</activity-alias>

		<!-- Note this must not be exported since it authenticates the given user -->
		<activity android:name=".password.ConfirmDeviceCredentialActivity$InternalActivity"

+13 −1

Original line number	Diff line number	Diff line
		@@ -15,10 +15,12 @@
		-->
		<com.google.android.setupdesign.GlifLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:app="http://schemas.android.com/apk/res-auto"
		android:id="@+id/setup_wizard_layout"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:icon="@drawable/ic_lock">
		android:icon="@drawable/ic_lock"
		app:sudUseBottomProgressBar="true">

		<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
		android:id="@+id/topLayout"
		@@ -60,6 +62,16 @@
		android:layout_marginEnd="?attr/sudMarginEnd"
		android:gravity="center_vertical"/>

		<CheckBox
		android:id="@+id/checkbox"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginStart="?attr/sudMarginStart"
		android:layout_marginEnd="?attr/sudMarginEnd"
		android:layout_marginTop="12dp"
		android:visibility="gone"
		android:checked="true" />

		<Button
		android:id="@+id/cancelButton"
		style="@style/SudGlifButton.Secondary"

+14 −9

Original line number	Diff line number	Diff line
		@@ -15,11 +15,13 @@
		-->
		<com.google.android.setupdesign.GlifLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:app="http://schemas.android.com/apk/res-auto"
		android:id="@+id/setup_wizard_layout"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:icon="@drawable/ic_lock"
		android:importantForAutofill="noExcludeDescendants">
		android:importantForAutofill="noExcludeDescendants"
		app:sudUseBottomProgressBar="true">

		<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
		android:id="@+id/topLayout"
		@@ -27,14 +29,6 @@
		android:layout_width="match_parent"
		android:layout_height="match_parent">

		<TextView
		android:id="@+id/sud_layout_description"
		style="@style/SudDescription.Glif"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginStart="?attr/sudMarginStart"
		android:layout_marginEnd="?attr/sudMarginEnd" />

		<Space
		android:layout_width="match_parent"
		android:layout_height="0dp"
		@@ -73,6 +67,17 @@
		android:layout_height="0dp"
		android:layout_weight="1" />

		<CheckBox
		android:id="@+id/checkbox"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginStart="?attr/sudMarginStart"
		android:layout_marginEnd="?attr/sudMarginEnd"
		android:layout_marginTop="12dp"
		android:layout_gravity="center_horizontal"
		android:visibility="gone"
		android:checked="true" />

		<Button
		android:id="@+id/cancelButton"
		style="@style/SudGlifButton.Secondary"

+13 −2

Original line number	Diff line number	Diff line
		@@ -15,10 +15,12 @@
		-->
		<com.google.android.setupdesign.GlifLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:app="http://schemas.android.com/apk/res-auto"
		android:id="@+id/setup_wizard_layout"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:icon="@drawable/ic_lock">
		android:icon="@drawable/ic_lock"
		app:sudUseBottomProgressBar="true">

		<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
		android:id="@+id/topLayout"
		@@ -61,6 +63,16 @@
		android:layout_marginTop="12dp"
		android:gravity="center_vertical"/>

		<CheckBox
		android:id="@+id/checkbox"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginStart="?attr/sudMarginStart"
		android:layout_marginEnd="?attr/sudMarginEnd"
		android:layout_marginTop="12dp"
		android:visibility="gone"
		android:checked="true" />

		<Button
		android:id="@+id/cancelButton"
		style="@style/SudGlifButton.Secondary"
		@@ -68,7 +80,6 @@
		android:layout_height="wrap_content"
		android:layout_marginStart="?attr/sudMarginStart"
		android:layout_marginEnd="?attr/sudMarginEnd"
		android:layout_marginBottom="80dp"
		android:text="@string/cancel" />

		<Button