diff options
| author | Amith Yamasani <yamasani@google.com> | 2010-01-20 07:45:26 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-20 07:45:26 -0800 |
| commit | b9f2966707004b84760b498d8fc05b3c8f144f59 (patch) | |
| tree | 161bad95d254ffb5787ddc2b0a88ed7a2e6c62eb | |
| parent | 97ed3f4b1ce40fd3ec8bc34bf2bfb7438b28afd7 (diff) | |
| parent | 63c6a30908a14cdc8cccee3f6a3e88275dcec30e (diff) | |
| download | packages_apps_settings-b9f2966707004b84760b498d8fc05b3c8f144f59.zip packages_apps_settings-b9f2966707004b84760b498d8fc05b3c8f144f59.tar.gz packages_apps_settings-b9f2966707004b84760b498d8fc05b3c8f144f59.tar.bz2 | |
am 63c6a309: Merge "Add dock icon for top-level settings. #2367275" into eclair
Merge commit '63c6a30908a14cdc8cccee3f6a3e88275dcec30e' into eclair-plus-aosp
* commit '63c6a30908a14cdc8cccee3f6a3e88275dcec30e':
Add dock icon for top-level settings. #2367275
| -rw-r--r-- | res/drawable-hdpi/ic_settings_dock.png | bin | 0 -> 1166 bytes | |||
| -rw-r--r-- | res/drawable-mdpi/ic_settings_dock.png | bin | 0 -> 803 bytes | |||
| -rw-r--r-- | res/xml/settings.xml | 1 |
3 files changed, 1 insertions, 0 deletions
diff --git a/res/drawable-hdpi/ic_settings_dock.png b/res/drawable-hdpi/ic_settings_dock.png Binary files differnew file mode 100644 index 0000000..ee594be --- /dev/null +++ b/res/drawable-hdpi/ic_settings_dock.png diff --git a/res/drawable-mdpi/ic_settings_dock.png b/res/drawable-mdpi/ic_settings_dock.png Binary files differnew file mode 100644 index 0000000..fb5d576 --- /dev/null +++ b/res/drawable-mdpi/ic_settings_dock.png diff --git a/res/xml/settings.xml b/res/xml/settings.xml index 0fe502e..22f2523 100644 --- a/res/xml/settings.xml +++ b/res/xml/settings.xml @@ -137,6 +137,7 @@ <com.android.settings.IconPreferenceScreen android:key="dock_settings" + settings:icon="@drawable/ic_settings_dock" android:title="@string/dock_settings"> <intent android:action="android.intent.action.MAIN" |
