Fix disabling of tiles that are not relevant
- Fix restricted user tiles being disabled
- Call new better method in SettingsDrawerActivity for disabling
Change-Id: I2fb6ddd3d505189d2b6d96c0a1039291b80a2f70
Fixes: 29080209
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e8271a8..a686a7a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1896,8 +1896,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" />
@@ -2442,8 +2441,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" />
@@ -2728,7 +2726,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" />