release-request-3d5caee4-4521-41aa-a12d-c7fe56321882-for-git_oc-dr1-release-40... (44615003) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+33 −15

Original line number	Diff line number	Diff line
		@@ -1497,7 +1497,7 @@
		<!-- Second and third-level settings -->

		<!-- Lock screen settings -->
		<activity android:name="ConfirmDeviceCredentialActivity"
		<activity android:name=".password.ConfirmDeviceCredentialActivity"
		android:exported="true"
		android:theme="@android:style/Theme.NoDisplay">
		<intent-filter android:priority="1">
		@@ -1505,9 +1505,13 @@
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		</activity>
		<!-- Activity alias for compatibility -->
		<activity-alias android:name=".ConfirmDeviceCredentialActivity"
		android:targetActivity=".password.ConfirmDeviceCredentialActivity"
		android:exported="true" />

		<!-- Note this must not be exported since it authenticates the given user -->
		<activity android:name="ConfirmDeviceCredentialActivity$InternalActivity"
		<activity android:name=".password.ConfirmDeviceCredentialActivity$InternalActivity"
		android:exported="false"
		android:permission="android.permission.MANAGE_USERS"
		android:resizeableActivity="false"
		@@ -1548,10 +1552,10 @@
		</intent-filter>
		</activity>

		<activity android:name="ConfirmLockPattern"
		<activity android:name=".password.ConfirmLockPattern"
		android:theme="@style/GlifTheme.Light"/>

		<activity android:name="ConfirmLockPassword"
		<activity android:name=".password.ConfirmLockPassword"
		android:windowSoftInputMode="stateHidden\|adjustResize"
		android:theme="@style/GlifTheme.Light"/>

		@@ -1593,17 +1597,17 @@
		</activity>

		<!-- Note this must not be exported since it returns the password in the intent -->
		<activity android:name="ConfirmLockPattern$InternalActivity"
		<activity android:name=".password.ConfirmLockPattern$InternalActivity"
		android:exported="false"
		android:theme="@style/GlifTheme.Light"/>

		<!-- Note this must not be exported since it returns the password in the intent -->
		<activity android:name="ConfirmLockPassword$InternalActivity"
		<activity android:name=".password.ConfirmLockPassword$InternalActivity"
		android:exported="false"
		android:windowSoftInputMode="adjustResize"
		android:theme="@style/GlifTheme.Light"/>

		<activity android:name="SetupChooseLockGeneric"
		<activity android:name=".password.SetupChooseLockGeneric"
		android:taskAffinity="com.android.wizard"
		android:theme="@style/GlifTheme.Light"
		android:label="@string/lock_settings_picker_title">
		@@ -1613,7 +1617,7 @@
		</intent-filter>
		</activity>

		<activity android:name="ChooseLockGeneric"
		<activity android:name=".password.ChooseLockGeneric"
		android:label="@string/lockpassword_choose_lock_generic_header"
		android:excludeFromRecents="true"
		android:exported="false" />
		@@ -1660,27 +1664,27 @@
		android:resource="@string/suggested_fingerprint_lock_settings_summary" />
		</activity>

		<activity android:name="ChooseLockGeneric$InternalActivity" android:exported="false"
		<activity android:name=".password.ChooseLockGeneric$InternalActivity"
		android:exported="false"
		android:label="@string/lockpassword_choose_lock_generic_header"
		android:excludeFromRecents="true"
		/>
		android:excludeFromRecents="true" />

		<activity android:name="SetupChooseLockPattern"
		<activity android:name=".password.SetupChooseLockPattern"
		android:exported="false"
		android:taskAffinity="com.android.wizard"
		android:theme="@style/GlifTheme.Light" />

		<activity android:name="ChooseLockPattern"
		<activity android:name=".password.ChooseLockPattern"
		android:exported="false"
		android:theme="@style/GlifTheme.Light" />

		<activity android:name="SetupChooseLockPassword"
		<activity android:name=".password.SetupChooseLockPassword"
		android:exported="false"
		android:taskAffinity="com.android.wizard"
		android:theme="@style/GlifTheme.Light"
		android:windowSoftInputMode="stateVisible\|adjustResize" />

		<activity android:name="ChooseLockPassword"
		<activity android:name=".password.ChooseLockPassword"
		android:exported="false"
		android:theme="@style/GlifTheme.Light"
		android:windowSoftInputMode="stateVisible\|adjustResize"/>
		@@ -1876,6 +1880,20 @@
		android:value="true" />
		</activity>

		<!-- The opposite of DevelopmentSettingsActivity, it's no-op and only enabled when the real
		activity is disabled to be CTS compliant. -->
		<activity
		android:name=".development.DevelopmentSettingsDisabledActivity"
		android:icon="@drawable/ic_settings_development"
		android:label="@string/development_settings_title"
		android:theme="@android:style/Theme.NoDisplay">
		<intent-filter android:priority="-1">
		<action android:name="android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />
		<action android:name="com.android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		</activity>

		<activity android:name="Settings$PrintSettingsActivity"
		android:label="@string/print_settings"
		android:icon="@drawable/ic_settings_print"

res/layout-land/confirm_lock_password.xml

+26 −26

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@
		<include layout="@layout/confirm_lock_background_base" />

		<LinearLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/topLayout"
		android:orientation="vertical"
		android:layout_width="match_parent"
		@@ -45,18 +44,12 @@
		android:layout_marginEnd="24dp"
		android:layout_marginTop="8dp"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		/>

		<View
		android:layout_width="match_parent"
		android:layout_height="0dp"
		android:layout_weight="1"/>
		android:layout_height="wrap_content"/>

		<FrameLayout
		android:layout_height="wrap_content"
		android:layout_width="match_parent"
		android:orientation="horizontal">
		android:layout_height="0dp"
		android:layout_weight="1">

		<Button
		style="@android:style/Widget.Material.Button.Borderless"
		@@ -69,11 +62,17 @@
		android:layout_marginEnd="8dp"
		android:layout_marginBottom="14dp"/>

		<EditText android:id="@+id/password_entry"
		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_gravity="center_vertical"
		android:gravity="center_horizontal"
		android:orientation="vertical">

		<com.android.settings.widget.ScrollToParentEditText
		android:id="@+id/password_entry"
		android:layout_width="208dp"
		android:layout_height="wrap_content"
		android:layout_gravity="center_horizontal\|bottom"
		android:layout_marginBottom="26dp"
		android:inputType="textPassword"
		android:imeOptions="actionNext\|flagNoFullscreen\|flagForceAscii"
		android:gravity="center"
		@@ -85,9 +84,10 @@
		android:id="@+id/errorText"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center_horizontal\|bottom"
		android:layout_marginBottom="10dp"/>

		</LinearLayout>

		<ImageView
		android:id="@+id/fingerprintIcon"
		android:layout_gravity="end\|bottom"

res/layout/choose_lock_password.xml

+18 −17

Original line number	Diff line number	Diff line
		@@ -42,8 +42,17 @@
		android:lines="2"
		android:textAppearance="?android:attr/textAppearanceMedium"/>

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:clipChildren="false"
		android:clipToPadding="false"
		android:orientation="vertical"
		android:paddingBottom="8dp">

		<!-- Password entry field -->
		<EditText android:id="@+id/password_entry"
		<com.android.settings.widget.ScrollToParentEditText
		android:id="@+id/password_entry"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_gravity="center"
		@@ -53,14 +62,6 @@
		android:textSize="24sp"
		style="@style/TextAppearance.PasswordEntry"/>

		<LinearLayout
		android:id="@+id/bottom_container"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:clipChildren="false"
		android:clipToPadding="false"
		android:orientation="vertical">

		<android.support.v7.widget.RecyclerView
		android:id="@+id/password_requirements_view"
		android:layout_width="match_parent"

res/layout/confirm_lock_password_base.xml

+28 −22

Original line number	Diff line number	Diff line
		@@ -47,8 +47,7 @@
		android:layout_marginEnd="?attr/confirmDeviceCredentialsSideMargin"
		android:layout_marginTop="12dp"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		/>
		android:layout_height="wrap_content" />

		<Button
		style="@android:style/Widget.Material.Button.Borderless"
		@@ -64,12 +63,16 @@
		android:layout_height="0dp"
		android:layout_weight="1"/>

		<EditText
		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:gravity="center_horizontal"
		android:orientation="vertical">

		<com.android.settings.widget.ScrollToParentEditText
		android:id="@+id/password_entry"
		android:layout_width="208dp"
		android:layout_height="wrap_content"
		android:layout_gravity="center_horizontal"
		android:layout_marginTop="-40dp"
		android:inputType="textPassword"
		android:imeOptions="actionNext\|flagNoFullscreen\|flagForceAscii"
		android:gravity="center"
		@@ -81,12 +84,15 @@
		android:accessibilityLiveRegion="polite"
		android:id="@+id/errorText"
		android:layout_width="wrap_content"
		android:layout_height="0dp"
		android:layout_weight="1"
		android:layout_gravity="center_horizontal"
		android:layout_height="wrap_content"
		android:layout_marginStart="12dp"
		android:layout_marginEnd="12dp"
		android:gravity="center_vertical"/>
		android:layout_marginEnd="12dp"/>

		</LinearLayout>

		<View android:layout_width="match_parent"
		android:layout_height="0dp"
		android:layout_weight="1"/>

		<ImageView
		android:id="@+id/fingerprintIcon"

res/layout/confirm_lock_password_internal.xml

+27 −34

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:icon="@drawable/ic_lock"
		android:layout="@layout/suw_glif_blank_template"
		android:importantForAutofill="noExcludeDescendants">

		<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
		@@ -28,19 +27,6 @@
		android:layout_width="match_parent"
		android:layout_height="match_parent">

		<ImageView
		android:id="@+id/suw_layout_icon"
		style="@style/SuwGlifIcon"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:src="@drawable/ic_lock" />

		<TextView
		android:id="@+id/headerText"
		style="@style/SuwGlifHeaderTitle"
		android:layout_width="match_parent"
		android:layout_height="wrap_content" />

		<TextView
		android:id="@+id/detailsText"
		style="@style/SuwDescription.Glif"
		@@ -54,12 +40,17 @@
		android:layout_height="0dp"
		android:layout_weight="1" />

		<EditText
		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:gravity="center_horizontal"
		android:orientation="vertical">

		<com.android.settings.widget.ScrollToParentEditText
		android:id="@+id/password_entry"
		android:layout_width="208dp"
		android:layout_height="wrap_content"
		android:layout_gravity="center_horizontal"
		android:layout_marginTop="-40dp"
		android:inputType="textPassword"
		android:imeOptions="actionNext\|flagNoFullscreen\|flagForceAscii"
		android:gravity="center"
		@@ -67,16 +58,18 @@
		style="@style/TextAppearance.PasswordEntry"/>

		<TextView
		style="@style/TextAppearance.ConfirmDeviceCredentialsErrorText"
		android:accessibilityLiveRegion="polite"
		android:id="@+id/errorText"
		style="@style/TextAppearance.ConfirmDeviceCredentialsErrorText"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:accessibilityLiveRegion="polite"/>

		</LinearLayout>

		<Space
		android:layout_width="match_parent"
		android:layout_height="0dp"
		android:layout_weight="1"
		android:layout_gravity="center_horizontal"
		android:layout_marginStart="12dp"
		android:layout_marginEnd="12dp"
		android:gravity="center_vertical"/>
		android:layout_weight="1" />

		<ImageView
		android:id="@+id/fingerprintIcon"