Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up choose lock intent creation

Browse Source 
Consolidated the many variants of ChooseLock*.createIntent, so that
it will take the same set of arguments.

Also modified SetupChooseLock*.createIntent to modifyIntentForSetup,
which will take the intent created by ChooseLock* and modify it for
use with setup.

Test: cd tests/robotests && mma
Change-Id: I5ff033f459c33ec9980872a536b3996d89f2bbbb
This commit is contained in:
Maurice Lam
2017-04-28 16:18:47 -07:00
parent 1949776c59
commit 2eb170cd6f
55 changed files with 510 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
AndroidManifest.xml
View File

@@ -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"/>