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

Browse Source
This commit is contained in:
Clara Bayarri
2016-04-20 13:24:43 +00:00
committed by Android (Google) Code Review
parent 0e048a11c7 cd6a2115c6
commit 81c03dc32f
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

@@ -1885,7 +1885,8 @@
android:label="@string/development_settings_title" android:label="@string/development_settings_title"
android:icon="@drawable/ic_settings_development" android:icon="@drawable/ic_settings_development"
android:taskAffinity="com.android.settings" android:taskAffinity="com.android.settings"
android:parentActivityName="Settings"> android:parentActivityName="Settings"
android:enabled="false">
<intent-filter android:priority="1"> <intent-filter android:priority="1">
<action android:name="android.settings.APPLICATION_DEVELOPMENT_SETTINGS" /> <action android:name="android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />
<action android:name="com.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; enabled = false;
} }
int state = pm.getComponentEnabledSetting(component); int state = pm.getComponentEnabledSetting(component);
boolean isEnabled = state == PackageManager.COMPONENT_ENABLED_STATE_DEFAULT boolean isEnabled = state == PackageManager.COMPONENT_ENABLED_STATE_ENABLED;
|| state == PackageManager.COMPONENT_ENABLED_STATE_ENABLED;
if (isEnabled != enabled) { if (isEnabled != enabled) {
pm.setComponentEnabledSetting(component, enabled pm.setComponentEnabledSetting(component, enabled
? PackageManager.COMPONENT_ENABLED_STATE_ENABLED ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED