Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd6a2115 authored by Clara Bayarri's avatar Clara Bayarri
Browse files

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
parent 39975a60

AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -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">

            <intent-filter android:priority="1">

                <action android:name="android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />

                <action android:name="com.android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />

src/com/android/settings/SettingsActivity.java

+1 −2
Original line number Diff line number Diff line
@@ -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