Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e8a7219 authored by Maurice Lam's avatar Maurice Lam Committed by Android Git Automerger
Browse files

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

* commit '8e0929a3':
  [FRP] Open the lock setup screens in same task
parents d9df577d 8e0929a3

AndroidManifest.xml

+4 −0
Original line number Diff line number Diff line
@@ -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"/>