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

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

Merge "Finish PS sub-settings page if PS is locked" into main

parents d564f0b6 4c055dd0

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

+8 −0
Original line number Diff line number Diff line
@@ -32,6 +32,14 @@ public class HidePrivateSpaceSettings extends DashboardFragment{ 
        }

    }



    @Override

    public void onStart() {

        super.onStart();

        if (PrivateSpaceMaintainer.getInstance(getContext()).isPrivateSpaceLocked()) {

            finish();

        }

    }



    @Override

    public int getMetricsCategory() {

        return SettingsEnums.PRIVATE_SPACE_SETTINGS;

src/com/android/settings/privatespace/onelock/UseOneLockSettingsFragment.java

+9 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import androidx.annotation.Nullable; 


import com.android.settings.R;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.privatespace.PrivateSpaceMaintainer;

import com.android.settingslib.core.AbstractPreferenceController;



import java.util.ArrayList;
@@ -42,6 +43,14 @@ public class UseOneLockSettingsFragment extends DashboardFragment { 
        }

    }



    @Override

    public void onStart() {

        super.onStart();

        if (PrivateSpaceMaintainer.getInstance(getContext()).isPrivateSpaceLocked()) {

            finish();

        }

    }



    @Override

    public int getMetricsCategory() {

        return SettingsEnums.PRIVATE_SPACE_SETTINGS;