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

Merge "Separate the demo user factory reset option with admin user factory reset option." into udc-qpr-dev am: 38f12abb75 am: 0d3ae3ed32

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24677431

Change-Id: Ie89643b620ee82e4f30ab98ca466f54bd68b8067
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Wentao Wang
2023-09-13 13:53:24 +00:00
committed by Automerger Merge Worker
parent e3232dac25 0d3ae3ed32
commit f11e1666bf
8 changed files with 147 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/com/android/settings/system/FactoryResetDemoUserPreferenceController.java Normal file
View File

@@ -0,0 +1,32 @@
/*
* Copyright (C) 2017 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.system;
import android.content.Context;
import com.android.settings.Utils;
public class FactoryResetDemoUserPreferenceController extends FactoryResetPreferenceController {
public FactoryResetDemoUserPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
}
/** Hide demo user specific "Factory reset" settings for non demo users. */
@Override
public int getAvailabilityStatus() {
return Utils.isDemoUser(mContext) ? AVAILABLE : DISABLED_FOR_USER;
}
}

25
src/com/android/settings/system/FactoryResetPreferenceController.java
View File

@@ -24,35 +24,26 @@ import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.Settings;
import com.android.settings.Utils;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settings.core.BasePreferenceController;
public class FactoryResetPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin {
/** Key of the "Factory reset" preference in {@link R.xml.reset_dashboard_fragment}. */
private static final String KEY_FACTORY_RESET = "factory_reset";
public class FactoryResetPreferenceController extends BasePreferenceController {
private final UserManager mUm;
public FactoryResetPreferenceController(Context context) {
super(context);
public FactoryResetPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
mUm = (UserManager) context.getSystemService(Context.USER_SERVICE);
}
/** Hide "Factory reset" settings for secondary users, except demo users. */
/** Hide "Factory reset" settings for secondary users. */
@Override
public boolean isAvailable() {
return mUm.isAdminUser() || Utils.isDemoUser(mContext);
}
@Override
public String getPreferenceKey() {
return KEY_FACTORY_RESET;
public int getAvailabilityStatus() {
return mUm.isAdminUser() ? AVAILABLE : DISABLED_FOR_USER;
}
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
if (KEY_FACTORY_RESET.equals(preference.getKey())) {
if (mPreferenceKey.equals(preference.getKey())) {
final Intent intent = new Intent(mContext, Settings.FactoryResetActivity.class);
mContext.startActivity(intent);
return true;

1
src/com/android/settings/system/ResetDashboardFragment.java
View File

@@ -78,7 +78,6 @@ public class ResetDashboardFragment extends DashboardFragment {
if (SubscriptionUtil.isSimHardwareVisible(context)) {
controllers.add(new NetworkResetPreferenceController(context));
}
controllers.add(new FactoryResetPreferenceController(context));
controllers.add(new ResetAppPrefPreferenceController(context, lifecycle));
return controllers;
}

2
src/com/android/settings/system/ResetPreferenceController.java
View File

@@ -26,13 +26,11 @@ public class ResetPreferenceController extends BasePreferenceController {
private final UserManager mUm;
private final NetworkResetPreferenceController mNetworkReset;
private final FactoryResetPreferenceController mFactpruReset;
public ResetPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
mUm = (UserManager) context.getSystemService(Context.USER_SERVICE);
mNetworkReset = new NetworkResetPreferenceController(context);
mFactpruReset = new FactoryResetPreferenceController(context);
}
@Override