diff options
| author | Daniel Sandler <dsandler@android.com> | 2012-10-04 20:58:15 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-04 20:58:16 -0700 |
| commit | 012590f122eb38b4a50b4f9735d1a009d4053c14 (patch) | |
| tree | c330145e4e2cacf93bf65d8fc383733e364ce185 | |
| parent | 51b6bdd322579f416f8caad05d987181751744ba (diff) | |
| parent | 179bbb02345aea609119d803f08af401a63a8fb4 (diff) | |
| download | android_packages_screensavers_PhotoTable-012590f122eb38b4a50b4f9735d1a009d4053c14.tar.gz android_packages_screensavers_PhotoTable-012590f122eb38b4a50b4f9735d1a009d4053c14.tar.bz2 android_packages_screensavers_PhotoTable-012590f122eb38b4a50b4f9735d1a009d4053c14.zip | |
Merge "Keep up with new Dreams API." into jb-mr1-dev
| -rw-r--r-- | src/com/android/dreams/phototable/FlipperDream.java | 4 | ||||
| -rw-r--r-- | src/com/android/dreams/phototable/PhotoTableDream.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/dreams/phototable/FlipperDream.java b/src/com/android/dreams/phototable/FlipperDream.java index 9953f32..36d8c7b 100644 --- a/src/com/android/dreams/phototable/FlipperDream.java +++ b/src/com/android/dreams/phototable/FlipperDream.java @@ -25,8 +25,8 @@ public class FlipperDream extends DreamService { public static final String TAG = "FlipperDream"; @Override - public void onStart() { - super.onStart(); + public void onDreamingStarted() { + super.onDreamingStarted(); setInteractive(false); } diff --git a/src/com/android/dreams/phototable/PhotoTableDream.java b/src/com/android/dreams/phototable/PhotoTableDream.java index 20fd566..e7cc2ce 100644 --- a/src/com/android/dreams/phototable/PhotoTableDream.java +++ b/src/com/android/dreams/phototable/PhotoTableDream.java @@ -32,8 +32,8 @@ public class PhotoTableDream extends DreamService { private PhotoTable mTable; @Override - public void onStart() { - super.onStart(); + public void onDreamingStarted() { + super.onDreamingStarted(); setInteractive(true); } |