Snap for 8903569 from 271a57d91b to tm-qpr1-release

Change-Id: I038e02e5f2dc567bef321649d67e7a6223fef4ee
This commit is contained in:
Android Build Coastguard Worker
2022-08-03 23:34:32 +00:00
2 changed files with 17 additions and 15 deletions

View File

@@ -54,7 +54,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="440dp" android:layout_height="440dp"
android:layout_marginTop="-52dp" android:layout_marginTop="-52dp"
android:scaleType="centerCrop" android:scaleType="centerInside"
android:visibility="gone" android:visibility="gone"
app:lottie_autoPlay="true" app:lottie_autoPlay="true"
app:lottie_loop="true" app:lottie_loop="true"
@@ -66,7 +66,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:visibility="invisible" android:visibility="invisible"
android:background="@drawable/face_enroll_icon_large"/> android:src="@drawable/face_enroll_icon_large"/>
</FrameLayout> </FrameLayout>
@@ -83,7 +83,8 @@
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:layout_marginTop="-24dp">
<Button <Button
android:id="@+id/accessibility_button" android:id="@+id/accessibility_button"

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>