Merge changes Ic53c42ec,I91e3591c into main

* changes:
  Update illustrations in private space setup and settings
  Change to add temp GAIA education screen and swap account and lock flow
This commit is contained in:
Joseph Vincent
2024-02-28 09:29:00 +00:00
committed by Android (Google) Code Review
29 changed files with 383 additions and 637 deletions

View File

@@ -21,7 +21,7 @@
<com.android.settingslib.widget.IllustrationPreference
android:key="privatespace_hide_video"
settings:searchable="false"
settings:lottie_rawRes="@drawable/privatespace_placeholder_image"/>
settings:lottie_rawRes="@raw/private_space_hide_when_locked_illustration"/>
<com.android.settingslib.widget.MainSwitchPreference
android:key="hide_when_locked"

View File

@@ -25,7 +25,7 @@
<com.android.settingslib.widget.IllustrationPreference
android:key="private_space_settings"
settings:searchable="false"
settings:lottie_rawRes="@drawable/private_space_illustration"/>
settings:lottie_rawRes="@raw/private_space_illustration"/>
<Preference
android:key="private_space_description"