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

Migrate more settings to use SubSettingsLauncher

Browse Source 
Bug: 73250851
Test: robotests
Change-Id: I08f6f380489646231d6d8ceb1488e2efb036bf69
This commit is contained in:
Fan Zhang
2018-02-16 10:37:37 -08:00
parent 6f367a79ce
commit 7cf99f5f12
26 changed files with 260 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/settings/accounts/AccountPreferenceController.java
View File

@@ -47,10 +47,10 @@ import android.util.SparseArray;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.AccessiblePreferenceCategory;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.search.SearchIndexableRaw;
import com.android.settingslib.RestrictedPreference;
@@ -246,19 +246,19 @@ public class AccountPreferenceController extends AbstractPreferenceController
if (preference == profileData.managedProfilePreference) {
Bundle arguments = new Bundle();
arguments.putParcelable(Intent.EXTRA_USER, profileData.userInfo.getUserHandle());
((SettingsActivity) mParent.getActivity()).startPreferencePanel(mParent,
ManagedProfileSettings.class.getName(), arguments,
R.string.managed_profile_settings_title, null, null, 0);
new SubSettingLauncher(mContext)
.setSourceMetricsCategory(mParent.getMetricsCategory())
.setDestination(ManagedProfileSettings.class.getName())
.setTitle(R.string.managed_profile_settings_title)
.setArguments(arguments)
.launch();
return true;
}
}
return false;
}
SparseArray<ProfileData> getProfileData() {
return mProfiles;
}
private void updateUi() {
if (!isAvailable()) {
// This should not happen

14
src/com/android/settings/accounts/AccountTypePreferenceLoader.java
View File

@@ -38,10 +38,11 @@ import android.text.TextUtils;
import android.util.Log;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.location.LocationSettings;
import com.android.settings.utils.LocalClassLoaderContextThemeWrapper;
import com.android.settingslib.accounts.AuthenticatorHelper;
import com.android.settingslib.core.instrumentation.Instrumentable;
/**
* Class to load the preference screen to be added to the settings page for the specific account
@@ -230,8 +231,15 @@ public class AccountTypePreferenceLoader {
@Override
public boolean onPreferenceClick(Preference preference) {
((SettingsActivity) mFragment.getActivity()).startPreferencePanel(mFragment,
mClass, null, mTitleRes, null, null, 0);
final int metricsCategory = (mFragment instanceof Instrumentable)
? ((Instrumentable) mFragment).getMetricsCategory()
: Instrumentable.METRICS_CATEGORY_UNKNOWN;
new SubSettingLauncher(preference.getContext())
.setTitle(mTitleRes)
.setDestination(mClass)
.setSourceMetricsCategory(metricsCategory)
.launch();
// Hack: announce that the Google account preferences page is launching the location
// settings
if (mClass.equals(LocationSettings.class.getName())) {