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

8
res/xml/reset_dashboard_fragment.xml
View File

@@ -57,5 +57,13 @@
settings:keywords="@string/keywords_factory_data_reset"
settings:userRestriction="no_factory_reset"
settings:useAdminDisabledSummary="true"
settings:controller="com.android.settings.system.FactoryResetPreferenceController"
android:fragment="com.android.settings.MainClear" />
<Preference
android:key="factory_reset_demo_user"
android:title="@string/main_clear_title"
settings:keywords="@string/keywords_factory_data_reset"
settings:controller="com.android.settings.system.FactoryResetDemoUserPreferenceController"
android:fragment="com.android.settings.MainClear" />
</PreferenceScreen>

2
src/com/android/settings/MainClear.java
View File

@@ -571,7 +571,7 @@ public class MainClear extends InstrumentedFragment implements OnGlobalLayoutLis
UserHandle.myUserId());
if (disallow && !Utils.isDemoUser(context)) {
return inflater.inflate(R.layout.main_clear_disallowed_screen, null);
} else if (admin != null) {
} else if (admin != null && !Utils.isDemoUser(context)) {
new ActionDisabledByAdminDialogHelper(getActivity())
.prepareDialogBuilder(UserManager.DISALLOW_FACTORY_RESET, admin)
.setOnDismissListener(__ -> getActivity().finish())

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

96
tests/robotests/src/com/android/settings/system/FactoryResetDemoUserPreferenceControllerTest.java Normal file
View File

@@ -0,0 +1,96 @@
/*
* 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 static com.google.common.truth.Truth.assertThat;
import android.content.Context;
import android.content.pm.UserInfo;
import android.os.UserHandle;
import android.provider.Settings;
import com.android.settings.testutils.shadow.ShadowUserManager;
import com.android.settings.testutils.shadow.ShadowUtils;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@RunWith(RobolectricTestRunner.class)
@Config(shadows = ShadowUserManager.class)
public class FactoryResetDemoUserPreferenceControllerTest {
private static final String FACTORY_RESET_DEMO_USER_KEY = "factory_reset_demo_user";
private ShadowUserManager mShadowUserManager;
private Context mContext;
private FactoryResetDemoUserPreferenceController mController;
@Before
public void setUp() {
mContext = RuntimeEnvironment.application;
mShadowUserManager = ShadowUserManager.getShadow();
mController = new FactoryResetDemoUserPreferenceController(
mContext, FACTORY_RESET_DEMO_USER_KEY);
}
@After
public void tearDown() {
ShadowUtils.reset();
mShadowUserManager.setIsAdminUser(false);
mShadowUserManager.setIsDemoUser(false);
Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.DEVICE_DEMO_MODE, 0);
}
@Test
public void isAvailable_systemUser() {
mShadowUserManager.setIsAdminUser(true);
assertThat(mController.isAvailable()).isFalse();
}
@Test
public void isAvailable_nonSystemUser() {
mShadowUserManager.setIsAdminUser(false);
mShadowUserManager.setIsDemoUser(false);
assertThat(mController.isAvailable()).isFalse();
}
@Test
public void isAvailable_demoUser() {
mShadowUserManager.setIsAdminUser(false);
// Place the device in demo mode.
Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.DEVICE_DEMO_MODE, 1);
// Indicate the user is a demo user.
mShadowUserManager.addUser(UserHandle.myUserId(), "test", UserInfo.FLAG_DEMO);
assertThat(mController.isAvailable()).isTrue();
}
@Test
public void getPreferenceKey() {
assertThat(mController.getPreferenceKey()).isEqualTo(FACTORY_RESET_DEMO_USER_KEY);
}
}

4
tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java
View File

@@ -49,7 +49,7 @@ public class FactoryResetPreferenceControllerTest {
mContext = RuntimeEnvironment.application;
mShadowUserManager = ShadowUserManager.getShadow();
mController = new FactoryResetPreferenceController(mContext);
mController = new FactoryResetPreferenceController(mContext, FACTORY_RESET_KEY);
}
@After
@@ -85,7 +85,7 @@ public class FactoryResetPreferenceControllerTest {
// Indicate the user is a demo user.
mShadowUserManager.addUser(UserHandle.myUserId(), "test", UserInfo.FLAG_DEMO);
assertThat(mController.isAvailable()).isTrue();
assertThat(mController.isAvailable()).isFalse();
}
@Test