diff options
| author | Ying Wang <wangying@google.com> | 2010-11-23 14:15:46 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-23 14:15:46 -0800 |
| commit | 5cc45764330ca4e4bd2953cefb9f572e41caa7b3 (patch) | |
| tree | 1c9ba45545b8dd1f754380e29c6102b7caafc76b | |
| parent | 78019ea80d2fee9c491a94c46ed29df5cf047a0c (diff) | |
| parent | 8935b15cbb21ef1023cfe62203a0d98249ffe264 (diff) | |
| download | packages_apps_settings-5cc45764330ca4e4bd2953cefb9f572e41caa7b3.zip packages_apps_settings-5cc45764330ca4e4bd2953cefb9f572e41caa7b3.tar.gz packages_apps_settings-5cc45764330ca4e4bd2953cefb9f572e41caa7b3.tar.bz2 | |
Merge "Move icons to mipmap."
| -rw-r--r-- | AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | res/layout/settings_actionbar.xml | 2 | ||||
| -rw-r--r-- | res/mipmap-hdpi/ic_launcher_settings.png (renamed from res/drawable-hdpi/ic_launcher_settings.png) | bin | 7529 -> 7529 bytes | |||
| -rw-r--r-- | res/mipmap-mdpi/ic_launcher_settings.png (renamed from res/drawable-mdpi/ic_launcher_settings.png) | bin | 4166 -> 4166 bytes | |||
| -rw-r--r-- | src/com/android/settings/CreateShortcut.java | 2 |
5 files changed, 3 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 38579b6..1638c90 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -43,7 +43,7 @@ <uses-permission android:name="android.permission.MOVE_PACKAGE" /> <application android:label="@string/settings_label" - android:icon="@drawable/ic_launcher_settings" + android:icon="@mipmap/ic_launcher_settings" android:taskAffinity="" android:hardwareAccelerated="true"> diff --git a/res/layout/settings_actionbar.xml b/res/layout/settings_actionbar.xml index 6388025..711a0a1 100644 --- a/res/layout/settings_actionbar.xml +++ b/res/layout/settings_actionbar.xml @@ -23,7 +23,7 @@ android:layout_height="match_parent"> <!-- ImageView - android:src="@drawable/ic_launcher_settings" + android:src="@mipmap/ic_launcher_settings" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" diff --git a/res/drawable-hdpi/ic_launcher_settings.png b/res/mipmap-hdpi/ic_launcher_settings.png Binary files differindex ff34a7f..ff34a7f 100644 --- a/res/drawable-hdpi/ic_launcher_settings.png +++ b/res/mipmap-hdpi/ic_launcher_settings.png diff --git a/res/drawable-mdpi/ic_launcher_settings.png b/res/mipmap-mdpi/ic_launcher_settings.png Binary files differindex a8cddf3..a8cddf3 100644 --- a/res/drawable-mdpi/ic_launcher_settings.png +++ b/res/mipmap-mdpi/ic_launcher_settings.png diff --git a/src/com/android/settings/CreateShortcut.java b/src/com/android/settings/CreateShortcut.java index 5ca6370..0312a4b 100644 --- a/src/com/android/settings/CreateShortcut.java +++ b/src/com/android/settings/CreateShortcut.java @@ -38,7 +38,7 @@ public class CreateShortcut extends LauncherActivity { shortcutIntent.setFlags(Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED); Intent intent = new Intent(); intent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, - Intent.ShortcutIconResource.fromContext(this, R.drawable.ic_launcher_settings)); + Intent.ShortcutIconResource.fromContext(this, R.mipmap.ic_launcher_settings)); intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent); intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, itemForPosition(position).label); setResult(RESULT_OK, intent); |
