Merge "Move When to start tab below grid" into main

This commit is contained in:
Treehugger Robot
2024-11-06 19:06:09 +00:00
committed by Android (Google) Code Review

View File

@@ -27,11 +27,6 @@
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
@@ -40,6 +35,11 @@
android:layout="@layout/dream_picker_layout"/> android:layout="@layout/dream_picker_layout"/>
</PreferenceCategory> </PreferenceCategory>
<Preference
android:key="when_to_start"
android:title="@string/screensaver_settings_when_to_dream"
android:fragment="com.android.settings.dream.WhenToDreamPicker"/>
<SwitchPreferenceCompat <SwitchPreferenceCompat
android:key="dream_complications_toggle" android:key="dream_complications_toggle"
android:title="@string/dream_complications_toggle_title" android:title="@string/dream_complications_toggle_title"