Merge "Move "when to dream" settings upwards for greater visibility" into tm-qpr-dev

This commit is contained in:
Lucas Silva
2022-08-03 00:39:32 +00:00
committed by Android (Google) Code Review

View File

@@ -27,6 +27,11 @@
settings:controller="com.android.settings.dream.DreamMainSwitchPreferenceController" settings:controller="com.android.settings.dream.DreamMainSwitchPreferenceController"
settings:searchable="false"/> settings:searchable="false"/>
<Preference
android:key="when_to_start"
android:title="@string/screensaver_settings_when_to_dream"
android:fragment="com.android.settings.dream.WhenToDreamPicker"/>
<PreferenceCategory <PreferenceCategory
android:title="@string/dream_picker_category"> android:title="@string/dream_picker_category">
<com.android.settingslib.widget.LayoutPreference <com.android.settingslib.widget.LayoutPreference
@@ -36,17 +41,13 @@
settings:controller="com.android.settings.dream.DreamPickerController"/> settings:controller="com.android.settings.dream.DreamPickerController"/>
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory
android:title="@string/dream_more_settings_category">
<SwitchPreference <SwitchPreference
android:key="dream_complications_toggle" android:key="dream_complications_toggle"
android:title="@string/dream_complications_toggle_title" android:title="@string/dream_complications_toggle_title"
android:summary="@string/dream_complications_toggle_summary" android:summary="@string/dream_complications_toggle_summary"
settings:controller="com.android.settings.dream.DreamComplicationPreferenceController"/> settings:controller="com.android.settings.dream.DreamComplicationPreferenceController"/>
<Preference
android:key="when_to_start" <com.android.settings.applications.SpacePreference
android:title="@string/screensaver_settings_when_to_dream" android:layout_height="16dp" />
android:fragment="com.android.settings.dream.WhenToDreamPicker"/>
</PreferenceCategory>
</PreferenceScreen> </PreferenceScreen>