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

Commit 0bdf8e9c authored by Joseph Vincent's avatar Joseph Vincent Committed by Android (Google) Code Review
Browse files

Merge "Add intent to start Private Space setup/settings" into main

parents cb9870b0 92f28a17

AndroidManifest.xml

+10 −3
Original line number Original line Diff line number Diff line
@@ -5001,9 +5001,16 @@ 
            android:theme="@style/GlifV3Theme.Light"

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

            android:exported="false" />

            android:exported="false" />





        <activity android:name=".privatespace.PrivateSpaceAuthenticationActivity"

        <activity

            android:name=".privatespace.PrivateSpaceAuthenticationActivity"

            android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar"

            android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar"

                  android:exported="false"/>

            android:exported="true">

            <intent-filter>

                <action android:name="com.android.settings.action.PRIVATE_SPACE_SETUP_FLOW" />

                <category android:name="android.intent.category.DEFAULT"/>

            </intent-filter>

        </activity>



        <activity android:name=".privatespace.PrivateProfileContextHelperActivity" android:exported="false"/>

        <activity android:name=".privatespace.PrivateProfileContextHelperActivity" android:exported="false"/>





        <activity-alias android:name="UsageStatsActivity"

        <activity-alias android:name="UsageStatsActivity"

src/com/android/settings/privatespace/PrivateSpaceAuthenticationActivity.java

+6 −4
Original line number Original line Diff line number Diff line
@@ -42,9 +42,10 @@ import com.android.settingslib.transition.SettingsTransitionHelper; 
import com.google.android.setupdesign.util.ThemeHelper;

import com.google.android.setupdesign.util.ThemeHelper;





/**

/**

 * Prompts user to set a device lock if not set with an alert dialog.

 * This class represents an activity responsible for user authentication before starting the private

 * If a lock is already set then first authenticates user before displaying private space settings

 * space setup flow or accessing the private space settings page if already created. Also prompts

 * page.

 * user to set a device lock if not set with an alert dialog. This can be launched using the intent

 * com.android.settings.action.PRIVATE_SPACE_SETUP_FLOW.

 */

 */

public class PrivateSpaceAuthenticationActivity extends FragmentActivity {

public class PrivateSpaceAuthenticationActivity extends FragmentActivity {

    private static final String TAG = "PrivateSpaceAuthCheck";

    private static final String TAG = "PrivateSpaceAuthCheck";
@@ -66,8 +67,9 @@ public class PrivateSpaceAuthenticationActivity extends FragmentActivity { 




    @Override

    @Override

    protected void onCreate(Bundle savedInstanceState) {

    protected void onCreate(Bundle savedInstanceState) {

        if (Flags.allowPrivateProfile()) {

        super.onCreate(savedInstanceState);

        super.onCreate(savedInstanceState);



        if (Flags.allowPrivateProfile()) {

            ThemeHelper.trySetDynamicColor(this);

            ThemeHelper.trySetDynamicColor(this);

            mPrivateSpaceMaintainer = new Injector().injectPrivateSpaceMaintainer(

            mPrivateSpaceMaintainer = new Injector().injectPrivateSpaceMaintainer(

                    getApplicationContext());

                    getApplicationContext());