diff options
author | Daniel Sandler <dsandler@android.com> | 2012-09-28 11:28:09 -0400 |
---|---|---|
committer | Daniel Sandler <dsandler@android.com> | 2012-09-28 11:41:41 -0400 |
commit | 3a12029a3bb6a6d59b3ab65fa923ce96f9f15c26 (patch) | |
tree | 3c8989c33d4c825fa0b6812f05e344be09193af2 /packages/SystemUI/src/com | |
parent | 13701b50f533775fd7a547fd0e479c1ec9035ce8 (diff) | |
download | frameworks_base-3a12029a3bb6a6d59b3ab65fa923ce96f9f15c26.zip frameworks_base-3a12029a3bb6a6d59b3ab65fa923ce96f9f15c26.tar.gz frameworks_base-3a12029a3bb6a6d59b3ab65fa923ce96f9f15c26.tar.bz2 |
Add the SystemUI's dream-starter as a DESK_DOCK app.
The circle is complete: dock mode is back, and it will
launch Dreams by default.
Bug: 7163049
Change-Id: I3c681ac701d65b03f882d92d06389d4528e34747
Diffstat (limited to 'packages/SystemUI/src/com')
-rw-r--r-- | packages/SystemUI/src/com/android/systemui/Somnambulator.java | 42 |
1 files changed, 33 insertions, 9 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/Somnambulator.java b/packages/SystemUI/src/com/android/systemui/Somnambulator.java index bd87238..8e3ce3b 100644 --- a/packages/SystemUI/src/com/android/systemui/Somnambulator.java +++ b/packages/SystemUI/src/com/android/systemui/Somnambulator.java @@ -20,15 +20,33 @@ import android.app.Activity; import android.content.Intent; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; +import android.provider.Settings; import android.service.dreams.Dream; import android.service.dreams.IDreamManager; import android.util.Slog; public class Somnambulator extends Activity { + public static final String TAG = "Somnambulator"; + + public static final int DEFAULT_SCREENSAVER_ENABLED = 1; + public static final int DEFAULT_SCREENSAVER_ACTIVATED_ON_DOCK = 1; public Somnambulator() { } - + + private boolean isScreenSaverEnabled() { + return Settings.Secure.getIntForUser(getContentResolver(), + Settings.Secure.SCREENSAVER_ENABLED, DEFAULT_SCREENSAVER_ENABLED, + UserHandle.USER_CURRENT) != 0; + } + + private boolean isScreenSaverActivatedOnDock() { + return Settings.Secure.getIntForUser(getContentResolver(), + Settings.Secure.SCREENSAVER_ACTIVATE_ON_DOCK, + DEFAULT_SCREENSAVER_ACTIVATED_ON_DOCK, UserHandle.USER_CURRENT) != 0; + } + @Override public void onStart() { super.onStart(); @@ -45,14 +63,20 @@ public class Somnambulator extends Activity { resultIntent.putExtra(Intent.EXTRA_SHORTCUT_NAME, getString(R.string.start_dreams)); setResult(RESULT_OK, resultIntent); } else { - IDreamManager somnambulist = IDreamManager.Stub.asInterface( - ServiceManager.checkService(Dream.DREAM_SERVICE)); - if (somnambulist != null) { - try { - Slog.v("Somnambulator", "Dreaming by user request."); - somnambulist.dream(); - } catch (RemoteException e) { - // fine, stay asleep then + boolean docked = launchIntent.hasCategory(Intent.CATEGORY_DESK_DOCK); + + if (docked && !(isScreenSaverEnabled() && isScreenSaverActivatedOnDock())) { + Slog.i(TAG, "Dreams currently disabled for docks."); + } else { + IDreamManager somnambulist = IDreamManager.Stub.asInterface( + ServiceManager.checkService(Dream.DREAM_SERVICE)); + if (somnambulist != null) { + try { + Slog.v(TAG, "Dreaming on " + (docked ? "dock insertion" : "user request")); + somnambulist.dream(); + } catch (RemoteException e) { + // fine, stay asleep then + } } } } |