diff options
| author | Daniel Sandler <dsandler@android.com> | 2012-10-26 12:29:12 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-26 12:29:13 -0700 |
| commit | 50e1f9eb9333451f0e07b1878b5a78bbcdec27ab (patch) | |
| tree | f9c87fd33dd271ff71ac4f53718fec0a21fddb92 | |
| parent | f0fd172a7d4a71da413e5bb6aad9ef611ce2a837 (diff) | |
| parent | b055aa8ec000fd62e4ce6456eac277463aacd7d2 (diff) | |
| download | frameworks_base-50e1f9eb9333451f0e07b1878b5a78bbcdec27ab.zip frameworks_base-50e1f9eb9333451f0e07b1878b5a78bbcdec27ab.tar.gz frameworks_base-50e1f9eb9333451f0e07b1878b5a78bbcdec27ab.tar.bz2 | |
Merge "Final icon for (Day)dreams." into jb-mr1-dev
| -rw-r--r-- | packages/SystemUI/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | packages/SystemUI/res/mipmap-hdpi/ic_dreams.png | bin | 3572 -> 0 bytes | |||
| -rw-r--r-- | packages/SystemUI/res/mipmap-hdpi/ic_launcher_dreams.png | bin | 6369 -> 8149 bytes | |||
| -rw-r--r-- | packages/SystemUI/res/mipmap-mdpi/ic_dreams.png | bin | 2366 -> 0 bytes | |||
| -rw-r--r-- | packages/SystemUI/res/mipmap-mdpi/ic_launcher_dreams.png | bin | 3575 -> 4688 bytes | |||
| -rw-r--r-- | packages/SystemUI/res/mipmap-xhdpi/ic_dreams.png | bin | 4996 -> 0 bytes | |||
| -rw-r--r-- | packages/SystemUI/res/mipmap-xhdpi/ic_launcher_dreams.png | bin | 9373 -> 11680 bytes | |||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/Somnambulator.java | 2 |
8 files changed, 2 insertions, 2 deletions
diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index 02b5326..cfe70dc 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -214,7 +214,7 @@ <activity android:name=".Somnambulator" android:label="@string/start_dreams" - android:icon="@mipmap/ic_daydreams" + android:icon="@mipmap/ic_launcher_dreams" android:theme="@android:style/Theme.Wallpaper.NoTitleBar" android:exported="true" android:excludeFromRecents="true" diff --git a/packages/SystemUI/res/mipmap-hdpi/ic_dreams.png b/packages/SystemUI/res/mipmap-hdpi/ic_dreams.png Binary files differdeleted file mode 100644 index 56cbac1..0000000 --- a/packages/SystemUI/res/mipmap-hdpi/ic_dreams.png +++ /dev/null diff --git a/packages/SystemUI/res/mipmap-hdpi/ic_launcher_dreams.png b/packages/SystemUI/res/mipmap-hdpi/ic_launcher_dreams.png Binary files differindex a335d6d..37185f3 100644 --- a/packages/SystemUI/res/mipmap-hdpi/ic_launcher_dreams.png +++ b/packages/SystemUI/res/mipmap-hdpi/ic_launcher_dreams.png diff --git a/packages/SystemUI/res/mipmap-mdpi/ic_dreams.png b/packages/SystemUI/res/mipmap-mdpi/ic_dreams.png Binary files differdeleted file mode 100644 index ea3d991..0000000 --- a/packages/SystemUI/res/mipmap-mdpi/ic_dreams.png +++ /dev/null diff --git a/packages/SystemUI/res/mipmap-mdpi/ic_launcher_dreams.png b/packages/SystemUI/res/mipmap-mdpi/ic_launcher_dreams.png Binary files differindex ef2e27b..1993b0d 100644 --- a/packages/SystemUI/res/mipmap-mdpi/ic_launcher_dreams.png +++ b/packages/SystemUI/res/mipmap-mdpi/ic_launcher_dreams.png diff --git a/packages/SystemUI/res/mipmap-xhdpi/ic_dreams.png b/packages/SystemUI/res/mipmap-xhdpi/ic_dreams.png Binary files differdeleted file mode 100644 index ddc7f66..0000000 --- a/packages/SystemUI/res/mipmap-xhdpi/ic_dreams.png +++ /dev/null diff --git a/packages/SystemUI/res/mipmap-xhdpi/ic_launcher_dreams.png b/packages/SystemUI/res/mipmap-xhdpi/ic_launcher_dreams.png Binary files differindex 7b42cb4..c92b681 100644 --- a/packages/SystemUI/res/mipmap-xhdpi/ic_launcher_dreams.png +++ b/packages/SystemUI/res/mipmap-xhdpi/ic_launcher_dreams.png diff --git a/packages/SystemUI/src/com/android/systemui/Somnambulator.java b/packages/SystemUI/src/com/android/systemui/Somnambulator.java index 1f00bc1..0dd6d92 100644 --- a/packages/SystemUI/src/com/android/systemui/Somnambulator.java +++ b/packages/SystemUI/src/com/android/systemui/Somnambulator.java @@ -43,7 +43,7 @@ public class Somnambulator extends Activity { | Intent.FLAG_ACTIVITY_NEW_TASK); Intent resultIntent = new Intent(); resultIntent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, - Intent.ShortcutIconResource.fromContext(this, R.mipmap.ic_daydreams)); + Intent.ShortcutIconResource.fromContext(this, R.mipmap.ic_launcher_dreams)); resultIntent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent); resultIntent.putExtra(Intent.EXTRA_SHORTCUT_NAME, getString(R.string.start_dreams)); setResult(RESULT_OK, resultIntent); |
