summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/src
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2012-05-31 08:44:47 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-05-31 08:44:47 -0700
commite857632abd994bd1e4a649afb4231f3a97763828 (patch)
tree5e1a229fc700e058845bacffca526a00d4d79e04 /packages/SystemUI/src
parentfa716c7b9bfe0b15725dff63a63b188fe7bc6aca (diff)
parent960779d3bbc6f2c767432ce48aca1e12cb0093b7 (diff)
downloadframeworks_base-e857632abd994bd1e4a649afb4231f3a97763828.zip
frameworks_base-e857632abd994bd1e4a649afb4231f3a97763828.tar.gz
frameworks_base-e857632abd994bd1e4a649afb4231f3a97763828.tar.bz2
Merge "Dock: Renable desk-dock apps" into jb-dev
Diffstat (limited to 'packages/SystemUI/src')
-rw-r--r--packages/SystemUI/src/com/android/systemui/DreamsDockLauncher.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/DreamsDockLauncher.java b/packages/SystemUI/src/com/android/systemui/DreamsDockLauncher.java
index 1db2a7f..73249b4 100644
--- a/packages/SystemUI/src/com/android/systemui/DreamsDockLauncher.java
+++ b/packages/SystemUI/src/com/android/systemui/DreamsDockLauncher.java
@@ -58,8 +58,8 @@ public class DreamsDockLauncher extends Activity {
@Override
public void onReceive(Context context, Intent intent) {
final boolean activateOnDock = 0 != Settings.Secure.getInt(
- context.getContentResolver(),
- Settings.Secure.SCREENSAVER_ACTIVATE_ON_DOCK, 1);
+ context.getContentResolver(),
+ Settings.Secure.SCREENSAVER_ACTIVATE_ON_DOCK, 0);
if (!activateOnDock) return;