Merge "Convert Colors from GLSurfaceView to TextureView." into jb-mr1-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3a63e63..3e6e144 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3,16 +3,15 @@
package="com.android.dreams.basic"
>
<uses-feature android:glEsVersion="0x00020000" android:required="true" />
- <application android:label="BasicDreams">
+ <application android:label="@string/app_name">
<service
android:name="Colors"
android:exported="true"
android:icon="@mipmap/colors_icon"
- android:label="Colors">
+ android:label="@string/color_dream_name">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
+ <action android:name="android.service.dreams.DreamService" />
<category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.DREAM" />
</intent-filter>
</service>
</application>
diff --git a/res/values/strings.xml b/res/values/strings.xml
new file mode 100644
index 0000000..ee5cf05
--- /dev/null
+++ b/res/values/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources>
+ <!-- Name of the package of basic screensavers, shown in Settings > Apps. [CHAR LIMIT=40] -->
+ <string name="app_name">Basic Dreams</string>
+
+ <!-- Name of the digital kaleidoscope screensaver. [CHAR LIMIT=40] -->
+ <string name="color_dream_name">Colors</string>
+</resources>
