f58acef107
When private space is deleted from private space settings launched from the All apps settings cog the settings sub activity is not cleared and visibile in recents. With this change it is taken care to remove and clear the sub settings task hosting the Private space settings page when private space does not exist and to make sure the activity is removed if it is the last activity in that stack. Bug: 333538964 Test: Manual Change-Id: I22ba8ca8d2947c6604280cf398cd47434038d542
89 lines
3.1 KiB
Java
89 lines
3.1 KiB
Java
/*
|
|
* Copyright (C) 2023 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
package com.android.settings.privatespace;
|
|
|
|
import static com.android.settings.privatespace.PrivateSpaceAuthenticationActivity.EXTRA_SHOW_PRIVATE_SPACE_UNLOCKED;
|
|
|
|
import android.app.settings.SettingsEnums;
|
|
import android.graphics.drawable.Drawable;
|
|
import android.os.Bundle;
|
|
import android.util.Log;
|
|
import android.widget.Toast;
|
|
|
|
import com.android.settings.R;
|
|
import com.android.settings.dashboard.DashboardFragment;
|
|
import com.android.settingslib.widget.IllustrationPreference;
|
|
|
|
/** Fragment representing the Private Space dashboard in Settings. */
|
|
public class PrivateSpaceDashboardFragment extends DashboardFragment {
|
|
private static final String TAG = "PSDashboardFragment";
|
|
private static final String PRIVATE_SPACE_ILLUSTRATION_KEY = "private_space_illustration";
|
|
|
|
@Override
|
|
public void onCreate(Bundle icicle) {
|
|
if (android.os.Flags.allowPrivateProfile()
|
|
&& android.multiuser.Flags.enablePrivateSpaceFeatures()) {
|
|
super.onCreate(icicle);
|
|
if (icicle == null
|
|
&& getIntent().getBooleanExtra(EXTRA_SHOW_PRIVATE_SPACE_UNLOCKED, false)) {
|
|
Log.i(TAG, "Private space unlocked showing toast");
|
|
Drawable drawable =
|
|
getContext().getDrawable(R.drawable.ic_private_space_unlock_icon);
|
|
Toast.makeCustomToastWithIcon(
|
|
getContext(),
|
|
null /* looper */,
|
|
getContext().getString(R.string.private_space_unlocked),
|
|
Toast.LENGTH_SHORT,
|
|
drawable)
|
|
.show();
|
|
}
|
|
}
|
|
}
|
|
|
|
@Override
|
|
public void onStart() {
|
|
super.onStart();
|
|
if (PrivateSpaceMaintainer.getInstance(getContext()).isPrivateSpaceLocked()) {
|
|
// To make sure the task is removed if it is the last activity in that stack.
|
|
getActivity().finishAndRemoveTask();
|
|
}
|
|
}
|
|
|
|
@Override
|
|
public void onResume() {
|
|
super.onResume();
|
|
final IllustrationPreference illustrationPreference =
|
|
getPreferenceScreen().findPreference(PRIVATE_SPACE_ILLUSTRATION_KEY);
|
|
illustrationPreference.applyDynamicColor();
|
|
}
|
|
|
|
@Override
|
|
protected int getPreferenceScreenResId() {
|
|
return R.xml.private_space_settings;
|
|
}
|
|
|
|
@Override
|
|
public int getMetricsCategory() {
|
|
return SettingsEnums.PRIVATE_SPACE_SETTINGS;
|
|
}
|
|
|
|
@Override
|
|
protected String getLogTag() {
|
|
return TAG;
|
|
}
|
|
}
|