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

am 8e0929a3: Merge "[FRP] Open the lock setup screens in same task" into lmp-mr1-dev

Browse Source 
* commit '8e0929a32ed60b95a34416a5362df93f5a329b5f':
  [FRP] Open the lock setup screens in same task
This commit is contained in:
Maurice Lam
2014-12-15 17:49:49 +00:00
committed by Android Git Automerger
parent d9df577d94 8e0929a32e
commit 4e8a7219c8
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
AndroidManifest.xml
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"/>