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

Commit 58d95b41 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Correct the choose screen lock page" into sc-dev am: 77f0dbaa 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15171314

Change-Id: If663e6bfecc6c0576c8b619f16223d0fd23229f4
parents 33a9e928 77f0dbaa

AndroidManifest.xml

+0 −1
Original line number Diff line number Diff line
@@ -1910,7 +1910,6 @@ 
        </activity>



        <activity android:name=".password.SetupChooseLockGeneric$InternalActivity"

            android:theme="@style/GlifTheme.Light"

            android:exported="false"

            android:excludeFromRecents="true" />

src/com/android/settings/password/SetNewPasswordActivity.java

+2 −0
Original line number Diff line number Diff line
@@ -134,6 +134,8 @@ public class SetNewPasswordActivity extends Activity implements SetNewPasswordCo 
            intent.putExtra(EXTRA_KEY_IS_CALLING_APP_ADMIN, true);

        }

        intent.putExtra(EXTRA_KEY_DEVICE_PASSWORD_REQUIREMENT_ONLY, mDevicePasswordRequirementOnly);

        // Copy the setup wizard intent extra to the intent.

        WizardManagerHelper.copyWizardManagerExtras(getIntent(), intent);

        startActivity(intent);

        finish();

    }