X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=android%2Fproject%2Fxscreensaver%2Fsrc%2Forg%2Fjwz%2Fxscreensaver%2FXScreenSaverActivity.java;h=dea2fad6f54d1381ab8363bb58d878a47d1cccce;hp=a82727c8aff8aaef009480be0773bde23b36e872;hb=4361b69d3178d7fc98d0388f9a223af6c2651aba;hpb=d6b0217f2417bd19187f0ebc389d6c5c2233b11c

diff --git a/android/project/xscreensaver/src/org/jwz/xscreensaver/XScreenSaverActivity.java b/android/project/xscreensaver/src/org/jwz/xscreensaver/XScreenSaverActivity.java
index a82727c8..dea2fad6 100644
--- a/android/project/xscreensaver/src/org/jwz/xscreensaver/XScreenSaverActivity.java
+++ b/android/project/xscreensaver/src/org/jwz/xscreensaver/XScreenSaverActivity.java
@@ -26,32 +26,35 @@ import android.os.Bundle;
 import android.view.View;
 import android.provider.Settings;
 
-public class XScreenSaverActivity extends Activity {
+public class XScreenSaverActivity extends Activity
+  implements View.OnClickListener {
 
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
-    openList();
+    // openList();
     setContentView(R.layout.activity_xscreensaver);
 
-    findViewById(R.id.apply_wallpaper)
-      .setOnClickListener(new View.OnClickListener() {
-          @Override
-          public void onClick(View v) {
-              openList();
-          }
-      });
-
+    findViewById(R.id.apply_wallpaper).setOnClickListener(this);
+    findViewById(R.id.apply_daydream).setOnClickListener(this);
   }
 
-  private void openList() {
-    Intent intent;
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
-        intent = new Intent(Settings.ACTION_DREAM_SETTINGS);
-    } else {
-        intent = new Intent(Settings.ACTION_DISPLAY_SETTINGS);
+  @Override
+  public void onClick(View v) {
+    switch (v.getId()) {
+    case R.id.apply_wallpaper:
+      startActivity(new Intent(WallpaperManager.ACTION_LIVE_WALLPAPER_CHOOSER));
+      break;
+
+    case R.id.apply_daydream:
+      String action;
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
+        action = Settings.ACTION_DREAM_SETTINGS;
+      } else {
+        action = Settings.ACTION_DISPLAY_SETTINGS;
+      }
+      startActivity(new Intent(action));
+      break;
     }
-    startActivity(intent);
   }
-
 }