Add Private Space settings page
This involves: 1. Adding a new page for PS settings under Security & Privacy 2. Integrating the PS safety source with SafetyCenter. Also, add the capability to create and delete PS from the page. Creation is temporary to help with prototyping, and will be removed finally. Screenshots: Private Space Entry point in Security & Privacy Settings: https://screenshot.googleplex.com/4VHxNekjhxZHJwF Private Space Settings page: https://screenshot.googleplex.com/3Raw4wuymTHTgtM Creating Private Space: https://screenshot.googleplex.com/3dvzAH6V4kQmuYf Private Space created: https://screenshot.googleplex.com/Aj7nnF9uuUCa9Q5 Design doc: https://docs.google.com/document/d/1CdjUjAE84-5ZEPRIfw5KYFjLVHtEZxc_sF0w95su8DA/edit?usp=sharing&resourcekey=0-dAACT9HRexY1IyoxMmkVlw Bug: 286539356 Bug: 293569406 Test: manual Test: atest DeletePrivateSpaceControllerTest Test: atest UseOneLockControllerTest Test: atest HidePrivateSpaceControllerTest Change-Id: I9caf8e04e7fb2df36e60f607225e2931988ee692
This commit is contained in:
@@ -0,0 +1,90 @@
|
||||
/*
|
||||
* 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.PrivateSpaceMaintainer.ErrorDeletingPrivateSpace.DELETE_PS_ERROR_INTERNAL;
|
||||
import static com.android.settings.privatespace.PrivateSpaceMaintainer.ErrorDeletingPrivateSpace.DELETE_PS_ERROR_NONE;
|
||||
import static com.android.settings.privatespace.PrivateSpaceMaintainer.ErrorDeletingPrivateSpace.DELETE_PS_ERROR_NO_PRIVATE_SPACE;
|
||||
|
||||
import android.content.Context;
|
||||
import android.text.TextUtils;
|
||||
import android.util.Log;
|
||||
import android.widget.Toast;
|
||||
|
||||
import androidx.preference.Preference;
|
||||
|
||||
import com.android.internal.annotations.VisibleForTesting;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.core.BasePreferenceController;
|
||||
|
||||
/** Controller to delete the private space from the PS Settings page */
|
||||
public class DeletePrivateSpaceController extends BasePreferenceController {
|
||||
private static final String TAG = "DeletePrivateSpaceController";
|
||||
private final PrivateSpaceMaintainer mPrivateSpaceMaintainer;
|
||||
|
||||
static class Injector {
|
||||
PrivateSpaceMaintainer injectPrivateSpaceMaintainer(Context context) {
|
||||
return PrivateSpaceMaintainer.getInstance(context);
|
||||
}
|
||||
}
|
||||
|
||||
public DeletePrivateSpaceController(Context context, String preferenceKey) {
|
||||
this(context, preferenceKey, new Injector());
|
||||
}
|
||||
|
||||
DeletePrivateSpaceController(Context context, String preferenceKey, Injector injector) {
|
||||
super(context, preferenceKey);
|
||||
mPrivateSpaceMaintainer = injector.injectPrivateSpaceMaintainer(context);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getAvailabilityStatus() {
|
||||
return AVAILABLE;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean handlePreferenceTreeClick(Preference preference) {
|
||||
if (!TextUtils.equals(preference.getKey(), getPreferenceKey())) {
|
||||
return false;
|
||||
}
|
||||
|
||||
PrivateSpaceMaintainer.ErrorDeletingPrivateSpace error =
|
||||
mPrivateSpaceMaintainer.deletePrivateSpace();
|
||||
if (error == DELETE_PS_ERROR_NONE) {
|
||||
showSuccessfulDeletionToast();
|
||||
} else if (error == DELETE_PS_ERROR_INTERNAL) {
|
||||
showDeletionInternalErrorToast();
|
||||
} else if (error == DELETE_PS_ERROR_NO_PRIVATE_SPACE) {
|
||||
// Ideally this should never happen as PS Settings is not available when there's no
|
||||
// Private Profile.
|
||||
Log.e(TAG, "Unexpected attempt to delete non-existent PS");
|
||||
}
|
||||
return super.handlePreferenceTreeClick(preference);
|
||||
}
|
||||
|
||||
/** Shows a toast saying that the private space was deleted */
|
||||
@VisibleForTesting
|
||||
public void showSuccessfulDeletionToast() {
|
||||
Toast.makeText(mContext, R.string.private_space_deleted, Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
|
||||
/** Shows a toast saying that the private space could not be deleted */
|
||||
@VisibleForTesting
|
||||
public void showDeletionInternalErrorToast() {
|
||||
Toast.makeText(mContext, R.string.private_space_delete_failed, Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user