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

Commit 38ee923a authored by Clara Bayarri's avatar Clara Bayarri Committed by android-build-merger
Browse files

Merge "Fix Developer options appears after first boot, disappers on Settings... 

Merge "Fix Developer options appears after first boot, disappers on Settings Menu Reload" into nyc-dev
am: 81c03dc3

* commit '81c03dc3':
  Fix Developer options appears after first boot, disappers on Settings Menu Reload

Change-Id: I75dcdc1f242a99abdbeb96460dcbda5787f22b63
parents ef5285e3 81c03dc3

AndroidManifest.xml

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