summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2014-07-14 15:05:55 -0700
committerAlan Viverette <alanv@google.com>2014-07-14 15:07:34 -0700
commit97e5aac732d76cf10f398a84c61e252047d9bade (patch)
treebc761dbed8d33f717b8f3a647dbf31da5b960bf6
parent218f99c0e56bf43d66690d92a151efcb711d2fcd (diff)
downloadpackages_apps_Settings-97e5aac732d76cf10f398a84c61e252047d9bade.zip
packages_apps_Settings-97e5aac732d76cf10f398a84c61e252047d9bade.tar.gz
packages_apps_Settings-97e5aac732d76cf10f398a84c61e252047d9bade.tar.bz2
Use activity for brightness dialog
BUG: 15512088 Change-Id: Ibe38525b78d06e97cdf7e6369ca8179ab63e59d7
-rw-r--r--res/xml/display_settings.xml7
-rw-r--r--src/com/android/settings/BrightnessPreference.java4
2 files changed, 6 insertions, 5 deletions
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index 3c4f4af..c5aae6a 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -19,11 +19,12 @@
android:title="@string/display_settings"
settings:keywords="@string/keywords_display">
- <com.android.settings.BrightnessPreference
+ <PreferenceScreen
android:key="brightness"
android:title="@string/brightness"
- settings:keywords="@string/keywords_display_brightness_level"
- android:persistent="false"/>
+ settings:keywords="@string/keywords_display_brightness_level">
+ <intent android:action="android.intent.action.SHOW_BRIGHTNESS_DIALOG" />
+ </PreferenceScreen>
<CheckBoxPreference
android:key="auto_brightness"
diff --git a/src/com/android/settings/BrightnessPreference.java b/src/com/android/settings/BrightnessPreference.java
index 6d3b81b..7d60e7f 100644
--- a/src/com/android/settings/BrightnessPreference.java
+++ b/src/com/android/settings/BrightnessPreference.java
@@ -30,7 +30,7 @@ public class BrightnessPreference extends Preference {
@Override
protected void onClick() {
- Intent intent = new Intent(Intent.ACTION_SHOW_BRIGHTNESS_DIALOG);
- getContext().sendBroadcastAsUser(intent, UserHandle.CURRENT_OR_SELF);
+ getContext().startActivityAsUser(new Intent(Intent.ACTION_SHOW_BRIGHTNESS_DIALOG),
+ UserHandle.CURRENT_OR_SELF);
}
}