Commit: 0e1eb1a99bf6b95cebdcf9a1d855f4d4bc2a733d - packages-wallpapers-Basic (git)

packages/wallpapers/Basic

Commit MetaInfo

• Revision: 0e1eb1a99bf6b95cebdcf9a1d855f4d4bc2a733d (tree)
• Time: 2009-09-08 15:28:32
• Author: Dianne Hackborn <hackbod@goog...>
• Commiter: Dianne Hackborn

Log Message

Update wallpapers for configuration API.

Now all wallpapers have a wallpaper XML file describing them. All of these
are currently empty, except for the polar clock which grows a configuration
UI which currently allows you to select whether or not to display seconds.

Change-Id: I1ef2466c23e290f5157cc241867d83c17feba245

Change Summary

• modified: AndroidManifest.xml
• modified: res/values/strings.xml
• add: res/xml/galaxy.xml
• add: res/xml/grass.xml
• add: res/xml/polar_clock.xml
• add: res/xml/polar_clock_prefs.xml
• add: src/com/android/wallpaper/polarclock/PolarClockSettings.java
• modified: src/com/android/wallpaper/polarclock/PolarClockWallpaper.java

Incremental Difference

--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -56,6 +56,7 @@
             <intent-filter>
                 <action android:name="android.service.wallpaper.WallpaperService" />
             </intent-filter>
+            <meta-data android:name="android.service.wallpaper" android:resource="@xml/grass" />
         </service>
 
         <service
@@ -65,8 +66,16 @@
             <intent-filter>
                 <action android:name="android.service.wallpaper.WallpaperService" />
             </intent-filter>
+            <meta-data android:name="android.service.wallpaper" android:resource="@xml/galaxy" />
         </service>
 
+        <activity
+            android:label="@string/clock_settings"
+            android:name="com.android.wallpaper.polarclock.PolarClockSettings"
+            android:theme="@android:style/Theme.Wallpaper"
+            android:exported="true">
+        </activity>
+        
         <service
             android:label="@string/wallpaper_clock"
             android:name="com.android.wallpaper.polarclock.PolarClockWallpaper"
@@ -74,6 +83,7 @@
             <intent-filter>
                 <action android:name="android.service.wallpaper.WallpaperService" />
             </intent-filter>
+            <meta-data android:name="android.service.wallpaper" android:resource="@xml/polar_clock" />
         </service>
 
     </application>

--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -28,8 +28,14 @@
     
     <!-- Wallpaper showing grass and the sky -->
     <string name="wallpaper_grass">Grass</string>
+    
     <!-- Wallpaper showing a galaxy -->
     <string name="wallpaper_galaxy">Galaxy</string>
+    
     <!-- Wallpaper showing a clock -->
     <string name="wallpaper_clock">Polar clock</string>
+    <!-- Polar clock: title of settings activity -->
+    <string name="clock_settings">Polar clock settings</string>
+    <!-- Polar clock: label for "show seconds" pref -->
+    <string name="show_seconds">Show seconds</string>
 </resources>

--- /dev/null
+++ b/res/xml/galaxy.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright (c) 2008, 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.
+ */
+-->
+
+<!-- The attributes in this XML file provide configuration information -->
+<!-- about the galaxy wallpaper. -->
+
+<wallpaper xmlns:android="http://schemas.android.com/apk/res/android"
+/>

--- /dev/null
+++ b/res/xml/grass.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright (c) 2008, 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.
+ */
+-->
+
+<!-- The attributes in this XML file provide configuration information -->
+<!-- about the grass wallpaper. -->
+
+<wallpaper xmlns:android="http://schemas.android.com/apk/res/android"
+/>

--- /dev/null
+++ b/res/xml/polar_clock.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright (c) 2008, 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.
+ */
+-->
+
+<!-- The attributes in this XML file provide configuration information -->
+<!-- about the polar clock. -->
+
+<wallpaper xmlns:android="http://schemas.android.com/apk/res/android"
+        android:settingsActivity="com.android.wallpaper.polarclock.PolarClockSettings"
+/>

--- /dev/null
+++ b/res/xml/polar_clock_prefs.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 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.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/clock_settings"
+        android:key="polar_clock_settings">
+
+    <CheckBoxPreference
+            android:key="show_seconds"
+            android:title="@string/show_seconds"
+            android:defaultValue="true"
+            android:persistent="true"
+            />
+</PreferenceScreen>

--- /dev/null
+++ b/src/com/android/wallpaper/polarclock/PolarClockSettings.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2009 Google Inc.
+ * 
+ * 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.
+ */
+
+package com.android.wallpaper.polarclock;
+
+import com.android.wallpaper.R;
+
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.preference.CheckBoxPreference;
+import android.preference.PreferenceActivity;
+
+public class PolarClockSettings extends PreferenceActivity
+    implements SharedPreferences.OnSharedPreferenceChangeListener {
+
+    private CheckBoxPreference mShowSeconds;
+    
+    @Override
+    protected void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        getPreferenceManager().setSharedPreferencesName(
+                PolarClockWallpaper.SHARED_PREFS_NAME);
+        addPreferencesFromResource(R.xml.polar_clock_prefs);
+        mShowSeconds = (CheckBoxPreference) findPreference(
+                PolarClockWallpaper.PREF_SHOW_SECONDS);
+        getPreferenceManager().getSharedPreferences().registerOnSharedPreferenceChangeListener(
+                this);
+        getWindow().setBackgroundDrawableResource(
+                android.R.drawable.screen_background_dark_transparent);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+    }
+
+    @Override
+    protected void onDestroy() {
+        getPreferenceManager().getSharedPreferences().unregisterOnSharedPreferenceChangeListener(
+                this);
+        super.onDestroy();
+    }
+
+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
+            String key) {
+        //(new BackupManager(this)).dataChanged();
+    }
+}

--- a/src/com/android/wallpaper/polarclock/PolarClockWallpaper.java
+++ b/src/com/android/wallpaper/polarclock/PolarClockWallpaper.java
@@ -27,15 +27,18 @@ import android.content.IntentFilter;
 import android.content.Intent;
 import android.content.BroadcastReceiver;
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.os.Handler;
 import android.os.SystemClock;
 import android.text.format.Time;
-import android.util.Log;
 import android.util.MathUtils;
 
 import java.util.TimeZone;
 
 public class PolarClockWallpaper extends WallpaperService {
+    public static final String SHARED_PREFS_NAME = "polar_clock_settings";
+    public static final String PREF_SHOW_SECONDS = "show_seconds";
+    
     private final Handler mHandler = new Handler();
 
     private IntentFilter mFilter;
@@ -57,7 +60,8 @@ public class PolarClockWallpaper extends WallpaperService {
         return new ClockEngine();
     }
 
-    class ClockEngine extends Engine {
+    class ClockEngine extends Engine
+            implements SharedPreferences.OnSharedPreferenceChangeListener {
         private static final float SATURATION = 0.8f;
         private static final float BRIGHTNESS = 0.9f;
 
@@ -67,6 +71,9 @@ public class PolarClockWallpaper extends WallpaperService {
 
         private static final int COLORS_CACHE_COUNT = 720;
         
+        private SharedPreferences mPrefs;
+        private boolean mShowSeconds;
+        
         private boolean mWatcherRegistered;
         private float mStartTime;
         private Time mCalendar;
@@ -105,7 +112,10 @@ public class PolarClockWallpaper extends WallpaperService {
         @Override
         public void onCreate(SurfaceHolder surfaceHolder) {
             super.onCreate(surfaceHolder);
-            surfaceHolder.setSizeFromLayout();
+            
+            mPrefs = PolarClockWallpaper.this.getSharedPreferences(SHARED_PREFS_NAME, 0);
+            mPrefs.registerOnSharedPreferenceChangeListener(this);
+            onSharedPreferenceChanged(mPrefs, null);
 
             mCalendar = new Time();
             mCalendar.setToNow();
@@ -128,6 +138,16 @@ public class PolarClockWallpaper extends WallpaperService {
             mHandler.removeCallbacks(mDrawClock);
         }
 
+        public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
+                String key) {
+            if (key == null || PREF_SHOW_SECONDS.equals(key)) {
+                mShowSeconds = sharedPreferences.getBoolean(PREF_SHOW_SECONDS, true);
+                if (mVisible) {
+                    drawFrame();
+                }
+            }
+        }
+
         @Override
         public void onVisibilityChanged(boolean visible) {
             mVisible = visible;
@@ -200,15 +220,18 @@ public class PolarClockWallpaper extends WallpaperService {
                         c.scale(0.9f, 0.9f);
                     }
 
-                    // Draw seconds  
                     float size = Math.min(width, height) * 0.5f - RING_THICKNESS;
                     final RectF rect = mRect;
                     rect.set(-size, -size, size, size);
-
-                    float angle = ((mStartTime + SystemClock.elapsedRealtime()) % 60000) / 60000.0f;
-                    if (angle < 0) angle = -angle;
-                    paint.setColor(colors[((int) (angle * COLORS_CACHE_COUNT))]);
-                    c.drawArc(rect, 0.0f, angle * 360.0f, false, paint);
+                    float angle;
+                    
+                    if (mShowSeconds) {
+                        // Draw seconds  
+                        angle = ((mStartTime + SystemClock.elapsedRealtime()) % 60000) / 60000.0f;
+                        if (angle < 0) angle = -angle;
+                        paint.setColor(colors[((int) (angle * COLORS_CACHE_COUNT))]);
+                        c.drawArc(rect, 0.0f, angle * 360.0f, false, paint);
+                    }
 
                     // Draw minutes
                     size -= (SMALL_GAP + RING_THICKNESS);
@@ -249,7 +272,13 @@ public class PolarClockWallpaper extends WallpaperService {
 
             mHandler.removeCallbacks(mDrawClock);
             if (mVisible) {
-                mHandler.postDelayed(mDrawClock, 1000 / 25);
+                if (mShowSeconds) {
+                    mHandler.postDelayed(mDrawClock, 1000 / 25);
+                } else {
+                    // If we aren't showing seconds, we don't need to update
+                    // nearly as often.
+                    mHandler.postDelayed(mDrawClock, 2000);
+                }
             }
         }
     }