[FRP] Open the lock setup screens in same task

Set the taskAffinity of of the lock setup screens so that the
transitions behave correctly.

Bug: 18724458
Change-Id: Ibca7adfad1e5bd07c7e7d2e1beb279c5e57ac735
This commit is contained in:
Maurice Lam
2014-12-11 18:22:08 -08:00
parent 96ca2cfd08
commit 56e6cf5565

View File

@@ -1114,6 +1114,7 @@
</activity>
<activity android:name=".SetupRedactionInterstitial"
android:taskAffinity="com.android.wizard"
android:theme="@style/SetupWizardDisableAppStartingTheme"/>
<activity android:name=".notification.RedactionInterstitial"/>
@@ -1168,12 +1169,14 @@
<activity android:name="SetupChooseLockPattern"
android:exported="false"
android:taskAffinity="com.android.wizard"
android:theme="@style/SetupWizardDisableAppStartingTheme" />
<activity android:name="ChooseLockPattern" android:exported="false"/>
<activity android:name="SetupChooseLockPassword"
android:exported="false"
android:taskAffinity="com.android.wizard"
android:theme="@style/SetupWizardDisableAppStartingTheme"
android:windowSoftInputMode="stateVisible|adjustResize" />
@@ -1181,6 +1184,7 @@
android:windowSoftInputMode="stateVisible|adjustResize"/>
<activity android:name=".SetupEncryptionInterstitial"
android:taskAffinity="com.android.wizard"
android:theme="@style/SetupWizardDisableAppStartingTheme"/>
<activity android:name=".EncryptionInterstitial"/>