Move reset options to one place
Change-Id: I419c16cbfc69861e01f28c14abdde137bd78f0bb Fix: 36458355 Test: make RunSettingsRoboTests
This commit is contained in:
@@ -15,22 +15,30 @@
|
||||
*/
|
||||
package com.android.settings.system;
|
||||
|
||||
import android.accounts.Account;
|
||||
import android.accounts.AccountManager;
|
||||
import android.content.Context;
|
||||
|
||||
import android.content.pm.UserInfo;
|
||||
import android.os.UserHandle;
|
||||
import android.os.UserManager;
|
||||
import android.support.v7.preference.Preference;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.core.PreferenceController;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class FactoryResetPreferenceController extends PreferenceController {
|
||||
/** Key of the "Factory reset" preference in {@link R.xml.system_dashboard_fragment}.*/
|
||||
/** Key of the "Factory reset" preference in {@link R.xml.reset_dashboard_fragment}. */
|
||||
private static final String KEY_FACTORY_RESET = "factory_reset";
|
||||
|
||||
private final UserManager mUm;
|
||||
private final AccountManager mAm;
|
||||
|
||||
public FactoryResetPreferenceController(Context context, UserManager um) {
|
||||
public FactoryResetPreferenceController(Context context) {
|
||||
super(context);
|
||||
mUm = um;
|
||||
mUm = (UserManager) context.getSystemService(Context.USER_SERVICE);
|
||||
mAm = (AccountManager) context.getSystemService(Context.ACCOUNT_SERVICE);
|
||||
}
|
||||
|
||||
/** Hide "Factory reset" settings for secondary users. */
|
||||
@@ -43,4 +51,22 @@ public class FactoryResetPreferenceController extends PreferenceController {
|
||||
public String getPreferenceKey() {
|
||||
return KEY_FACTORY_RESET;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateState(Preference preference) {
|
||||
final List<UserInfo> profiles = mUm.getProfiles(UserHandle.myUserId());
|
||||
int accountsCount = 0;
|
||||
for (UserInfo userInfo : profiles) {
|
||||
final int profileId = userInfo.id;
|
||||
Account[] accounts = mAm.getAccountsAsUser(profileId);
|
||||
accountsCount += accounts.length;
|
||||
}
|
||||
if (accountsCount == 0) {
|
||||
preference.setSummary(R.string.master_clear_summary);
|
||||
} else {
|
||||
preference.setSummary(mContext.getResources().getQuantityString(
|
||||
R.plurals.master_clear_with_account_summary,
|
||||
accountsCount, accountsCount));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
86
src/com/android/settings/system/ResetDashboardFragment.java
Normal file
86
src/com/android/settings/system/ResetDashboardFragment.java
Normal file
@@ -0,0 +1,86 @@
|
||||
/*
|
||||
* 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 android.provider.SearchIndexableResource;
|
||||
|
||||
import com.android.internal.logging.nano.MetricsProto;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.applications.ResetAppPrefPreferenceController;
|
||||
import com.android.settings.core.PreferenceController;
|
||||
import com.android.settings.core.lifecycle.Lifecycle;
|
||||
import com.android.settings.dashboard.DashboardFragment;
|
||||
import com.android.settings.network.NetworkResetPreferenceController;
|
||||
import com.android.settings.search.BaseSearchIndexProvider;
|
||||
import com.android.settings.search.Indexable;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class ResetDashboardFragment extends DashboardFragment {
|
||||
|
||||
private static final String TAG = "ResetDashboardFragment";
|
||||
|
||||
@Override
|
||||
public int getMetricsCategory() {
|
||||
return MetricsProto.MetricsEvent.RESET_DASHBOARD;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String getLogTag() {
|
||||
return TAG;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int getPreferenceScreenResId() {
|
||||
return R.xml.reset_dashboard_fragment;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<PreferenceController> getPreferenceControllers(Context context) {
|
||||
return buildPreferenceControllers(context, getLifecycle());
|
||||
}
|
||||
|
||||
private static List<PreferenceController> buildPreferenceControllers(Context context,
|
||||
Lifecycle lifecycle) {
|
||||
final List<PreferenceController> controllers = new ArrayList<>();
|
||||
controllers.add(new NetworkResetPreferenceController(context));
|
||||
controllers.add(new FactoryResetPreferenceController(context));
|
||||
controllers.add(new ResetAppPrefPreferenceController(context, lifecycle));
|
||||
return controllers;
|
||||
}
|
||||
|
||||
public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
|
||||
new BaseSearchIndexProvider() {
|
||||
@Override
|
||||
public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
|
||||
boolean enabled) {
|
||||
final ArrayList<SearchIndexableResource> result = new ArrayList<>();
|
||||
|
||||
final SearchIndexableResource sir = new SearchIndexableResource(context);
|
||||
sir.xmlResId = R.xml.reset_dashboard_fragment;
|
||||
result.add(sir);
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PreferenceController> getPreferenceControllers(Context context) {
|
||||
return buildPreferenceControllers(context, null /* lifecycle */);
|
||||
}
|
||||
};
|
||||
}
|
@@ -60,7 +60,6 @@ public class SystemDashboardFragment extends DashboardFragment {
|
||||
final List<PreferenceController> controllers = new ArrayList<>();
|
||||
controllers.add(new SystemUpdatePreferenceController(context, UserManager.get(context)));
|
||||
controllers.add(new AdditionalSystemUpdatePreferenceController(context));
|
||||
controllers.add(new FactoryResetPreferenceController(context, UserManager.get(context)));
|
||||
return controllers;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user