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

am 28580b4d: Remove Search from the system Settings app DO NOT MERGE

Browse Source 
Merge commit '28580b4d9a36bb15e75423bc95747b9a746ea8b9' into gingerbread-plus-aosp

* commit '28580b4d9a36bb15e75423bc95747b9a746ea8b9':
  Remove Search from the system Settings app DO NOT MERGE
This commit is contained in:
Bjorn Bringert
2010-09-21 03:05:25 -07:00
committed by Android Git Automerger
parent 7cad4e2c88 28580b4d9a
commit e2b102de67
4 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
res/drawable-hdpi/ic_settings_search.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.6 KiB

BIN
res/drawable-mdpi/ic_settings_search.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 920 B

15
res/xml/settings.xml
View File

@@ -132,21 +132,6 @@
android:targetClass="com.android.settings.deviceinfo.Memory" /> android:targetClass="com.android.settings.deviceinfo.Memory" />
</com.android.settings.IconPreferenceScreen> </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 --> <!-- Language -->
<com.android.settings.IconPreferenceScreen <com.android.settings.IconPreferenceScreen

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

@@ -27,7 +27,6 @@ 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";
private static final String KEY_DOCK_SETTINGS = "dock_settings"; private static final String KEY_DOCK_SETTINGS = "dock_settings";
private static final String KEY_OPERATOR_SETTINGS = "operator_settings"; private static final String KEY_OPERATOR_SETTINGS = "operator_settings";
@@ -41,7 +40,6 @@ 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);
Preference dockSettings = parent.findPreference(KEY_DOCK_SETTINGS); Preference dockSettings = parent.findPreference(KEY_DOCK_SETTINGS);
if (getResources().getBoolean(R.bool.has_dock_settings) == false && dockSettings != null) { if (getResources().getBoolean(R.bool.has_dock_settings) == false && dockSettings != null) {