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

Merge "Correct the choose screen lock page" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-07-02 05:26:38 +00:00
committed by Android (Google) Code Review
parent 65c9b03fb5 aaa031bd71
commit 77f0dbaa26
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
AndroidManifest.xml
View File

@@ -1910,7 +1910,6 @@
</activity> </activity>
<activity android:name=".password.SetupChooseLockGeneric$InternalActivity" <activity android:name=".password.SetupChooseLockGeneric$InternalActivity"
android:theme="@style/GlifTheme.Light"
android:exported="false" android:exported="false"
android:excludeFromRecents="true" /> android:excludeFromRecents="true" />

2
src/com/android/settings/password/SetNewPasswordActivity.java
View File

@@ -134,6 +134,8 @@ public class SetNewPasswordActivity extends Activity implements SetNewPasswordCo
intent.putExtra(EXTRA_KEY_IS_CALLING_APP_ADMIN, true); intent.putExtra(EXTRA_KEY_IS_CALLING_APP_ADMIN, true);
} }
intent.putExtra(EXTRA_KEY_DEVICE_PASSWORD_REQUIREMENT_ONLY, mDevicePasswordRequirementOnly); intent.putExtra(EXTRA_KEY_DEVICE_PASSWORD_REQUIREMENT_ONLY, mDevicePasswordRequirementOnly);
// Copy the setup wizard intent extra to the intent.
WizardManagerHelper.copyWizardManagerExtras(getIntent(), intent);
startActivity(intent); startActivity(intent);
finish(); finish();
} }