am 68419fca: Merge "Use activity for brightness dialog" into lmp-dev

* commit '68419fca2d03b8c5afd9f5dfecef8a4415ff063d':
  Use activity for brightness dialog
This commit is contained in:
Alan Viverette
2014-07-23 21:47:04 +00:00
committed by Android Git Automerger
2 changed files with 6 additions and 5 deletions

View File

@@ -19,11 +19,12 @@
android:title="@string/display_settings" android:title="@string/display_settings"
settings:keywords="@string/keywords_display"> settings:keywords="@string/keywords_display">
<com.android.settings.BrightnessPreference <PreferenceScreen
android:key="brightness" android:key="brightness"
android:title="@string/brightness" android:title="@string/brightness"
settings:keywords="@string/keywords_display_brightness_level" settings:keywords="@string/keywords_display_brightness_level">
android:persistent="false"/> <intent android:action="android.intent.action.SHOW_BRIGHTNESS_DIALOG" />
</PreferenceScreen>
<SwitchPreference <SwitchPreference
android:key="auto_brightness" android:key="auto_brightness"

View File

@@ -30,7 +30,7 @@ public class BrightnessPreference extends Preference {
@Override @Override
protected void onClick() { protected void onClick() {
Intent intent = new Intent(Intent.ACTION_SHOW_BRIGHTNESS_DIALOG); getContext().startActivityAsUser(new Intent(Intent.ACTION_SHOW_BRIGHTNESS_DIALOG),
getContext().sendBroadcastAsUser(intent, UserHandle.CURRENT_OR_SELF); UserHandle.CURRENT_OR_SELF);
} }
} }