Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 6b2d4196: am 50e1f9eb: Merge "Final icon for (Day)dreams." into jb-mr1-dev

Browse Source 
* commit '6b2d41966ad7970d0dd4a891fbf41641514df418':
  Final icon for (Day)dreams.
This commit is contained in:
Daniel Sandler
2012-10-29 13:37:07 -07:00
committed by Android Git Automerger
parent 3f47cd2bf5 6b2d41966a
commit 1b38ea484b
8 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/AndroidManifest.xml
View File

@@ -214,7 +214,7 @@
<activity android:name=".Somnambulator" <activity android:name=".Somnambulator"
android:label="@string/start_dreams" android:label="@string/start_dreams"
android:icon="@mipmap/ic_daydreams" android:icon="@mipmap/ic_launcher_dreams"
android:theme="@android:style/Theme.Wallpaper.NoTitleBar" android:theme="@android:style/Theme.Wallpaper.NoTitleBar"
android:exported="true" android:exported="true"
android:excludeFromRecents="true" android:excludeFromRecents="true"

BIN
packages/SystemUI/res/mipmap-hdpi/ic_dreams.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.5 KiB

BIN
packages/SystemUI/res/mipmap-hdpi/ic_launcher_dreams.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 8.0 KiB

BIN
packages/SystemUI/res/mipmap-mdpi/ic_dreams.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.3 KiB

BIN
packages/SystemUI/res/mipmap-mdpi/ic_launcher_dreams.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

BIN
packages/SystemUI/res/mipmap-xhdpi/ic_dreams.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.9 KiB

BIN
packages/SystemUI/res/mipmap-xhdpi/ic_launcher_dreams.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.2 KiB

After

Width:  |  Height:  |  Size: 11 KiB

2
packages/SystemUI/src/com/android/systemui/Somnambulator.java
View File

@@ -43,7 +43,7 @@ public class Somnambulator extends Activity {
| Intent.FLAG_ACTIVITY_NEW_TASK); | Intent.FLAG_ACTIVITY_NEW_TASK);
Intent resultIntent = new Intent(); Intent resultIntent = new Intent();
resultIntent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, 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_INTENT, shortcutIntent);
resultIntent.putExtra(Intent.EXTRA_SHORTCUT_NAME, getString(R.string.start_dreams)); resultIntent.putExtra(Intent.EXTRA_SHORTCUT_NAME, getString(R.string.start_dreams));
setResult(RESULT_OK, resultIntent); setResult(RESULT_OK, resultIntent);