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

Commit 9f1a4459 authored by Maurice Lam's avatar Maurice Lam Committed by Android (Google) Code Review
Browse files

Merge "Clean up choose lock intent creation"

parents eb1a7f92 2eb170cd

AndroidManifest.xml

+19 −15
Original line number Diff line number Diff line
@@ -1497,7 +1497,7 @@ 
        <!-- Second and third-level settings -->



        <!-- Lock screen settings -->

        <activity android:name="ConfirmDeviceCredentialActivity"

        <activity android:name=".password.ConfirmDeviceCredentialActivity"

            android:exported="true"

            android:theme="@android:style/Theme.NoDisplay">

            <intent-filter android:priority="1">
@@ -1505,9 +1505,13 @@ 
                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

        </activity>

        <!-- Activity alias for compatibility -->

        <activity-alias android:name=".ConfirmDeviceCredentialActivity"

            android:targetActivity=".password.ConfirmDeviceCredentialActivity"

            android:exported="true" />



        <!-- Note this must not be exported since it authenticates the given user -->

        <activity android:name="ConfirmDeviceCredentialActivity$InternalActivity"

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

            android:exported="false"

            android:permission="android.permission.MANAGE_USERS"

            android:resizeableActivity="false"
@@ -1548,10 +1552,10 @@ 
            </intent-filter>

        </activity>



        <activity android:name="ConfirmLockPattern"

        <activity android:name=".password.ConfirmLockPattern"

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



        <activity android:name="ConfirmLockPassword"

        <activity android:name=".password.ConfirmLockPassword"

            android:windowSoftInputMode="stateHidden|adjustResize"

            android:theme="@style/GlifTheme.Light"/>
@@ -1593,17 +1597,17 @@ 
        </activity>



        <!-- Note this must not be exported since it returns the password in the intent -->

        <activity android:name="ConfirmLockPattern$InternalActivity"

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

            android:exported="false"

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



        <!-- Note this must not be exported since it returns the password in the intent -->

        <activity android:name="ConfirmLockPassword$InternalActivity"

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

            android:exported="false"

            android:windowSoftInputMode="adjustResize"

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



        <activity android:name="SetupChooseLockGeneric"

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

            android:taskAffinity="com.android.wizard"

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

            android:label="@string/lock_settings_picker_title">
@@ -1613,7 +1617,7 @@ 
            </intent-filter>

        </activity>



        <activity android:name="ChooseLockGeneric"

        <activity android:name=".password.ChooseLockGeneric"

            android:label="@string/lockpassword_choose_lock_generic_header"

            android:excludeFromRecents="true"

            android:exported="false" />
@@ -1660,27 +1664,27 @@ 
                android:resource="@string/suggested_fingerprint_lock_settings_summary" />

        </activity>



        <activity android:name="ChooseLockGeneric$InternalActivity" android:exported="false"

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

            android:exported="false"

            android:label="@string/lockpassword_choose_lock_generic_header"

            android:excludeFromRecents="true"

        />

            android:excludeFromRecents="true" />



        <activity android:name="SetupChooseLockPattern"

        <activity android:name=".password.SetupChooseLockPattern"

            android:exported="false"

            android:taskAffinity="com.android.wizard"

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



        <activity android:name="ChooseLockPattern"

        <activity android:name=".password.ChooseLockPattern"

            android:exported="false"

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



        <activity android:name="SetupChooseLockPassword"

        <activity android:name=".password.SetupChooseLockPassword"

            android:exported="false"

            android:taskAffinity="com.android.wizard"

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

            android:windowSoftInputMode="stateVisible|adjustResize" />



        <activity android:name="ChooseLockPassword"

        <activity android:name=".password.ChooseLockPassword"

            android:exported="false"

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

            android:windowSoftInputMode="stateVisible|adjustResize"/>

src/com/android/settings/CredentialStorage.java

+5 −3
Original line number Diff line number Diff line
@@ -47,14 +47,16 @@ import android.widget.Toast; 
import com.android.internal.widget.LockPatternUtils;

import com.android.org.bouncycastle.asn1.ASN1InputStream;

import com.android.org.bouncycastle.asn1.pkcs.PrivateKeyInfo;

import com.android.settings.password.ChooseLockGeneric;

import com.android.settings.password.ChooseLockSettingsHelper;

import com.android.settings.vpn2.VpnUtils;



import sun.security.util.ObjectIdentifier;

import sun.security.x509.AlgorithmId;



import java.io.ByteArrayInputStream;

import java.io.IOException;



import sun.security.util.ObjectIdentifier;

import sun.security.x509.AlgorithmId;



/**

 * CredentialStorage handles KeyStore reset, unlock, and install.

 *

src/com/android/settings/CryptKeeperSettings.java

+2 −0
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ import android.widget.Button; 


import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.settings.core.InstrumentedPreferenceFragment;

import com.android.settings.password.ChooseLockSettingsHelper;

import com.android.settings.password.ConfirmLockPattern;



public class CryptKeeperSettings extends InstrumentedPreferenceFragment {

    private static final String TAG = "CryptKeeper";

src/com/android/settings/EncryptionInterstitial.java

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import android.widget.TextView; 
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.settings.core.InstrumentedFragment;

import com.android.settings.core.instrumentation.InstrumentedDialogFragment;

import com.android.settings.password.ChooseLockSettingsHelper;

import com.android.setupwizardlib.GlifLayout;



import java.util.List;

src/com/android/settings/MasterClear.java

+4 −2
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.settings;



import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;



import android.accounts.Account;

import android.accounts.AccountManager;

import android.accounts.AuthenticatorDescription;
@@ -48,13 +50,13 @@ import android.widget.ScrollView; 
import android.widget.TextView;



import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.settings.password.ChooseLockSettingsHelper;

import com.android.settings.password.ConfirmLockPattern;

import com.android.settings.widget.CarrierDemoPasswordDialogFragment;

import com.android.settingslib.RestrictedLockUtils;



import java.util.List;



import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;



/**

 * Confirm and execute a reset of the device to a clean "just out of the box"

 * state.  Multiple confirmations are required: first, a general "are you sure