commit cb823d5983ec2d33b6b0fe4c9f2a99509051678b
author jeffreyhuang <jeffreyhuang@google.com> Fri Nov 17 11:19:44 2017 -0800
committer jeffreyhuang <jeffreyhuang@google.com> Fri Nov 17 13:52:33 2017 -0800
tree b158acde9dd557c116efe4f0d62823de0b0cfb01
parent 1eaf52aad4ee53e45f1326e3f46166081bdbad0b

Delete DevelopmentSettings.java

 - Remove the old DevelopmentSettings
 - Remove references to the feature flag

Fixes: 65522949
Test: make RunSettingsRoboTests -j40
Change-Id: Ie2eb3465127d79a027de6bb58a47bb15e3094f89

src/com/android/settings/SettingsActivity.java

diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index f1c2a0a..78c9c21 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -55,7 +55,6 @@
 import com.android.settings.Settings.WifiSettingsActivity;
 import com.android.settings.applications.manageapplications.ManageApplications;
 import com.android.settings.backup.BackupSettingsActivity;
-import com.android.settings.core.InstrumentedPreferenceFragment;
 import com.android.settings.core.gateway.SettingsGateway;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.core.instrumentation.SharedPreferencesLogger;
@@ -827,16 +826,10 @@
 
         final boolean showDev = DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(this)
                 && !um.hasUserRestriction(UserManager.DISALLOW_DEBUGGING_FEATURES);
-        final boolean useDevOptionV1 = Settings.DevelopmentSettingsActivity.isEnabled();
-        // Enable old Dev option if v2 is disabled
-        somethingChanged = setTileEnabled(new ComponentName(packageName,
-                        Settings.DevelopmentSettingsActivity.class.getName()),
-                showDev && useDevOptionV1, isAdmin)
-                || somethingChanged;
-        // Enable new Dev option if v2 is enable
+
         somethingChanged = setTileEnabled(new ComponentName(packageName,
                         Settings.DevelopmentSettingsDashboardActivity.class.getName()),
-                showDev && !useDevOptionV1, isAdmin)
+                showDev, isAdmin)
                 || somethingChanged;
 
         // Enable/disable backup settings depending on whether the user is admin.