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

Merge "Dreams/Sleep Mode is now Daydreams." into jb-mr1-dev

Browse Source
This commit is contained in:
Daniel Sandler
2012-10-23 10:31:22 -07:00
committed by Android (Google) Code Review
parent 5d6562d34c bd9cafa433
commit 365ece1dd0
6 changed files with 3 additions and 3 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_launcher_dreams" android:icon="@mipmap/ic_daydreams"
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_daydreams.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.6 KiB

BIN
packages/SystemUI/res/mipmap-mdpi/ic_daydreams.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.1 KiB

BIN
packages/SystemUI/res/mipmap-xhdpi/ic_daydreams.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

2
packages/SystemUI/res/values/strings.xml
View File

@@ -456,7 +456,7 @@
<string name="jelly_bean_dream_name">BeanFlinger</string> <string name="jelly_bean_dream_name">BeanFlinger</string>
<!-- Name of the launcher shortcut icon that allows dreams to be started immediately [CHAR LIMIT=20] --> <!-- Name of the launcher shortcut icon that allows dreams to be started immediately [CHAR LIMIT=20] -->
<string name="start_dreams">Sleep Now</string> <string name="start_dreams">Daydream</string>
<!-- Textual description of Ethernet connections --> <!-- Textual description of Ethernet connections -->
<string name="ethernet_label">Ethernet</string> <string name="ethernet_label">Ethernet</string>

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_launcher_dreams)); Intent.ShortcutIconResource.fromContext(this, R.mipmap.ic_daydreams));
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);