summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2010-09-11 14:17:31 -0700
committerAmith Yamasani <yamasani@google.com>2010-09-11 14:58:01 -0700
commit60133dd03657354e06fa3aa7e6041862f8ce20a8 (patch)
tree91d3ebe624068a8061ce1055facf21e8a9690335 /res
parentcc0e4db618d9bab9fc759c55ca49913704d2a7f0 (diff)
downloadpackages_apps_Settings-60133dd03657354e06fa3aa7e6041862f8ce20a8.zip
packages_apps_Settings-60133dd03657354e06fa3aa7e6041862f8ce20a8.tar.gz
packages_apps_Settings-60133dd03657354e06fa3aa7e6041862f8ce20a8.tar.bz2
Conditionally remove settings that aren't required on the tablet.
Bug: 2985267 Changes not done : SD card related stuff, as we need some way still to figure out if there is a real SD card in the device. Change-Id: I21c41f18ebe6c050981918481a7f6d69f04b65d0
Diffstat (limited to 'res')
-rw-r--r--res/xml/settings.xml15
-rw-r--r--res/xml/sound_settings.xml2
2 files changed, 2 insertions, 15 deletions
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index 7ec40ec..a91d279 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -116,21 +116,6 @@
android:title="@string/storage_settings">
</com.android.settings.IconPreferenceScreen>
- <!-- Search.
- The settings activity will ensure that this is resolved to an
- activity on the system image, otherwise it will remove this
- preference.
- The intent action is the same as
- android.app.SearchManager.INTENT_ACTION_SEARCH_SETTINGS.
- -->
-
- <com.android.settings.IconPreferenceScreen
- settings:icon="@drawable/ic_settings_search"
- android:title="@string/search_settings"
- android:key="search_settings">
- <intent android:action="android.search.action.SEARCH_SETTINGS" />
- </com.android.settings.IconPreferenceScreen>
-
<!-- Language -->
<com.android.settings.IconPreferenceScreen
diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml
index b800d62..5e87793 100644
--- a/res/xml/sound_settings.xml
+++ b/res/xml/sound_settings.xml
@@ -46,6 +46,7 @@
android:streamType="ring" />
<PreferenceCategory
+ android:key="category_calls"
android:title="@string/sound_category_calls_title"/>
<com.android.settings.DefaultRingtonePreference
@@ -57,6 +58,7 @@
android:ringtoneType="ringtone" />
<PreferenceCategory
+ android:key="category_notification"
android:title="@string/sound_category_notification_title"/>
<!-- Do not nest these, or removals in code will break -->