Merge "Support AOD in the Universal Settings API" into pi-dev am: 3025bc7c18

am: 9180cade44

Change-Id: Ic9bced3c2ec51392cdcf41c15a02adefb8031632
This commit is contained in:
Dieter Hsu
2018-03-29 02:38:34 +00:00
committed by android-build-merger
5 changed files with 161 additions and 99 deletions

View File

@@ -29,7 +29,8 @@
<SwitchPreference
android:key="ambient_display_always_on"
android:title="@string/doze_always_on_title"
android:summary="@string/doze_always_on_summary" />
android:summary="@string/doze_always_on_summary"
settings:controller="com.android.settings.display.AmbientDisplayAlwaysOnPreferenceController" />
<Preference
android:key="ambient_display_double_tap"