Added switching wallpaper.

learnopengles · Jul 14, 2012 · 7ce73ce · 7ce73ce
1 parent 562cfd8
commit 7ce73ce
Show file tree

Hide file tree

Showing 13 changed files with 1,301 additions and 5 deletions.
diff --git a/android/AndroidOpenGLESLessons/AndroidManifest.xml b/android/AndroidOpenGLESLessons/AndroidManifest.xml
@@ -76,6 +76,25 @@
                 android:name="android.service.wallpaper"
                 android:resource="@xml/wallpaper" />
         </service>
+        <service
+            android:name=".switchinglivewallpaper.LessonThreeWallpaperService"
+            android:label="@string/lesson_three_wallpaper_3"
+            android:permission="android.permission.BIND_WALLPAPER" >
+            <intent-filter>
+                <action android:name="android.service.wallpaper.WallpaperService" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.service.wallpaper"
+                android:resource="@xml/switching_wallpaper" />
+        </service>
+        <activity
+            android:name=".switchinglivewallpaper.WallpaperSettings"
+            android:exported="true"
+            android:label="@string/lesson_three_wallpaper_3"
+            android:permission="android.permission.BIND_WALLPAPER"
+            android:theme="@style/WallpaperSettingsLight" >
+        </activity>
     </application>
 
 </manifest>
diff --git a/android/AndroidOpenGLESLessons/project.properties b/android/AndroidOpenGLESLessons/project.properties
@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-8
+target=android-16
diff --git a/android/AndroidOpenGLESLessons/res/values-v11/styles.xml b/android/AndroidOpenGLESLessons/res/values-v11/styles.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!--
+     Theme for a wallpaper's setting activity that is designed to be on
+         top of a dark background.
+    -->
+    <style name="WallpaperSettings" parent="@android:style/Theme.Holo">        
+        <item name="android:windowBackground">@android:drawable/screen_background_dark_transparent</item>        
+        <item name="android:colorBackgroundCacheHint">@null</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowAnimationStyle">@android:style/Animation.Translucent</item>
+    </style>
+
+    <!--
+         Theme for a wallpaper's setting activity that is designed to be on
+         top of a light background.
+    -->
+    <style name="WallpaperSettingsLight" parent="@android:style/Theme.Holo.Light">
+        <item name="android:windowBackground">@android:drawable/screen_background_light_transparent</item>
+        <item name="android:colorBackgroundCacheHint">@null</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowAnimationStyle">@android:style/Animation.Translucent</item>
+    </style>
+
+</resources>

diff --git a/android/AndroidOpenGLESLessons/res/values-v14/styles.xml b/android/AndroidOpenGLESLessons/res/values-v14/styles.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!--
+     Theme for a wallpaper's setting activity that is designed to be on
+         top of a dark background.
+    -->
+    <style name="WallpaperSettings" parent="@android:style/Theme.Holo">        
+        <item name="android:windowBackground">@android:drawable/screen_background_dark_transparent</item>                
+        <item name="android:colorBackgroundCacheHint">@null</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowAnimationStyle">@android:style/Animation.Translucent</item>
+    </style>
+
+    <!--
+         Theme for a wallpaper's setting activity that is designed to be on
+         top of a light background.
+    -->
+    <style name="WallpaperSettingsLight" parent="@android:style/Theme.Holo.Light.DarkActionBar">
+        <item name="android:windowBackground">@android:drawable/screen_background_light_transparent</item>
+        <item name="android:colorBackgroundCacheHint">@null</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowAnimationStyle">@android:style/Animation.Translucent</item>
+    </style>
+
+</resources>

diff --git a/android/AndroidOpenGLESLessons/res/values/strings.xml b/android/AndroidOpenGLESLessons/res/values/strings.xml
@@ -9,8 +9,9 @@
     <string name="lesson_two_subtitle">Learn about ambient and diffuse lighting in this lesson.</string>
     <string name="lesson_three">Lesson Three: Adding Per-Pixel Lighting</string>  
     <string name="lesson_three_subtitle">This builds on lesson two by adding per-pixel lighting.</string>
-    <string name="lesson_three_wallpaper_1">Lesson 3: GLSurfaceView</string>
-    <string name="lesson_three_wallpaper_2">Lesson 3: Re-implementation of GLSurfaceView</string>
+    <string name="lesson_three_wallpaper_1">Using GLSurfaceView</string>
+    <string name="lesson_three_wallpaper_2">Using re-implementation of GLSurfaceView</string>
+    <string name="lesson_three_wallpaper_3">Switching implementations</string>
     <string name="lesson_four">Lesson Four: Basic Texturing</string>  
     <string name="lesson_four_subtitle">This builds on lesson three by adding basic texturing.</string>
     <string name="lesson_five">Lesson Five: An Intro to Blending</string>  

diff --git a/android/AndroidOpenGLESLessons/res/values/styles.xml b/android/AndroidOpenGLESLessons/res/values/styles.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!--
+     Theme for a wallpaper's setting activity that is designed to be on
+         top of a dark background.
+    -->
+    <style name="WallpaperSettings" parent="@android:style/Theme">
+        <item name="android:windowBackground">@android:drawable/screen_background_dark_transparent</item>
+        <item name="android:colorBackgroundCacheHint">@null</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowAnimationStyle">@android:style/Animation.Translucent</item>
+    </style>
+
+    <!--
+         Theme for a wallpaper's setting activity that is designed to be on
+         top of a light background.
+    -->
+    <style name="WallpaperSettingsLight" parent="@android:style/Theme.Light">
+        <item name="android:windowBackground">@android:drawable/screen_background_light_transparent</item>
+        <item name="android:colorBackgroundCacheHint">@null</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowAnimationStyle">@android:style/Animation.Translucent</item>
+    </style>
+
+</resources>

diff --git a/android/AndroidOpenGLESLessons/res/xml/preferences.xml b/android/AndroidOpenGLESLessons/res/xml/preferences.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
+    <CheckBoxPreference
+        android:key="use_gl_surface_view"
+        android:title="Use GLSurfaceView"
+        android:defaultValue="true"/>
+</PreferenceScreen>
diff --git a/android/AndroidOpenGLESLessons/res/xml/switching_wallpaper.xml b/android/AndroidOpenGLESLessons/res/xml/switching_wallpaper.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<wallpaper xmlns:android="http://schemas.android.com/apk/res/android"
+    android:settingsActivity="com.learnopengles.android.switchinglivewallpaper.WallpaperSettings"
+    android:thumbnail="@drawable/ic_lesson_three" />
diff --git a/...oid/AndroidOpenGLESLessons/src/com/learnopengles/android/lesson7/LessonSevenRenderer.java b/...oid/AndroidOpenGLESLessons/src/com/learnopengles/android/lesson7/LessonSevenRenderer.java
@@ -372,7 +372,7 @@ public void run() {
 							mLessonSevenActivity.runOnUiThread(new Runnable() {							
 								@Override
 								public void run() {
-									Toast.makeText(mLessonSevenActivity, "Out of memory; Dalvik takes a while to clean up the memory. Please try again.\nExternal bytes allocated=" + dalvik.system.VMRuntime.getRuntime().getExternalBytesAllocated(), Toast.LENGTH_LONG).show();								
+//									Toast.makeText(mLessonSevenActivity, "Out of memory; Dalvik takes a while to clean up the memory. Please try again.\nExternal bytes allocated=" + dalvik.system.VMRuntime.getRuntime().getExternalBytesAllocated(), Toast.LENGTH_LONG).show();								
 								}
 							});										
 						}																	
@@ -385,7 +385,7 @@ public void run() {
 				mLessonSevenActivity.runOnUiThread(new Runnable() {							
 					@Override
 					public void run() {
-						Toast.makeText(mLessonSevenActivity, "Out of memory; Dalvik takes a while to clean up the memory. Please try again.\nExternal bytes allocated=" + dalvik.system.VMRuntime.getRuntime().getExternalBytesAllocated(), Toast.LENGTH_LONG).show();								
+//						Toast.makeText(mLessonSevenActivity, "Out of memory; Dalvik takes a while to clean up the memory. Please try again.\nExternal bytes allocated=" + dalvik.system.VMRuntime.getRuntime().getExternalBytesAllocated(), Toast.LENGTH_LONG).show();								
 					}
 				});
 			}