summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2014-01-28 15:52:03 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-01-28 15:52:03 +0000
commite4255d3c3bc8b76eab89b14ce60f01373460acad (patch)
treee5fbaa1b3cd9512475d064aa29fdf3f88151d9db /src/com/android
parenta101937354f43eed57b5a9226a87ff901f224c25 (diff)
parentaf87ce09915ae1b5cc3c3a46ab9fb241df1be13d (diff)
downloadpackages_apps_Settings-e4255d3c3bc8b76eab89b14ce60f01373460acad.zip
packages_apps_Settings-e4255d3c3bc8b76eab89b14ce60f01373460acad.tar.gz
packages_apps_Settings-e4255d3c3bc8b76eab89b14ce60f01373460acad.tar.bz2
am af87ce09: am 04119285: am cb8a5354: am 3f0f02b9: Merge "\'When to daydream\' dialog does not follow the JB dialog design guide"
* commit 'af87ce09915ae1b5cc3c3a46ab9fb241df1be13d': 'When to daydream' dialog does not follow the JB dialog design guide
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/settings/DreamSettings.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/settings/DreamSettings.java b/src/com/android/settings/DreamSettings.java
index 1c8f988..cb91f39 100644
--- a/src/com/android/settings/DreamSettings.java
+++ b/src/com/android/settings/DreamSettings.java
@@ -206,6 +206,7 @@ public class DreamSettings extends SettingsPreferenceFragment {
public void onClick(DialogInterface dialog, int item) {
mBackend.setActivatedOnDock(item == 0 || item == 2);
mBackend.setActivatedOnSleep(item == 1 || item == 2);
+ dialog.dismiss();
}
})
.create();