PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 6a782d9

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

Change-Id: I5840c18389d1dbcd6bb2a8121ddf4ad3302548fc
This commit is contained in:
Clara Bayarri
2016-04-20 13:34:03 +00:00
committed by android-build-merger
parent 5fafee9819 6a782d925f
commit d67f9a41fb
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
AndroidManifest.xml
View File

@@ -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" />

3
src/com/android/settings/SettingsActivity.java
View File

@@ -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