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

Merge \\"Fix disabling of tiles that are not relevant\\" into nyc-dev am: 9c5d3164f5

Browse Source 
am: 4db5484a9d

Change-Id: I1fc083fbb9057a610acc52f5453fd9a3e7c2607f
This commit is contained in:
Jason Monk
2016-06-08 19:26:17 +00:00
committed by android-build-merger
parent 05d8b9da4d 4db5484a9d
commit 743ceecbe8
2 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
AndroidManifest.xml
View File

@@ -1895,8 +1895,7 @@
android:label="@string/development_settings_title"
android:icon="@drawable/ic_settings_development"
android:taskAffinity="com.android.settings"
android:parentActivityName="Settings"
android:enabled="false">
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />
<action android:name="com.android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />
@@ -2441,8 +2440,7 @@
<activity android:name="Settings$PaymentSettingsActivity"
android:label="@string/nfc_payment_settings_title"
android:icon="@drawable/ic_settings_nfc_payment"
android:taskAffinity=""
android:enabled="false">
android:taskAffinity="">
<intent-filter android:priority="1">
<action android:name="android.settings.NFC_PAYMENT_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
@@ -2727,7 +2725,6 @@
<activity android:name="Settings$SimSettingsActivity"
android:label="@string/sim_settings_title"
android:icon="@drawable/ic_settings_sim"
android:enabled="false"
android:taskAffinity="">
<intent-filter android:priority="1">
<action android:name="com.android.settings.sim.SIM_SUB_INFO_SETTINGS" />

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

@@ -1073,7 +1073,7 @@ public class SettingsActivity extends SettingsDrawerActivity
for (DashboardCategory category : categories) {
for (Tile tile : category.tiles) {
ComponentName component = tile.intent.getComponent();
if (packageName.equals(component)&& !ArrayUtils.contains(
if (packageName.equals(component.getPackageName()) && !ArrayUtils.contains(
SETTINGS_FOR_RESTRICTED, component.getClassName())) {
setTileEnabled(component, false, isAdmin, pm);
}
@@ -1084,18 +1084,11 @@ public class SettingsActivity extends SettingsDrawerActivity
private void setTileEnabled(ComponentName component, boolean enabled, boolean isAdmin,
PackageManager pm) {
if (UserHandle.MU_ENABLED && !isAdmin
if (UserHandle.MU_ENABLED && !isAdmin && getPackageName().equals(component.getPackageName())
&& !ArrayUtils.contains(SETTINGS_FOR_RESTRICTED, component.getClassName())) {
enabled = false;
}
int state = pm.getComponentEnabledSetting(component);
boolean isEnabled = state == PackageManager.COMPONENT_ENABLED_STATE_ENABLED;
if (isEnabled != enabled) {
pm.setComponentEnabledSetting(component, enabled
? PackageManager.COMPONENT_ENABLED_STATE_ENABLED
: PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
PackageManager.DONT_KILL_APP);
}
setTileEnabled(component, enabled);
}
private void getMetaData() {