Merge "Hide dev options v1 under feature flag" (d50363b4) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+5 −6

Original line number	Diff line number	Diff line
		@@ -1896,11 +1896,13 @@
		android:icon="@drawable/ic_settings_development"
		android:taskAffinity="com.android.settings"
		android:parentActivityName="Settings">
		<!-- Enable if we need to revert to the old development settings
		<intent-filter android:priority="1">
		<action android:name="android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />
		<action android:name="com.android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		-->
		<intent-filter android:priority="50">
		<action android:name="com.android.settings.action.SETTINGS" />
		</intent-filter>
		@@ -1919,14 +1921,11 @@
		android:icon="@drawable/ic_settings_development"
		android:taskAffinity="com.android.settings"
		android:parentActivityName="Settings">

		<!-- Enable when deleting DevelopmentSettingsActivity
		<intent-filter android:priority="1">
		<action android:name="android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />
		<action android:name="com.android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		-->
		<intent-filter android:priority="50">
		<action android:name="com.android.settings.action.SETTINGS" />
		</intent-filter>
		@@ -1994,9 +1993,9 @@
		<activity-alias android:name="DevelopmentSettings"
		android:exported="true"
		android:label="@string/development_settings_title"
		android:targetActivity="Settings$DevelopmentSettingsActivity">
		android:targetActivity="Settings$DevelopmentSettingsDashboardActivity">
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.development.DevelopmentSettings" />
		android:value="com.android.settings.development.DevelopmentSettingsDashboardFragment" />
		</activity-alias>

		<activity android:name=".development.AppPicker"
		@@ -2011,7 +2010,7 @@
		<activity-alias android:name="UsbSettings"
		android:exported="true"
		android:label="@string/storage_title_usb"
		android:targetActivity="Settings$DevelopmentSettingsActivity">
		android:targetActivity="Settings$DevelopmentSettingsDashboardActivity">
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.deviceinfo.UsbSettings" />
		</activity-alias>

src/com/android/settings/Settings.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -73,12 +73,12 @@ public class Settings extends SettingsActivity {
		* @deprecated in favor of {@link DevelopmentSettingsDashboardActivity}.
		*/
		@Deprecated
		public static class DevelopmentSettingsActivity extends SettingsActivity { /* empty */ }
		public static class DevelopmentSettingsDashboardActivity extends SettingsActivity {
		public static class DevelopmentSettingsActivity extends SettingsActivity {
		public static final boolean isEnabled() {
		return FeatureFlagUtils.isEnabled("dev_option_v2");
		return FeatureFlagUtils.isEnabled("dev_option_v1");
		}
		}
		public static class DevelopmentSettingsDashboardActivity extends SettingsActivity { /* empty */ }
		public static class AccessibilitySettingsActivity extends SettingsActivity { /* empty */ }
		public static class CaptioningSettingsActivity extends SettingsActivity { /* empty */ }
		public static class AccessibilityInversionSettingsActivity extends SettingsActivity { /* empty */ }

src/com/android/settings/SettingsActivity.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -832,16 +832,16 @@ public class SettingsActivity extends SettingsDrawerActivity

		final boolean showDev = DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(this)
		&& !um.hasUserRestriction(UserManager.DISALLOW_DEBUGGING_FEATURES);
		final boolean useDevOptionV2 = Settings.DevelopmentSettingsDashboardActivity.isEnabled();
		final boolean useDevOptionV1 = Settings.DevelopmentSettingsActivity.isEnabled();
		// Enable old Dev option if v2 is disabled
		somethingChanged = setTileEnabled(new ComponentName(packageName,
		Settings.DevelopmentSettingsActivity.class.getName()),
		showDev && !useDevOptionV2, isAdmin)
		showDev && useDevOptionV1, isAdmin)
		\|\| somethingChanged;
		// Enable new Dev option if v2 is enable
		somethingChanged = setTileEnabled(new ComponentName(packageName,
		Settings.DevelopmentSettingsDashboardActivity.class.getName()),
		showDev && useDevOptionV2, isAdmin)
		showDev && !useDevOptionV1, isAdmin)
		\|\| somethingChanged;

		// Enable/disable backup settings depending on whether the user is admin.

src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -53,7 +53,7 @@ public abstract class DeviceListPreferenceFragment extends

		private static final String KEY_BT_SCAN = "bt_scan";

		// Copied from DevelopmentSettings.java
		// Copied from BluetoothDeviceNoNamePreferenceController.java
		private static final String BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY =
		"persist.bluetooth.showdeviceswithoutnames";

src/com/android/settings/dashboard/DashboardFragmentRegistry.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -85,11 +85,11 @@ public class DashboardFragmentRegistry {
		SystemDashboardFragment.class.getName(), CategoryKey.CATEGORY_SYSTEM);
		PARENT_TO_CATEGORY_KEY_MAP.put(LanguageAndInputSettings.class.getName(),
		CategoryKey.CATEGORY_SYSTEM_LANGUAGE);
		if (Settings.DevelopmentSettingsDashboardActivity.isEnabled()) {
		PARENT_TO_CATEGORY_KEY_MAP.put(DevelopmentSettingsDashboardFragment.class.getName(),
		if (Settings.DevelopmentSettingsActivity.isEnabled()) {
		PARENT_TO_CATEGORY_KEY_MAP.put(DevelopmentSettings.class.getName(),
		CategoryKey.CATEGORY_SYSTEM_DEVELOPMENT);
		} else {
		PARENT_TO_CATEGORY_KEY_MAP.put(DevelopmentSettings.class.getName(),
		PARENT_TO_CATEGORY_KEY_MAP.put(DevelopmentSettingsDashboardFragment.class.getName(),
		CategoryKey.CATEGORY_SYSTEM_DEVELOPMENT);
		}
		PARENT_TO_CATEGORY_KEY_MAP.put(ConfigureNotificationSettings.class.getName(),