Merge "Update feature flag dashboard UI to display all features" (256f6fb6) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/DeviceInfoSettings.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -84,7 +84,7 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable {
		public void onCreate(Bundle icicle) {
		super.onCreate(icicle);
		final Bundle arguments = getArguments();
		if (FeatureFlagUtils.isEnabled(getContext(), DEVICE_INFO_V2) \|\| true) {
		if (FeatureFlagUtils.isEnabled(getContext(), DEVICE_INFO_V2)) {
		// Do not override initial expand children count if we come from
		// search (EXTRA_FRAGMENT_ARG_KEY is set) - we need to display every if entry point
		// is search.
		@@ -119,7 +119,7 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable {

		@Override
		protected int getPreferenceScreenResId() {
		return FeatureFlagUtils.isEnabled(getContext(), DEVICE_INFO_V2) \|\| true
		return FeatureFlagUtils.isEnabled(getContext(), DEVICE_INFO_V2)
		? R.xml.device_info_settings_v2 : R.xml.device_info_settings;
		}

		@@ -156,7 +156,7 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable {

		private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
		Activity activity, Fragment fragment, Lifecycle lifecycle) {
		if (FeatureFlagUtils.isEnabled(context, DEVICE_INFO_V2) \|\| true) {
		if (FeatureFlagUtils.isEnabled(context, DEVICE_INFO_V2)) {
		final List<AbstractPreferenceController> controllers = new ArrayList<>();
		// Device name

		@@ -220,7 +220,7 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable {
		public List<SearchIndexableResource> getXmlResourcesToIndex(
		Context context, boolean enabled) {
		final SearchIndexableResource sir = new SearchIndexableResource(context);
		sir.xmlResId = FeatureFlagUtils.isEnabled(context, DEVICE_INFO_V2) \|\| true
		sir.xmlResId = FeatureFlagUtils.isEnabled(context, DEVICE_INFO_V2)
		? R.xml.device_info_settings_v2 : R.xml.device_info_settings;
		return Arrays.asList(sir);
		}

src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -92,7 +92,7 @@ public class SuggestionFeatureProviderImpl implements SuggestionFeatureProvider
		}

		private static boolean isV2Enabled(Context context) {
		return FeatureFlagUtils.isEnabled(context, SUGGESTIONS_V2) \|\| true;
		return FeatureFlagUtils.isEnabled(context, SUGGESTIONS_V2);
		}

		@Override

src/com/android/settings/development/featureflags/FeatureFlagsPreferenceController.java

+2 −9

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		package com.android.settings.development.featureflags;

		import android.content.Context;
		import android.support.v7.preference.Preference;
		import android.support.v7.preference.PreferenceScreen;
		import android.util.FeatureFlagUtils;

		@@ -68,14 +67,8 @@ public class FeatureFlagsPreferenceController extends AbstractPreferenceControll
		}
		mScreen.removeAll();
		final Context prefContext = mScreen.getContext();
		for (String prefixedFeature : featureMap.keySet()) {
		if (prefixedFeature.startsWith(FeatureFlagUtils.FFLAG_PREFIX)
		&& !prefixedFeature.startsWith(FeatureFlagUtils.FFLAG_OVERRIDE_PREFIX)) {
		final String feature = prefixedFeature.substring(
		FeatureFlagUtils.FFLAG_PREFIX.length());
		final Preference pref = new FeatureFlagPreference(prefContext, feature);
		mScreen.addPreference(pref);
		}
		for (String feature : featureMap.keySet()) {
		mScreen.addPreference(new FeatureFlagPreference(prefContext, feature));
		}
		}
		}

src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -51,7 +51,7 @@ public class DeviceModelPreferenceController extends AbstractPreferenceControlle
		super.displayPreference(screen);
		final Preference pref = screen.findPreference(KEY_DEVICE_MODEL);
		if (pref != null) {
		if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.DEVICE_INFO_V2) \|\| true) {
		if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.DEVICE_INFO_V2)) {
		pref.setSummary(mContext.getResources().getString(R.string.model_summary,
		getDeviceModel()));
		} else {

src/com/android/settings/deviceinfo/HardwareInfoDialogFragment.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -59,7 +59,7 @@ public class HardwareInfoDialogFragment extends InstrumentedDialogFragment {
		DeviceModelPreferenceController.getDeviceModel());

		// Serial number
		if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.DEVICE_INFO_V2) \|\| true) {
		if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.DEVICE_INFO_V2)) {
		setText(content, R.id.serial_number_label, R.id.serial_number_value, getSerialNumber());
		} else {
		content.findViewById(R.id.serial_number_label).setVisibility(View.GONE);