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

Finish PS sub-settings page if PS is locked

Browse Source 
Bug: 317026141
Test: Manual
Change-Id: If3a3045c40dd61779b272589231d395ce7ae9fa9
This commit is contained in:
josephpv
2023-12-19 11:32:11 +00:00
parent 25ce6462c9
commit 4c055dd097
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/privatespace/HidePrivateSpaceSettings.java
View File

@@ -32,6 +32,14 @@ public class HidePrivateSpaceSettings extends DashboardFragment{
} }
} }
@Override
public void onStart() {
super.onStart();
if (PrivateSpaceMaintainer.getInstance(getContext()).isPrivateSpaceLocked()) {
finish();
}
}
@Override @Override
public int getMetricsCategory() { public int getMetricsCategory() {
return SettingsEnums.PRIVATE_SPACE_SETTINGS; return SettingsEnums.PRIVATE_SPACE_SETTINGS;

9
src/com/android/settings/privatespace/onelock/UseOneLockSettingsFragment.java
View File

@@ -25,6 +25,7 @@ import androidx.annotation.Nullable;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment; import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.privatespace.PrivateSpaceMaintainer;
import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.AbstractPreferenceController;
import java.util.ArrayList; 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 @Override
public int getMetricsCategory() { public int getMetricsCategory() {
return SettingsEnums.PRIVATE_SPACE_SETTINGS; return SettingsEnums.PRIVATE_SPACE_SETTINGS;