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

am a9d5be1: Show Search settings in Settings app.

Browse Source 
Merge commit 'a9d5be1e5f49c272aa445c5c66e07df81d8bfc27'

* commit 'a9d5be1e5f49c272aa445c5c66e07df81d8bfc27':
  Show Search settings in Settings app.
This commit is contained in:
Bjorn Bringert
2009-04-29 13:43:32 -07:00
committed by The Android Open Source Project
parent ad64b8aae1 a9d5be1e5f
commit 3f6acd807c
3 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/values/strings.xml
View File

@@ -832,6 +832,11 @@
<!-- Main Settings screen setting option summary text for the itme to go into the screen with data sync settings--> <!-- Main Settings screen setting option summary text for the itme to go into the screen with data sync settings-->
<string name="sync_settings_summary">Select which applications are synchronized</string> <string name="sync_settings_summary">Select which applications are synchronized</string>
<!-- Main Settings screen, setting option name to go into search settings -->
<string name="search_settings">Search</string>
<!-- Main Settings screen, setting option summary to go into search settings -->
<string name="search_settings_summary">Manage global search, web search and search history</string>
<!-- Display settings --> <!-- Display settings -->
<!-- Sound & display settings screen, section header for settings related to display --> <!-- Sound & display settings screen, section header for settings related to display -->
<string name="display_settings">Display settings</string> <string name="display_settings">Display settings</string>

16
res/xml/settings.xml
View File

@@ -115,6 +115,22 @@
android:targetClass="com.android.settings.LanguageSettings" /> android:targetClass="com.android.settings.LanguageSettings" />
</PreferenceScreen> </PreferenceScreen>
<!-- 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.
-->
<PreferenceScreen
android:title="@string/search_settings"
android:summary="@string/search_settings_summary"
android:key="search_settings">
<intent android:action="android.search.action.SEARCH_SETTINGS" />
</PreferenceScreen>
<!-- About Device --> <!-- About Device -->
<PreferenceScreen <PreferenceScreen

2
src/com/android/settings/Settings.java
View File

@@ -26,6 +26,7 @@ public class Settings extends PreferenceActivity {
private static final String KEY_PARENT = "parent"; private static final String KEY_PARENT = "parent";
private static final String KEY_CALL_SETTINGS = "call_settings"; private static final String KEY_CALL_SETTINGS = "call_settings";
private static final String KEY_SYNC_SETTINGS = "sync_settings"; private static final String KEY_SYNC_SETTINGS = "sync_settings";
private static final String KEY_SEARCH_SETTINGS = "search_settings";
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
@@ -35,6 +36,7 @@ public class Settings extends PreferenceActivity {
PreferenceGroup parent = (PreferenceGroup) findPreference(KEY_PARENT); PreferenceGroup parent = (PreferenceGroup) findPreference(KEY_PARENT);
Utils.updatePreferenceToSpecificActivityOrRemove(this, parent, KEY_SYNC_SETTINGS, 0); Utils.updatePreferenceToSpecificActivityOrRemove(this, parent, KEY_SYNC_SETTINGS, 0);
Utils.updatePreferenceToSpecificActivityOrRemove(this, parent, KEY_SEARCH_SETTINGS, 0);
} }
@Override @Override