Merge "Add home controls button to screensaver settings" into tm-qpr-dev am: 148f1592ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21936019 Change-Id: I4ba691553814eeb5b2b73f3b9665829db905de10 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -14499,6 +14499,10 @@
|
||||
<string name="dream_complications_toggle_title">Show additional information</string>
|
||||
<!-- The summary of what overlays this toggle controls [CHAR LIMIT=none] -->
|
||||
<string name="dream_complications_toggle_summary">Display things like the time, weather, or other information on the screen saver</string>
|
||||
<!-- The title of the toggle which enables/disables the home controls button on top of the screen saver [CHAR LIMIT=none] -->
|
||||
<string name="dream_home_controls_toggle_title">Show home controls</string>
|
||||
<!-- The summary of the home controls toggle [CHAR LIMIT=none] -->
|
||||
<string name="dream_home_controls_toggle_summary">Show home controls button from the screen saver</string>
|
||||
<!-- The title of the category to show for the screensaver miscellaneous settings [CHAR LIMIT=none] -->
|
||||
<string name="dream_more_settings_category">More settings</string>
|
||||
<!-- The title of the screen saver setup page [CHAR LIMIT=none] -->
|
||||
|
@@ -46,6 +46,12 @@
|
||||
android:summary="@string/dream_complications_toggle_summary"
|
||||
settings:controller="com.android.settings.dream.DreamComplicationPreferenceController"/>
|
||||
|
||||
<SwitchPreference
|
||||
android:key="dream_home_controls_toggle"
|
||||
android:title="@string/dream_home_controls_toggle_title"
|
||||
android:summary="@string/dream_home_controls_toggle_summary"
|
||||
settings:controller="com.android.settings.dream.DreamHomeControlsPreferenceController"/>
|
||||
|
||||
<com.android.settings.applications.SpacePreference
|
||||
android:layout_height="16dp" />
|
||||
|
||||
|
Reference in New Issue
Block a user