From cd6a2115c64f89fb52119a08a164e242a7363455 Mon Sep 17 00:00:00 2001 From: Clara Bayarri Date: Wed, 20 Apr 2016 11:29:04 +0100 Subject: [PATCH] Fix Developer options appears after first boot, disappers on Settings Menu Reload The Tiles are updated to disabled via PackageManager, which takes a few seconds to kick in and hence the user sees the option appear and then disappear. Making Developer Options disabled by default fixes the flash. Note now the opposite happens, on eng builds where Developer Settings are on by default they will not appear until the PackageManager update has cleared. Bug: 28121698 Change-Id: Ic7147e4430e2332d596ce37dbbce30e330dcf551 --- AndroidManifest.xml | 3 ++- src/com/android/settings/SettingsActivity.java | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 2eb27609f84..226ee787fe8 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1885,7 +1885,8 @@ android:label="@string/development_settings_title" android:icon="@drawable/ic_settings_development" android:taskAffinity="com.android.settings" - android:parentActivityName="Settings"> + android:parentActivityName="Settings" + android:enabled="false"> diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index 53c97b580c7..616fe395460 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -1096,8 +1096,7 @@ public class SettingsActivity extends SettingsDrawerActivity enabled = false; } int state = pm.getComponentEnabledSetting(component); - boolean isEnabled = state == PackageManager.COMPONENT_ENABLED_STATE_DEFAULT - || state == PackageManager.COMPONENT_ENABLED_STATE_ENABLED; + boolean isEnabled = state == PackageManager.COMPONENT_ENABLED_STATE_ENABLED; if (isEnabled != enabled) { pm.setComponentEnabledSetting(component, enabled ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED