diff options
96 files changed, 845 insertions, 417 deletions
diff --git a/res/drawable/gradient_background.xml b/res/drawable/gradient_background.xml index 47d864a0..78f013a8 100644 --- a/res/drawable/gradient_background.xml +++ b/res/drawable/gradient_background.xml @@ -16,9 +16,8 @@ --> <shape xmlns:android="http://schemas.android.com/apk/res/android"> <gradient android:angle="270" - android:centerY=".1" - android:startColor="@color/translucent_black" - android:centerColor="@android:color/transparent" + android:startColor="@color/translucent_black_lighter" + android:endColor="@android:color/transparent" /> </shape>
\ No newline at end of file diff --git a/res/layout/activity_preview.xml b/res/layout/activity_preview.xml index 3e121c56..a08260ad 100755 --- a/res/layout/activity_preview.xml +++ b/res/layout/activity_preview.xml @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent"> @@ -22,4 +22,4 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> -</RelativeLayout> +</FrameLayout> diff --git a/res/layout/fragment_image_preview.xml b/res/layout/fragment_image_preview.xml index 6c3e3247..a7273fbc 100755 --- a/res/layout/fragment_image_preview.xml +++ b/res/layout/fragment_image_preview.xml @@ -33,13 +33,13 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - <ImageView - android:id="@+id/loading_indicator" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:visibility="invisible" - android:fitsSystemWindows="false"/> + <androidx.core.widget.ContentLoadingProgressBar + android:id="@+id/loading_indicator" + style="@android:style/Widget.DeviceDefault.ProgressBar" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:indeterminate="true"/> <FrameLayout android:layout_width="match_parent" @@ -68,12 +68,17 @@ </androidx.coordinatorlayout.widget.CoordinatorLayout> + <View + android:layout_width="match_parent" + android:layout_height="@dimen/preview_gradient_background_height" + android:layout_gravity="top" + android:background="@drawable/gradient_background"/> <androidx.appcompat.widget.Toolbar - android:id="@+id/toolbar" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="top" - style="@style/TranslucentToolbarStyle"/> + android:id="@+id/toolbar" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="top" + style="@style/TranslucentToolbarStyle"/> </FrameLayout> diff --git a/res/layout/fragment_live_preview.xml b/res/layout/fragment_live_preview.xml index 418a2893..01852728 100755 --- a/res/layout/fragment_live_preview.xml +++ b/res/layout/fragment_live_preview.xml @@ -18,14 +18,7 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" - android:layout_height="match_parent" - android:fitsSystemWindows="false"> - - <View - android:layout_width="match_parent" - android:layout_height="@dimen/preview_gradient_background_height" - android:layout_gravity="top" - android:background="@drawable/gradient_background"/> + android:layout_height="match_parent"> <FrameLayout android:id="@+id/loading" @@ -34,60 +27,67 @@ android:background="@android:color/black" android:forceHasOverlappingRendering="false"> - <ImageView + <androidx.core.widget.ContentLoadingProgressBar android:id="@+id/loading_indicator" + style="@android:style/Widget.DeviceDefault.ProgressBar" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:visibility="visible" - android:fitsSystemWindows="false"/> + android:indeterminate="true"/> </FrameLayout> - <FrameLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:fitsSystemWindows="true"> - - <androidx.coordinatorlayout.widget.CoordinatorLayout - android:id="@+id/coordinator_layout" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="bottom"> + <FrameLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:fitsSystemWindows="true"> - <LinearLayout - android:id="@+id/bottom_sheet" + <androidx.coordinatorlayout.widget.CoordinatorLayout + android:id="@+id/coordinator_layout" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical" - android:background="@drawable/preview_bottom_sheet_background" - android:theme="@style/WallpaperPicker.BottomPaneStyle" - app:behavior_peekHeight="@dimen/preview_attribution_pane_collapsed_height" - app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"> - - <com.google.android.material.tabs.TabLayout - android:id="@+id/tablayout" - android:layout_width="match_parent" - android:layout_height="wrap_content" - app:tabTextAppearance="@style/WallpaperPicker.Preview.TextAppearance.NoAllCaps" - app:tabIndicatorColor="?android:attr/textColorPrimary" - android:visibility="gone"/> - - <com.android.wallpaper.widget.ConstraintViewPager - android:id="@+id/viewpager" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> - </LinearLayout> - - </androidx.coordinatorlayout.widget.CoordinatorLayout> + android:layout_gravity="bottom"> + + <LinearLayout + android:id="@+id/bottom_sheet" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:background="@drawable/preview_bottom_sheet_background" + android:theme="@style/WallpaperPicker.BottomPaneStyle" + app:behavior_peekHeight="@dimen/preview_attribution_pane_collapsed_height" + app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"> + + <com.google.android.material.tabs.TabLayout + android:id="@+id/tablayout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + app:tabTextAppearance="@style/WallpaperPicker.Preview.TextAppearance.NoAllCaps" + app:tabIndicatorColor="?android:attr/textColorPrimary" + android:visibility="gone"/> + + <com.android.wallpaper.widget.ConstraintViewPager + android:id="@+id/viewpager" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + + </LinearLayout> + + </androidx.coordinatorlayout.widget.CoordinatorLayout> + + <View + android:layout_width="match_parent" + android:layout_height="@dimen/preview_gradient_background_height" + android:layout_gravity="top" + android:background="@drawable/gradient_background"/> - <androidx.appcompat.widget.Toolbar - android:id="@+id/toolbar" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="top" - style="@style/TranslucentToolbarStyle"/> + <androidx.appcompat.widget.Toolbar + android:id="@+id/toolbar" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="top" + style="@style/TranslucentToolbarStyle"/> - </FrameLayout> + </FrameLayout> </FrameLayout> diff --git a/res/layout/preview_page_settings.xml b/res/layout/preview_page_settings.xml index 72e83a52..4faebb63 100644 --- a/res/layout/preview_page_settings.xml +++ b/res/layout/preview_page_settings.xml @@ -37,7 +37,7 @@ <Button style="@style/ButtonStyle" - android:id="@+id/preview_attribution_pane_set_wallpaper_button" + android:id="@+id/preview_settings_pane_set_wallpaper_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/set_wallpaper_button_text"/> diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml index ea86de22..da7170e4 100644 --- a/res/values-af/strings.xml +++ b/res/values-af/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Gesentreerde snoei"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Rek"</string> <string name="preview" msgid="1774602101743861071">"Voorskou"</string> + <string name="tab_info" msgid="818614080690111416">"Inligting"</string> + <string name="tab_customize" msgid="2533745409174959960">"Pasmaak"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Instellings …"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Vee uit"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Vee hierdie muurpapier op jou foon uit?"</string> </resources> diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml index bca3e97b..11a39128 100644 --- a/res/values-am/strings.xml +++ b/res/values-am/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"መሃል ላይ ከርክም"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"ወጥር"</string> <string name="preview" msgid="1774602101743861071">"ቅድመ-እይታ"</string> + <string name="tab_info" msgid="818614080690111416">"መረጃ"</string> + <string name="tab_customize" msgid="2533745409174959960">"ብጁ አድርግ"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"ቅንብሮች…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"ሰርዝ"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"ይህ ልጣፍ ከስልክዎ ይሰረዝ?"</string> </resources> diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index b35d76f6..cdbd47a7 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"توسيط مع اقتصاص المساحة الزائدة"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"توسيع للعرض بملء الشاشة"</string> <string name="preview" msgid="1774602101743861071">"معاينة"</string> + <string name="tab_info" msgid="818614080690111416">"معلومات"</string> + <string name="tab_customize" msgid="2533745409174959960">"تخصيص"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"الإعدادات…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"حذف"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"هل تريد حذف هذه الخلفية من هاتفك؟"</string> </resources> diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml index 95a66fdd..0d897014 100644 --- a/res/values-as/strings.xml +++ b/res/values-as/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"মধ্য অংশৰ পৰা কৰা ক্ৰপ"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"প্ৰসাৰিত"</string> <string name="preview" msgid="1774602101743861071">"পূৰ্বদৰ্শন"</string> + <string name="tab_info" msgid="818614080690111416">"তথ্য"</string> + <string name="tab_customize" msgid="2533745409174959960">"কাষ্টমাইজ কৰক"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"ছেটিংসমূহ…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"মচক"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"এই ৱালপেপাৰখন আপোনাৰ ফ’নটোৰ পৰা মচিবনে?"</string> </resources> diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml index 162d0c95..412dca28 100644 --- a/res/values-az/strings.xml +++ b/res/values-az/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Mərkəzi kəsim"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Dartın"</string> <string name="preview" msgid="1774602101743861071">"Önizləmə"</string> + <string name="tab_info" msgid="818614080690111416">"Məlumat"</string> + <string name="tab_customize" msgid="2533745409174959960">"Fərdiləşdirin"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Ayarlar…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Silin"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Bu divar kağızı telefondan silinsin?"</string> </resources> diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml index b0058510..ada913d0 100644 --- a/res/values-b+sr+Latn/strings.xml +++ b/res/values-b+sr+Latn/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Opseci u centru"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Razvuci"</string> <string name="preview" msgid="1774602101743861071">"Pregled"</string> + <string name="tab_info" msgid="818614080690111416">"Informacije"</string> + <string name="tab_customize" msgid="2533745409174959960">"Prilagodite"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Podešavanja…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Izbriši"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Želite da izbrišete ovu pozadinu sa telefona?"</string> </resources> diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml index bfb434f0..b8f7fd96 100644 --- a/res/values-be/strings.xml +++ b/res/values-be/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Запоўніць"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Расцягнуць"</string> <string name="preview" msgid="1774602101743861071">"Перадпрагляд"</string> + <string name="tab_info" msgid="818614080690111416">"Інфармацыя"</string> + <string name="tab_customize" msgid="2533745409174959960">"Наладка"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Налады…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Выдаліць"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Выдаліць гэтыя шпалеры з тэлефона?"</string> </resources> diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index 4953524a..2e6d8742 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Центриране с подрязване"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Разтегляне"</string> <string name="preview" msgid="1774602101743861071">"Визуализация"</string> + <string name="tab_info" msgid="818614080690111416">"Информация"</string> + <string name="tab_customize" msgid="2533745409174959960">"Персонализиране"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Настройки…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Изтриване"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Да се изтрие ли този тапет от телефона ви?"</string> </resources> diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml index d51734f3..38818ba7 100644 --- a/res/values-bn/strings.xml +++ b/res/values-bn/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"সীমানার দিকে কাটছাঁট করা"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"প্রসারিত"</string> <string name="preview" msgid="1774602101743861071">"প্রিভিউ"</string> + <string name="tab_info" msgid="818614080690111416">"তথ্য"</string> + <string name="tab_customize" msgid="2533745409174959960">"কাস্টমাইজ করুন"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"সেটিংস…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"মুছে দিন"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"আপনার ফোন থেকে এই ওয়ালপেপার মুছে ফেলতে চান?"</string> </resources> diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml index 167b77ff..bd8682f8 100644 --- a/res/values-bs/strings.xml +++ b/res/values-bs/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Sredina s odrezanim rubovima"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Razvučeno"</string> <string name="preview" msgid="1774602101743861071">"Pregled"</string> + <string name="tab_info" msgid="818614080690111416">"Informacije"</string> + <string name="tab_customize" msgid="2533745409174959960">"Prilagođavanje"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Postavke…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Izbriši"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Izbrisati ovu pozadinsku sliku s telefona?"</string> </resources> diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index b2fd98d6..df8eec4b 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Centra i retalla"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Amplia"</string> <string name="preview" msgid="1774602101743861071">"Previsualitza"</string> + <string name="tab_info" msgid="818614080690111416">"Informació"</string> + <string name="tab_customize" msgid="2533745409174959960">"Personalitza"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Configuració…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Suprimeix"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Vols suprimir aquest fons de pantalla del telèfon?"</string> </resources> diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index cebf3928..c93f9a80 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Vycentrovat a oříznout"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Roztáhnout"</string> <string name="preview" msgid="1774602101743861071">"Náhled"</string> + <string name="tab_info" msgid="818614080690111416">"Informace"</string> + <string name="tab_customize" msgid="2533745409174959960">"Přizpůsobení"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Nastavení…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Smazat"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Smazat tapetu z telefonu?"</string> </resources> diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index 049affe7..c4d4ca13 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Centrer og beskær"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Stræk"</string> <string name="preview" msgid="1774602101743861071">"Forhåndsvisning"</string> + <string name="tab_info" msgid="818614080690111416">"Oplysninger"</string> + <string name="tab_customize" msgid="2533745409174959960">"Tilpas"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Indstillinger…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Slet"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Vil du slette denne baggrund på din telefon?"</string> </resources> diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 48bb948a..4f0296be 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Zentriert anpassen"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Strecken"</string> <string name="preview" msgid="1774602101743861071">"Vorschau"</string> + <string name="tab_info" msgid="818614080690111416">"Informationen"</string> + <string name="tab_customize" msgid="2533745409174959960">"Anpassen"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Einstellungen…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Löschen"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Diesen Hintergrund von deinem Smartphone löschen?"</string> </resources> diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index d14cc2be..78007b5b 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Περικοπή στο κέντρο"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Τέντωμα"</string> <string name="preview" msgid="1774602101743861071">"Προεπισκόπηση"</string> + <string name="tab_info" msgid="818614080690111416">"Πληροφορίες"</string> + <string name="tab_customize" msgid="2533745409174959960">"Προσαρμογή"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Ρυθμίσεις…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Διαγραφή"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Διαγραφή αυτής της ταπετσαρίας από το τηλέφωνό σας;"</string> </resources> diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml index 158ce102..638dda6f 100644 --- a/res/values-en-rAU/strings.xml +++ b/res/values-en-rAU/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Centre crop"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Stretch"</string> <string name="preview" msgid="1774602101743861071">"Preview"</string> + <string name="tab_info" msgid="818614080690111416">"Info"</string> + <string name="tab_customize" msgid="2533745409174959960">"Customise"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Settings…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Delete"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Delete this wallpaper from your phone?"</string> </resources> diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml index 158ce102..638dda6f 100644 --- a/res/values-en-rCA/strings.xml +++ b/res/values-en-rCA/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Centre crop"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Stretch"</string> <string name="preview" msgid="1774602101743861071">"Preview"</string> + <string name="tab_info" msgid="818614080690111416">"Info"</string> + <string name="tab_customize" msgid="2533745409174959960">"Customise"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Settings…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Delete"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Delete this wallpaper from your phone?"</string> </resources> diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index 158ce102..638dda6f 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Centre crop"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Stretch"</string> <string name="preview" msgid="1774602101743861071">"Preview"</string> + <string name="tab_info" msgid="818614080690111416">"Info"</string> + <string name="tab_customize" msgid="2533745409174959960">"Customise"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Settings…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Delete"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Delete this wallpaper from your phone?"</string> </resources> diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml index 158ce102..638dda6f 100644 --- a/res/values-en-rIN/strings.xml +++ b/res/values-en-rIN/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Centre crop"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Stretch"</string> <string name="preview" msgid="1774602101743861071">"Preview"</string> + <string name="tab_info" msgid="818614080690111416">"Info"</string> + <string name="tab_customize" msgid="2533745409174959960">"Customise"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Settings…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Delete"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Delete this wallpaper from your phone?"</string> </resources> diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml index b06a2172..81420be1 100644 --- a/res/values-en-rXC/strings.xml +++ b/res/values-en-rXC/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Center crop"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Stretch"</string> <string name="preview" msgid="1774602101743861071">"Preview"</string> + <string name="tab_info" msgid="818614080690111416">"Info"</string> + <string name="tab_customize" msgid="2533745409174959960">"Customize"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Settings…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Delete"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Delete this wallpaper from your phone?"</string> </resources> diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index d96971c5..00e18228 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Recortar y centrar"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Estirar"</string> <string name="preview" msgid="1774602101743861071">"Vista previa"</string> + <string name="tab_info" msgid="818614080690111416">"Información"</string> + <string name="tab_customize" msgid="2533745409174959960">"Personalizar"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Configuración…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Borrar"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"¿Quieres borrar este fondo de pantalla del teléfono?"</string> </resources> diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index f28956da..f2bfa6e0 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Recortar el centro"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Expandir"</string> <string name="preview" msgid="1774602101743861071">"Vista previa"</string> + <string name="tab_info" msgid="818614080690111416">"Información"</string> + <string name="tab_customize" msgid="2533745409174959960">"Personalizar"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Ajustes…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Eliminar"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"¿Quieres eliminar este fondo de pantalla de tu teléfono?"</string> </resources> diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml index 8216c44a..9b3ad6a6 100644 --- a/res/values-et/strings.xml +++ b/res/values-et/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Keskele kärpimine"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Venitamine"</string> <string name="preview" msgid="1774602101743861071">"Eelvaade"</string> + <string name="tab_info" msgid="818614080690111416">"Teave"</string> + <string name="tab_customize" msgid="2533745409174959960">"Kohandamine"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Seaded …"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Kustuta"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Kas soovite taustapildi telefonist kustutada?"</string> </resources> diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml index ef4d9450..f76681bd 100644 --- a/res/values-eu/strings.xml +++ b/res/values-eu/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Erdian, moztuta"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Pantailara egokituta"</string> <string name="preview" msgid="1774602101743861071">"Aurreikusi"</string> + <string name="tab_info" msgid="818614080690111416">"Informazioa"</string> + <string name="tab_customize" msgid="2533745409174959960">"Pertsonalizatu"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Ezarpenak…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Ezabatu"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Telefonotik ezabatu nahi duzu horma-papera?"</string> </resources> diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index 898c5140..105ce8c5 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"برش از مرکز برای پر کردن صفحه."</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"کشیدن برای پر کردن صفحه"</string> <string name="preview" msgid="1774602101743861071">"پیشنمایش"</string> + <string name="tab_info" msgid="818614080690111416">"اطلاعات"</string> + <string name="tab_customize" msgid="2533745409174959960">"سفارشی کردن"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"تنظیمات…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"حذف"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"این کاغذدیواری از تلفن حذف شود؟"</string> </resources> diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index 2a5d754c..43980b43 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Keskirajaus"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Venytä"</string> <string name="preview" msgid="1774602101743861071">"Esikatselu"</string> + <string name="tab_info" msgid="818614080690111416">"Tiedot"</string> + <string name="tab_customize" msgid="2533745409174959960">"Personoi"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Asetukset…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Poista"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Poistetaanko tämä taustakuva puhelimelta?"</string> </resources> diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml index 539256a2..0a263cb0 100644 --- a/res/values-fr-rCA/strings.xml +++ b/res/values-fr-rCA/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Rogné au centre"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Étiré"</string> <string name="preview" msgid="1774602101743861071">"Aperçu"</string> + <string name="tab_info" msgid="818614080690111416">"Info"</string> + <string name="tab_customize" msgid="2533745409174959960">"Personnaliser"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Paramètres…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Supprimer"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Supprimer ce fond d\'écran de votre téléphone?"</string> </resources> diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index f075e191..d4699bb7 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Recadrer et centrer"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Étirer"</string> <string name="preview" msgid="1774602101743861071">"Prévisualiser"</string> + <string name="tab_info" msgid="818614080690111416">"Informations"</string> + <string name="tab_customize" msgid="2533745409174959960">"Personnaliser"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Paramètres…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Supprimer"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Supprimer ce fond d\'écran de votre téléphone ?"</string> </resources> diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml index fc498122..30870fe6 100644 --- a/res/values-gl/strings.xml +++ b/res/values-gl/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Recortar no centro"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Estirar"</string> <string name="preview" msgid="1774602101743861071">"Mostrar vista previa"</string> + <string name="tab_info" msgid="818614080690111416">"Información"</string> + <string name="tab_customize" msgid="2533745409174959960">"Personalizar"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Configuración…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Eliminar"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Queres eliminar este fondo de pantalla do teu teléfono?"</string> </resources> diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml index e9fcf97a..66c9ec5c 100644 --- a/res/values-gu/strings.xml +++ b/res/values-gu/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"મધ્યમાંથી કાપેલ"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"ખેંચેલ"</string> <string name="preview" msgid="1774602101743861071">"પ્રીવ્યૂ કરો"</string> + <string name="tab_info" msgid="818614080690111416">"માહિતી"</string> + <string name="tab_customize" msgid="2533745409174959960">"કસ્ટમાઇઝ કરો"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"સેટિંગ…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"ડિલીટ કરો"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"તમારા ફોનમાંથી આ વૉલપેપર ડિલીટ કરીએ?"</string> </resources> diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml index 453ecb01..c1b55ed7 100644 --- a/res/values-hi/strings.xml +++ b/res/values-hi/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"बीच का हिस्सा रखें"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"स्क्रीन के हिसाब से खींचें"</string> <string name="preview" msgid="1774602101743861071">"झलक"</string> + <string name="tab_info" msgid="818614080690111416">"जानकारी"</string> + <string name="tab_customize" msgid="2533745409174959960">"पसंद के मुताबिक बनाएं"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"सेटिंग…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"मिटाएं"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"क्या आप अपने फ़ोन से यह वॉलपेपर मिटाना चाहते हैं?"</string> </resources> diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index baa985ba..b3f96b42 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Centriranje s obrezivanjem"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Rastezanje"</string> <string name="preview" msgid="1774602101743861071">"Pregled"</string> + <string name="tab_info" msgid="818614080690111416">"Informacije"</string> + <string name="tab_customize" msgid="2533745409174959960">"Prilagodba"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Postavke…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Izbriši"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Želite li izbrisati tu pozadinu s telefona?"</string> </resources> diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index de05be58..df08a111 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Középre igazítás körülvágással"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Nyújtás"</string> <string name="preview" msgid="1774602101743861071">"Előnézet"</string> + <string name="tab_info" msgid="818614080690111416">"Információ"</string> + <string name="tab_customize" msgid="2533745409174959960">"Személyre szabás"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Beállítások…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Törlés"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Törli ezt a háttérképet a telefonjáról?"</string> </resources> diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml index 9ea06961..cf127572 100644 --- a/res/values-hy/strings.xml +++ b/res/values-hy/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Կենտրոնում, կտրած"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Ձգել"</string> <string name="preview" msgid="1774602101743861071">"Նախադիտել"</string> + <string name="tab_info" msgid="818614080690111416">"Տեղեկություն"</string> + <string name="tab_customize" msgid="2533745409174959960">"Կարգավորել"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Կարգավորումներ"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Ջնջել"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Ջնջե՞լ այս պաստառը հեռախոսից։"</string> </resources> diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index afe80696..acef669e 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Crop tengah"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Regang"</string> <string name="preview" msgid="1774602101743861071">"Pratinjau"</string> + <string name="tab_info" msgid="818614080690111416">"Info"</string> + <string name="tab_customize" msgid="2533745409174959960">"Sesuaikan"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Setelan…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Hapus"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Hapus wallpaper ini dari ponsel Anda?"</string> </resources> diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml index 7a1d53f9..a80fc19f 100644 --- a/res/values-is/strings.xml +++ b/res/values-is/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Miðjuskurður"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Teygja"</string> <string name="preview" msgid="1774602101743861071">"Forskoða"</string> + <string name="tab_info" msgid="818614080690111416">"Upplýsingar"</string> + <string name="tab_customize" msgid="2533745409174959960">"Sérsníða"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Stillingar…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Eyða"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Viltu eyða þessu veggfóðri úr símanum?"</string> </resources> diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 2d8cc15e..cbf5531c 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Ritaglia al centro"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Allunga"</string> <string name="preview" msgid="1774602101743861071">"Anteprima"</string> + <string name="tab_info" msgid="818614080690111416">"Informazioni"</string> + <string name="tab_customize" msgid="2533745409174959960">"Personalizza"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Impostazioni…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Elimina"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Vuoi eliminare questo sfondo dal telefono?"</string> </resources> diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index d8a697f6..e35a08e2 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"ממורכז וחתוך"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"מתוח"</string> <string name="preview" msgid="1774602101743861071">"תצוגה מקדימה"</string> + <string name="tab_info" msgid="818614080690111416">"מידע"</string> + <string name="tab_customize" msgid="2533745409174959960">"התאמה אישית"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"הגדרות…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"מחיקה"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"למחוק את הטפט הזה מהטלפון?"</string> </resources> diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index bc84a916..d88d4964 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"中央で切り抜き"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"拡大"</string> <string name="preview" msgid="1774602101743861071">"プレビュー"</string> + <string name="tab_info" msgid="818614080690111416">"情報"</string> + <string name="tab_customize" msgid="2533745409174959960">"カスタマイズ"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"設定…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"削除"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"スマートフォンからこの壁紙を削除しますか？"</string> </resources> diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml index 9a41fc96..907b5af2 100644 --- a/res/values-ka/strings.xml +++ b/res/values-ka/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"ცენტრში ჩამოჭრა"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"გადაჭიმვა"</string> <string name="preview" msgid="1774602101743861071">"გადახედვა"</string> + <string name="tab_info" msgid="818614080690111416">"ინფორმაცია"</string> + <string name="tab_customize" msgid="2533745409174959960">"მორგება"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"პარამეტრები..."</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"წაშლა"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"წაიშალოს ეს ფონი თქვენი ტელეფონიდან?"</string> </resources> diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml index 03094c07..9384fbea 100644 --- a/res/values-kk/strings.xml +++ b/res/values-kk/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Ортасынан қию"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Созу"</string> <string name="preview" msgid="1774602101743861071">"Алдын ала қарау"</string> + <string name="tab_info" msgid="818614080690111416">"Ақпарат"</string> + <string name="tab_customize" msgid="2533745409174959960">"Реттеу"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Параметрлер…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Жою"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Бұл тұсқағаз телефоннан жойылсын ба?"</string> </resources> diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml index dba3d350..bf89c506 100644 --- a/res/values-km/strings.xml +++ b/res/values-km/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"ច្រឹបកណ្តាល"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"ទាញ"</string> <string name="preview" msgid="1774602101743861071">"មើលសាកល្បង"</string> + <string name="tab_info" msgid="818614080690111416">"ព័ត៌មាន"</string> + <string name="tab_customize" msgid="2533745409174959960">"ប្ដូរតាមបំណង"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"ការកំណត់…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"លុប"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"លុបផ្ទាំងរូបភាពនេះពីទូរសព្ទរបស់អ្នកដែរទេ?"</string> </resources> diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml index c6cf1d48..f2c55640 100644 --- a/res/values-kn/strings.xml +++ b/res/values-kn/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"ಮಧ್ಯಕ್ಕೆ ಕ್ರಾಪ್ ಮಾಡಿ"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"ವಿಸ್ತರಿಸಿ"</string> <string name="preview" msgid="1774602101743861071">"ಪೂರ್ವವೀಕ್ಷಣೆ"</string> + <string name="tab_info" msgid="818614080690111416">"ಮಾಹಿತಿ"</string> + <string name="tab_customize" msgid="2533745409174959960">"ಕಸ್ಟಮೈಜ್ ಮಾಡಿ"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"ಸೆಟ್ಟಿಂಗ್ಗಳು..."</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"ಅಳಿಸಿ"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"ನಿಮ್ಮ ಫೋನ್ನಿಂದ ಈ ವಾಲ್ಪೇಪರ್ ಅನ್ನು ಅಳಿಸುವುದೇ?"</string> </resources> diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 6f10f4f7..9e9736f4 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"중앙 자르기"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"확대"</string> <string name="preview" msgid="1774602101743861071">"미리보기"</string> + <string name="tab_info" msgid="818614080690111416">"정보"</string> + <string name="tab_customize" msgid="2533745409174959960">"맞춤설정"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"설정…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"삭제"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"휴대전화에서 이 배경화면을 삭제하시겠습니까?"</string> </resources> diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml index b56b3724..8c95a098 100644 --- a/res/values-ky/strings.xml +++ b/res/values-ky/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Ортосуна тууралап кесүү"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Чоюу"</string> <string name="preview" msgid="1774602101743861071">"Алдын ала көрүү"</string> + <string name="tab_info" msgid="818614080690111416">"Маалымат"</string> + <string name="tab_customize" msgid="2533745409174959960">"Ыңгайлаштыруу"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Жөндөөлөр…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Жок кылуу"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Бул тушкагаз телефонуңуздан өчүрүлсүнбү?"</string> </resources> diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml index 1f5bc341..d0d533fd 100644 --- a/res/values-lo/strings.xml +++ b/res/values-lo/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"ຕັດເຄິ່ງກາງ"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"ຍືດ"</string> <string name="preview" msgid="1774602101743861071">"ຕົວຢ່າງ"</string> + <string name="tab_info" msgid="818614080690111416">"ຂໍ້ມູນ"</string> + <string name="tab_customize" msgid="2533745409174959960">"ປັບແຕ່ງ"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"ການຕັ້ງຄ່າ…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"ລຶບອອກ"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"ລຶບຮູບພື້ນຫຼັງນີ້ອອກຈາກໂທລະສັບຂອງທ່ານບໍ?"</string> </resources> diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index 80fa37e7..ddba93ed 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Apkirpti centre"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Ištempti"</string> <string name="preview" msgid="1774602101743861071">"Peržiūra"</string> + <string name="tab_info" msgid="818614080690111416">"Informacija"</string> + <string name="tab_customize" msgid="2533745409174959960">"Tinkinimas"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Nustatymai…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Ištrinti"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Ištrinti šį ekrano foną iš telefono?"</string> </resources> diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index 318c0f8b..0aeed748 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Apgriezt centrā"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Pielāgot"</string> <string name="preview" msgid="1774602101743861071">"Priekšskatīt"</string> + <string name="tab_info" msgid="818614080690111416">"Informācija"</string> + <string name="tab_customize" msgid="2533745409174959960">"Pielāgošana"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Iestatījumi…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Dzēst"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Vai dzēst šo fona tapeti no tālruņa?"</string> </resources> diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml index 9f2901fa..315beccf 100644 --- a/res/values-mk/strings.xml +++ b/res/values-mk/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Исечи централно"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Растегни"</string> <string name="preview" msgid="1774602101743861071">"Преглед"</string> + <string name="tab_info" msgid="818614080690111416">"Информации"</string> + <string name="tab_customize" msgid="2533745409174959960">"Приспособување"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Поставки…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Избриши"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Да се избрише тапетов од телефонот?"</string> </resources> diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml index f70fbf05..09af34c4 100644 --- a/res/values-ml/strings.xml +++ b/res/values-ml/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"നടുവിൽ വലുപ്പം മാറ്റുക"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"വലിച്ചുനീട്ടുക"</string> <string name="preview" msgid="1774602101743861071">"പ്രിവ്യൂ"</string> + <string name="tab_info" msgid="818614080690111416">"വിവരം"</string> + <string name="tab_customize" msgid="2533745409174959960">"ഇഷ്ടാനുസൃതമാക്കുക"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"ക്രമീകരണം…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"ഇല്ലാതാക്കുക"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"നിങ്ങളുടെ ഫോണിൽ നിന്ന് ഈ വാൾപേപ്പർ ഇല്ലാതാക്കണോ?"</string> </resources> diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml index 7352b7c5..1009b283 100644 --- a/res/values-mn/strings.xml +++ b/res/values-mn/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Голлуулж тайрах"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Сунгах"</string> <string name="preview" msgid="1774602101743861071">"Урьдчилан үзэх"</string> + <string name="tab_info" msgid="818614080690111416">"Мэдээлэл"</string> + <string name="tab_customize" msgid="2533745409174959960">"Өөрчлөх"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Тохиргоо…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Устгах"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Энэ ханын зургийг утаснаасаа устгах уу?"</string> </resources> diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml index bc7de361..a45a5073 100644 --- a/res/values-mr/strings.xml +++ b/res/values-mr/strings.xml @@ -37,9 +37,9 @@ <string name="set_wallpaper_lock_screen_destination" msgid="6224685559375417945">"लॉक स्क्रीन"</string> <string name="set_wallpaper_both_destination" msgid="6967226064958263939">"होम स्क्रीन आणि लॉक स्क्रीन"</string> <string name="no_backup_image_wallpaper_label" msgid="6316627676107284851">"फिरती इमेज वॉलपेपर"</string> - <string name="permission_needed_explanation" msgid="139166837541426823">"येथे सध्याचा वॉलपेपर दाखवण्यासाठी, <xliff:g id="APP_NAME">%1$s</xliff:g> ला तुमच्या डिव्हाइसच्या स्टोरेजचा अॅक्सेस हवा आहे."</string> - <string name="permission_needed_explanation_go_to_settings" msgid="3923551582092599609">"येथे सध्याचा वॉलपेपर दाखवण्यासाठी, वॉलपेपरला तुमच्या डिव्हाइसच्या स्टोरेजचा अॅक्सेस हवा आहे.\n\nहे सेटिंग बदलण्यासाठी, वॉलपेपरच्या ॲप माहितीच्या परवानग्या भागावर जा."</string> - <string name="permission_needed_allow_access_button_label" msgid="1943133660612924306">"अॅक्सेस द्या"</string> + <string name="permission_needed_explanation" msgid="139166837541426823">"येथे सध्याचा वॉलपेपर दाखवण्यासाठी, <xliff:g id="APP_NAME">%1$s</xliff:g> ला तुमच्या डिव्हाइसच्या स्टोरेजचा ॲक्सेस हवा आहे."</string> + <string name="permission_needed_explanation_go_to_settings" msgid="3923551582092599609">"येथे सध्याचा वॉलपेपर दाखवण्यासाठी, वॉलपेपरला तुमच्या डिव्हाइसच्या स्टोरेजचा ॲक्सेस हवा आहे.\n\nहे सेटिंग बदलण्यासाठी, वॉलपेपरच्या ॲप माहितीच्या परवानग्या भागावर जा."</string> + <string name="permission_needed_allow_access_button_label" msgid="1943133660612924306">"ॲक्सेस द्या"</string> <string name="no_backup_image_wallpaper_description" msgid="8303268619408738057">"फिरत्या वॉलपेपरसाठी लाइव्ह वॉलपेपर सेवा"</string> <string name="daily_refresh_tile_title" msgid="3270456074558525091">"दैनिक वॉलपेपर"</string> <string name="daily_refresh_tile_subtitle" msgid="3976682014885446443">"चालू करण्यासाठी टॅप करा"</string> @@ -53,7 +53,7 @@ <string name="explore" msgid="7468719504199497281">"एक्सप्लोर करा"</string> <string name="next_wallpaper" msgid="3911873152952596232">"पुढील वॉलपेपर"</string> <string name="wallpaper_disabled_message" msgid="7309484130562148185">"या डिव्हाइसवर वॉलपेपर सेट करणे बंद केलेले आहे"</string> - <string name="wallpaper_disabled_by_administrator_message" msgid="1551430406714747884">"तुमच्या डिव्हाइस अॅडमिनिस्ट्रेटरने वॉलपेपर सेट करणे बंद केले आहे"</string> + <string name="wallpaper_disabled_by_administrator_message" msgid="1551430406714747884">"तुमच्या डिव्हाइस ॲडमिनिस्ट्रेटरने वॉलपेपर सेट करणे बंद केले आहे"</string> <string name="wallpaper_set_successfully_message" msgid="2958998799111688578">"वॉलपेपर यशस्वीरीत्या सेट झाला"</string> <string name="wallpapers_unavailable_offline_message" msgid="8136405438621689532">"वॉलपेपर पाहण्यासाठी तुमच्याकडे इंटरनेट कनेक्शन असणे गरजेचे आहे. कृपया कनेक्ट करा आणि पुन्हा प्रयत्न करा."</string> <string name="currently_set_home_wallpaper_thumbnail" msgid="4022381436821898917">"सध्या होम स्क्रीन वॉलपेपर थंबनेल सेट केले आहे"</string> @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"मध्यभागी क्रॉप केलेले"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"ताणा"</string> <string name="preview" msgid="1774602101743861071">"पूर्वावलोकन करा"</string> + <string name="tab_info" msgid="818614080690111416">"माहिती"</string> + <string name="tab_customize" msgid="2533745409174959960">"कस्टमाइझ करा"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"सेटिंग्ज…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"हटवा"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"तुमच्या फोनवरून हा वॉलपेपर हटवायचा आहे का?"</string> </resources> diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml index d10b20d4..84bad3d9 100644 --- a/res/values-ms/strings.xml +++ b/res/values-ms/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Pangkas ke tengah"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Regang"</string> <string name="preview" msgid="1774602101743861071">"Pratonton"</string> + <string name="tab_info" msgid="818614080690111416">"Maklumat"</string> + <string name="tab_customize" msgid="2533745409174959960">"Sesuaikan"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Tetapan..."</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Padam"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Padamkan kertas dinding ini daripada telefon anda?"</string> </resources> diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml index b5d48556..6b8ae707 100644 --- a/res/values-my/strings.xml +++ b/res/values-my/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"အလယ်တွင် ဖြတ်ညှိရန်"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"ဆွဲဆန့်ရန်"</string> <string name="preview" msgid="1774602101743861071">"အစမ်းကြည့်ရန်"</string> + <string name="tab_info" msgid="818614080690111416">"အချက်အလက်"</string> + <string name="tab_customize" msgid="2533745409174959960">"စိတ်ကြိုက်ပြုလုပ်ရန်"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"ဆက်တင်များ…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"ဖျက်ရန်"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"ဤနောက်ခံပုံကို သင့်ပင်မစာမျက်နှာမှ ဖျက်ပစ်မလား။"</string> </resources> diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 2028c9db..14da40bc 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Midtstilt beskjæring"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Strekk"</string> <string name="preview" msgid="1774602101743861071">"Ta en forhåndskikk"</string> + <string name="tab_info" msgid="818614080690111416">"Informasjon"</string> + <string name="tab_customize" msgid="2533745409174959960">"Tilpass"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Innstillinger"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Slett"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Vil du slette denne bakgrunnen fra telefonen din?"</string> </resources> diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml index 28a1052c..e3ec544e 100644 --- a/res/values-ne/strings.xml +++ b/res/values-ne/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"मध्यभागमा क्रप गरिएको"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"तन्काइएको"</string> <string name="preview" msgid="1774602101743861071">"पूर्वावलोकन"</string> + <string name="tab_info" msgid="818614080690111416">"जानकारी"</string> + <string name="tab_customize" msgid="2533745409174959960">"आफू अनुकूल पार्नुहोस्"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"सेटिङ…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"मेट्नुहोस्"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"तपाईंको फोनबाट यो वालपेपर मेटाउने हो?"</string> </resources> diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 543e654d..8c259e28 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Gecentreerd bijsnijden"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Uitrekken"</string> <string name="preview" msgid="1774602101743861071">"Voorbeeld"</string> + <string name="tab_info" msgid="818614080690111416">"Informatie"</string> + <string name="tab_customize" msgid="2533745409174959960">"Aanpassen"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Instellingen…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Verwijderen"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Wil je deze achtergrond verwijderen van je telefoon?"</string> </resources> diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml index 32e791e6..6bbea172 100644 --- a/res/values-or/strings.xml +++ b/res/values-or/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"ସେଣ୍ଟର୍ କ୍ରପ୍"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"ପ୍ରସାରିତ କରନ୍ତୁ"</string> <string name="preview" msgid="1774602101743861071">"ପ୍ରିଭ୍ୟୁ"</string> + <string name="tab_info" msgid="818614080690111416">"ସୂଚନା"</string> + <string name="tab_customize" msgid="2533745409174959960">"କଷ୍ଟମାଇଜ୍ କରନ୍ତୁ"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"ସେଟିଂସ୍..."</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"ଡିଲିଟ୍ କରନ୍ତୁ"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"ଆପଣଙ୍କର ଫୋନ୍ରୁ ଏହି ୱାଲ୍ପେପର୍କୁ ଡିଲିଟ୍ କରିବେ କି?"</string> </resources> diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml index 9d8f5f7f..ebeed978 100644 --- a/res/values-pa/strings.xml +++ b/res/values-pa/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"ਵਿਚਕਾਰੋਂ ਕਾਂਟ-ਛਾਂਟ ਕਰੋ"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"ਫੈਲਾਓ"</string> <string name="preview" msgid="1774602101743861071">"ਪੂਰਵ-ਝਲਕ"</string> + <string name="tab_info" msgid="818614080690111416">"ਜਾਣਕਾਰੀ"</string> + <string name="tab_customize" msgid="2533745409174959960">"ਵਿਉਂਤਬੱਧ ਕਰੋ"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"ਸੈਟਿੰਗਾਂ…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"ਮਿਟਾਓ"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"ਕੀ ਇਹ ਵਾਲਪੇਪਰ ਤੁਹਾਡੇ ਫ਼ੋਨ ਤੋਂ ਮਿਟਾਉਣਾ ਹੈ?"</string> </resources> diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 82d74085..9801576c 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Przycięta na środku"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Rozciągnięcie"</string> <string name="preview" msgid="1774602101743861071">"Podgląd"</string> + <string name="tab_info" msgid="818614080690111416">"Informacje"</string> + <string name="tab_customize" msgid="2533745409174959960">"Dostosuj"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Ustawienia…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Usuń"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Usunąć tę tapetę z telefonu?"</string> </resources> diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index 3ba961d0..59b2054a 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Recortar e centrar"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Esticar"</string> <string name="preview" msgid="1774602101743861071">"Pré-visualizar"</string> + <string name="tab_info" msgid="818614080690111416">"Informações"</string> + <string name="tab_customize" msgid="2533745409174959960">"Personalizar"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Definições…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Eliminar"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Pretende eliminar esta imagem de fundo do telemóvel?"</string> </resources> diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index f26164bb..1589064c 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Corte central"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Expandir"</string> <string name="preview" msgid="1774602101743861071">"Visualizar"</string> + <string name="tab_info" msgid="818614080690111416">"Informações"</string> + <string name="tab_customize" msgid="2533745409174959960">"Personalizar"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Configurações…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Excluir"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Excluir esse plano de fundo do seu smartphone?"</string> </resources> diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index 0766d1a5..4ec0ea16 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Decupare în centru"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Extindeți"</string> <string name="preview" msgid="1774602101743861071">"Previzualizați"</string> + <string name="tab_info" msgid="818614080690111416">"Informații"</string> + <string name="tab_customize" msgid="2533745409174959960">"Personalizați"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Setări…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Ștergeți"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Ștergeți această imagine de fundal de pe telefon?"</string> </resources> diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 1421a1b0..264f88ae 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Заполнить"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Растянуть"</string> <string name="preview" msgid="1774602101743861071">"Предварительный просмотр"</string> + <string name="tab_info" msgid="818614080690111416">"Информация"</string> + <string name="tab_customize" msgid="2533745409174959960">"Настройка"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Настройки…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Удалить"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Удалить эти обои с телефона?"</string> </resources> diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml index 8022ce93..b7d767ee 100644 --- a/res/values-si/strings.xml +++ b/res/values-si/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"මැද කප්පාදු කිරීම"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"අදින්න"</string> <string name="preview" msgid="1774602101743861071">"පෙරදසුන"</string> + <string name="tab_info" msgid="818614080690111416">"තතු"</string> + <string name="tab_customize" msgid="2533745409174959960">"අභිරුචිකරණය කරන්න"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"සැකසීම්…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"මකන්න"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"මෙම බිතුපත ඔබේ දුරකථනයෙන් මකන්නද?"</string> </resources> diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index d12ddd0b..60a2bdb4 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Vycentrovať a orezať"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Roztiahnuť"</string> <string name="preview" msgid="1774602101743861071">"Zobraziť ukážku"</string> + <string name="tab_info" msgid="818614080690111416">"Informácie"</string> + <string name="tab_customize" msgid="2533745409174959960">"Prispôsobenie"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Nastavenia…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Odstrániť"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Chcete túto tapetu odstrániť z telefónu?"</string> </resources> diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index dae44d70..b2e04341 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Na sredini obrezano"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Raztegnjeno"</string> <string name="preview" msgid="1774602101743861071">"Predogled"</string> + <string name="tab_info" msgid="818614080690111416">"Informacije"</string> + <string name="tab_customize" msgid="2533745409174959960">"Prilagajanje"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Nastavitve …"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Izbriši"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Ali želite to ozadje izbrisati iz telefona?"</string> </resources> diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml index e35ad488..6b4b090c 100644 --- a/res/values-sq/strings.xml +++ b/res/values-sq/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Prerje qendrore"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"E tendosur"</string> <string name="preview" msgid="1774602101743861071">"Shiko paraprakisht"</string> + <string name="tab_info" msgid="818614080690111416">"Informacione"</string> + <string name="tab_customize" msgid="2533745409174959960">"Personalizo"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Cilësimet…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Fshi"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Do ta fshish këtë imazh sfondi nga telefoni?"</string> </resources> diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index 6c26b0a0..0cc71af4 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Опсеци у центру"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Развуци"</string> <string name="preview" msgid="1774602101743861071">"Преглед"</string> + <string name="tab_info" msgid="818614080690111416">"Информације"</string> + <string name="tab_customize" msgid="2533745409174959960">"Прилагодите"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Подешавања…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Избриши"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Желите да избришете ову позадину са телефона?"</string> </resources> diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index 54bc2cb9..7fcbd57f 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Centrera och beskär"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Dra ut"</string> <string name="preview" msgid="1774602101743861071">"Förhandsgranska"</string> + <string name="tab_info" msgid="818614080690111416">"Information"</string> + <string name="tab_customize" msgid="2533745409174959960">"Anpassa"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Inställningar…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Radera"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Vill du radera den här bakgrunden från mobilen?"</string> </resources> diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml index 17734e1a..7221e1f6 100644 --- a/res/values-sw/strings.xml +++ b/res/values-sw/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Punguza katikati"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Panua"</string> <string name="preview" msgid="1774602101743861071">"Kagua kwanza"</string> + <string name="tab_info" msgid="818614080690111416">"Maelezo"</string> + <string name="tab_customize" msgid="2533745409174959960">"Weka mapendeleo"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Mipangilio…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Futa"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Je, ungependa kufuta mandhari haya kwenye simu yako?"</string> </resources> diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml index 5be80643..75248b42 100644 --- a/res/values-ta/strings.xml +++ b/res/values-ta/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"மையமாகச் செதுக்கு"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"திரையில் பொருந்தும்படி விரி"</string> <string name="preview" msgid="1774602101743861071">"மாதிரிக்காட்சி"</string> + <string name="tab_info" msgid="818614080690111416">"தகவல்"</string> + <string name="tab_customize" msgid="2533745409174959960">"பிரத்தியேகமாக்கு"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"அமைப்புகள்…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"நீக்கு"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"மொபைலில் இருந்து இந்த வால்பேப்பரை நீக்கவா?"</string> </resources> diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml index 3db68b3a..a5beb790 100644 --- a/res/values-te/strings.xml +++ b/res/values-te/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"మధ్యన కత్తిరించు"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"విస్తరించు"</string> <string name="preview" msgid="1774602101743861071">"ప్రివ్యూ చూపు"</string> + <string name="tab_info" msgid="818614080690111416">"సమాచారం"</string> + <string name="tab_customize" msgid="2533745409174959960">"అనుకూలీకరించండి"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"సెట్టింగ్లు…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"తొలగించు"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"మీ ఫోన్ నుండి ఈ వాల్పేపర్ను తొలగించాలా?"</string> </resources> diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index 0aaa8911..c86eb723 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"ครอบตัดกึ่งกลาง"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"ยืด"</string> <string name="preview" msgid="1774602101743861071">"แสดงพรีวิว"</string> + <string name="tab_info" msgid="818614080690111416">"ข้อมูล"</string> + <string name="tab_customize" msgid="2533745409174959960">"ปรับแต่ง"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"การตั้งค่า…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"ลบ"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"ลบวอลเปเปอร์นี้ออกจากโทรศัพท์ไหม"</string> </resources> diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml index 7232a7e9..6988601c 100644 --- a/res/values-tl/strings.xml +++ b/res/values-tl/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"I-crop sa gitna"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"I-stretch"</string> <string name="preview" msgid="1774602101743861071">"I-preview"</string> + <string name="tab_info" msgid="818614080690111416">"Impormasyon"</string> + <string name="tab_customize" msgid="2533745409174959960">"I-customize"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Mga Setting…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"I-delete"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"I-delete ang wallpaper na ito sa iyong telepono?"</string> </resources> diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 1600f693..1d30e7ef 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Ortalayarak kırp"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Genişlet"</string> <string name="preview" msgid="1774602101743861071">"Önizle"</string> + <string name="tab_info" msgid="818614080690111416">"Bilgi"</string> + <string name="tab_customize" msgid="2533745409174959960">"Özelleştir"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Ayarlar…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Sil"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Bu duvar kağıdı telefonunuzdan silinsin mi?"</string> </resources> diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index 0d4fd128..1df810ad 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Обрізати відносно центру"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Розтягнути"</string> <string name="preview" msgid="1774602101743861071">"Переглянути"</string> + <string name="tab_info" msgid="818614080690111416">"Інформація"</string> + <string name="tab_customize" msgid="2533745409174959960">"Налаштування"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Налаштування…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Видалити"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Видалити цей фоновий малюнок із телефона?"</string> </resources> diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml index b4a50438..9d87add1 100644 --- a/res/values-ur/strings.xml +++ b/res/values-ur/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"مرکزی تراش"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"پھیلائیں"</string> <string name="preview" msgid="1774602101743861071">"پیش منظر"</string> + <string name="tab_info" msgid="818614080690111416">"معلومات"</string> + <string name="tab_customize" msgid="2533745409174959960">"حسب ضرورت بنائیں"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"ترتیبات…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"حذف کریں"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"اس وال پیپر کو آپ کے فون سے حذف کریں؟"</string> </resources> diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml index ede76e66..d0d316aa 100644 --- a/res/values-uz/strings.xml +++ b/res/values-uz/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Markazlab qirqish"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Yoyish"</string> <string name="preview" msgid="1774602101743861071">"Razm solish"</string> + <string name="tab_info" msgid="818614080690111416">"Axborot"</string> + <string name="tab_customize" msgid="2533745409174959960">"Sozlash"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Sozlamalar…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Oʻchirish"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Bu fon rasmi telefoningizdan oʻchirib tashlansinmi?"</string> </resources> diff --git a/res/values-v29/styles.xml b/res/values-v29/styles.xml index e7f27d4b..6cae735a 100644 --- a/res/values-v29/styles.xml +++ b/res/values-v29/styles.xml @@ -18,5 +18,6 @@ <resources> <style name="PreviewCheckboxDeviceTheme" parent="@android:style/ThemeOverlay.DeviceDefault.Accent.DayNight"> <item name="android:colorControlActivated">?android:attr/colorAccent</item> + <item name="android:colorControlNormal">?android:attr/colorPrimary</item> </style> </resources>
\ No newline at end of file diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index f0c0176d..b11245e2 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Cắt giữa"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Kéo dài"</string> <string name="preview" msgid="1774602101743861071">"Xem trước"</string> + <string name="tab_info" msgid="818614080690111416">"Thông tin"</string> + <string name="tab_customize" msgid="2533745409174959960">"Tùy chỉnh"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Cài đặt…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Xóa"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Bạn muốn xóa hình nền này khỏi điện thoại của mình?"</string> </resources> diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 3795c39e..5db994c8 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"居中裁剪"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"拉伸"</string> <string name="preview" msgid="1774602101743861071">"预览"</string> + <string name="tab_info" msgid="818614080690111416">"信息"</string> + <string name="tab_customize" msgid="2533745409174959960">"自定义"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"设置…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"删除"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"要从您的手机上删除此壁纸吗？"</string> </resources> diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml index f9ecc623..507758b4 100644 --- a/res/values-zh-rHK/strings.xml +++ b/res/values-zh-rHK/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"裁剪中間部分"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"延展"</string> <string name="preview" msgid="1774602101743861071">"預覽"</string> + <string name="tab_info" msgid="818614080690111416">"資訊"</string> + <string name="tab_customize" msgid="2533745409174959960">"自訂"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"設定…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"刪除"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"要從手機中刪除此桌布嗎？"</string> </resources> diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index f6e67cfc..ac791250 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"置中裁剪"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"延伸"</string> <string name="preview" msgid="1774602101743861071">"預覽"</string> + <string name="tab_info" msgid="818614080690111416">"資訊"</string> + <string name="tab_customize" msgid="2533745409174959960">"自訂"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"設定…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"刪除"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"要從手機中刪除這張桌布嗎？"</string> </resources> diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml index 2db2a335..98625b61 100644 --- a/res/values-zu/strings.xml +++ b/res/values-zu/strings.xml @@ -80,4 +80,9 @@ <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Nqampuna phakathi kwendawo"</string> <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Nweba"</string> <string name="preview" msgid="1774602101743861071">"Buka kuqala"</string> + <string name="tab_info" msgid="818614080690111416">"Ulwazi"</string> + <string name="tab_customize" msgid="2533745409174959960">"Enza ngendlela oyifisayo"</string> + <string name="configure_wallpaper" msgid="849882179182976621">"Izilungiselelo…"</string> + <string name="delete_live_wallpaper" msgid="589212696102662329">"Susa"</string> + <string name="delete_wallpaper_confirmation" msgid="33790318361863778">"Landa lesi sithombe esingemuva kusukela kufoni yakho?"</string> </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index 1796b1df..3ea8c330 100755 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -40,7 +40,10 @@ <item name="android:windowDrawsSystemBarBackgrounds">true</item> </style> - <style name="WallpaperTheme.Preview" parent="@style/Theme.AppCompat.NoActionBar"> + <style name="WallpaperTheme.Preview" parent="@android:style/Theme.DeviceDefault.Settings"> + <item name="android:colorPrimary">@color/material_white_100</item> + <item name="colorPrimary">@color/material_white_100</item> + <item name="colorControlActivated">?attr/colorPrimary</item> <item name="android:windowBackground">@android:color/transparent</item> <item name="android:windowContentOverlay">@null</item> <item name="android:windowDisablePreview">true</item> @@ -51,10 +54,18 @@ <item name="android:windowActionBar">false</item> <item name="android:windowNoTitle">true</item> + <item name="actionBarSize">?android:attr/actionBarSize</item> + <item name="homeAsUpIndicator">@drawable/material_ic_arrow_back_black_24</item> + + <item name="selectableItemBackground">?android:attr/selectableItemBackground</item> + <item name="dialogPreferredPadding">24dp</item> + <item name="colorControlHighlight">@color/ripple_material_dark</item> + <item name="toolbarNavigationButtonStyle">@style/Widget.AppCompat.Toolbar.Button.Navigation</item> + <!-- Set status bar and navigation buttons to be translucent. --> <item name="android:colorPrimaryDark">@color/translucent_black</item> - <item name="android:statusBarColor">@color/translucent_black</item> - <item name="android:navigationBarColor">@color/translucent_black</item> + <item name="android:statusBarColor">@android:color/transparent</item> + <item name="android:navigationBarColor">@android:color/transparent</item> <!-- Apply borderless button style for the right ripple effect. --> <item name="borderlessButtonStyle">@style/Widget.AppCompat.Button.Borderless</item> @@ -64,10 +75,20 @@ </item> </style> + <style name="WallpaperTheme.DarkActionBar" parent="@style/WallpaperTheme.Preview"> + <item name="colorControlNormal">?attr/colorPrimary</item> + <item name="colorButtonNormal">?attr/colorPrimary</item> + <item name="android:colorControlActivated">?attr/colorPrimary</item> + <item name="android:colorControlHighlight">?attr/colorPrimary</item> + <item name="actionMenuTextColor">?attr/colorPrimary</item> + <item name="android:actionMenuTextColor">?attr/colorPrimary</item> + <item name="android:actionMenuTextAppearance">@style/WallpaperPicker.Preview.TextAppearance.ActionBar</item> + </style> + <!-- Toolbar --> <style name="TranslucentToolbarStyle" parent="@style/Widget.AppCompat.Toolbar"> <item name="android:background">@android:color/transparent</item> - <item name="android:theme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item> + <item name="android:theme">@style/WallpaperTheme.DarkActionBar</item> </style> <style name="RegularToolbarStyle" parent="@style/Widget.AppCompat.Toolbar"> @@ -100,9 +121,13 @@ <item name="android:textColor">@android:color/white</item> </style> - <style name="ActionBarCheckboxStyle" parent="@android:style/Widget.DeviceDefault.CompoundButton.CheckBox"/> + <style name="ActionBarCheckboxStyle" parent="@android:style/Widget.DeviceDefault.CompoundButton.CheckBox"> + <item name="android:textColor">?android:attr/colorPrimary</item> + </style> - <style name="PreviewCheckboxDeviceTheme" parent="@android:style/Theme.DeviceDefault"/> + <style name="PreviewCheckboxDeviceTheme" parent="@android:style/Theme.DeviceDefault"> + <item name="android:colorControlNormal">?android:attr/colorPrimary</item> + </style> <style name="select_wallpaper_header"> <item name="android:textColor">@color/translucent_black_60_alpha</item> @@ -135,6 +160,12 @@ <item name="android:textAllCaps">false</item> </style> + <style name="WallpaperPicker.Preview.TextAppearance.ActionBar" + parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Menu"> + <item name="android:textAllCaps">false</item> + <item name="android:textColor">@color/material_white_100</item> + </style> + <!-- Set wallpaper destination item --> <style name="set_wallpaper_destination_item"> <item name="android:minHeight">@dimen/set_wallpaper_dialog_item_min_height</item> diff --git a/src/com/android/wallpaper/model/InlinePreviewIntentFactory.java b/src/com/android/wallpaper/model/InlinePreviewIntentFactory.java index 28062d84..787c76a1 100755 --- a/src/com/android/wallpaper/model/InlinePreviewIntentFactory.java +++ b/src/com/android/wallpaper/model/InlinePreviewIntentFactory.java @@ -30,7 +30,7 @@ public interface InlinePreviewIntentFactory { */ default boolean shouldUseInternalLivePicker(Context context) { return false; // Disable always for now - // ContextCompat.checkSelfPermission(context, BIND_WALLPAPER) == PERMISSION_GRANTED; + //ContextCompat.checkSelfPermission(context, BIND_WALLPAPER) == PERMISSION_GRANTED; } /** diff --git a/src/com/android/wallpaper/picker/ImagePreviewFragment.java b/src/com/android/wallpaper/picker/ImagePreviewFragment.java index 87e29c5f..a6babe39 100755 --- a/src/com/android/wallpaper/picker/ImagePreviewFragment.java +++ b/src/com/android/wallpaper/picker/ImagePreviewFragment.java @@ -15,8 +15,6 @@ */ package com.android.wallpaper.picker; -import static com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_EXPANDED; - import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.app.Activity; @@ -28,14 +26,11 @@ import android.graphics.Point; import android.graphics.PointF; import android.graphics.Rect; import android.os.Bundle; -import android.view.ContextThemeWrapper; import android.view.Display; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.Button; import android.widget.ImageView; -import android.widget.TextView; import androidx.annotation.Nullable; import androidx.fragment.app.FragmentActivity; @@ -46,7 +41,6 @@ import com.android.wallpaper.module.WallpaperPersister.Destination; import com.android.wallpaper.module.WallpaperPersister.SetWallpaperCallback; import com.android.wallpaper.util.ScreenSizeCalculator; import com.android.wallpaper.util.WallpaperCropUtils; -import com.android.wallpaper.widget.MaterialProgressDrawable; import com.bumptech.glide.Glide; import com.bumptech.glide.MemoryCategory; @@ -54,8 +48,6 @@ import com.davemorrissey.labs.subscaleview.ImageSource; import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView; import com.google.android.material.bottomsheet.BottomSheetBehavior; -import java.util.List; - /** * Fragment which displays the UI for previewing an individual static wallpaper and its attribution * information. @@ -66,19 +58,12 @@ public class ImagePreviewFragment extends PreviewFragment { private SubsamplingScaleImageView mFullResImageView; private Asset mWallpaperAsset; - private TextView mAttributionTitle; - private TextView mAttributionSubtitle1; - private TextView mAttributionSubtitle2; - private Button mExploreButton; - private Button mSetWallpaperButton; - private Point mDefaultCropSurfaceSize; private Point mScreenSize; private Point mRawWallpaperSize; // Native size of wallpaper image. - private ImageView mLoadingIndicator; - private MaterialProgressDrawable mProgressDrawable; private ImageView mLowResImageView; - private View mSpacer; + + private InfoPageController mInfoPageController; @Override public void onCreate(Bundle savedInstanceState) { @@ -91,30 +76,29 @@ public class ImagePreviewFragment extends PreviewFragment { return R.layout.fragment_image_preview; } - @Override + protected int getBottomSheetResId() { return R.id.bottom_sheet; } @Override + protected int getLoadingIndicatorResId() { + return R.id.loading_indicator; + } + + @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { View view = super.onCreateView(inflater, container, savedInstanceState); Activity activity = requireActivity(); - // Set toolbar as the action bar. mFullResImageView = view.findViewById(R.id.full_res_image); - mLoadingIndicator = view.findViewById(R.id.loading_indicator); - mAttributionTitle = view.findViewById(R.id.preview_attribution_pane_title); - mAttributionSubtitle1 = view.findViewById(R.id.preview_attribution_pane_subtitle1); - mAttributionSubtitle2 = view.findViewById(R.id.preview_attribution_pane_subtitle2); - mExploreButton = view.findViewById(R.id.preview_attribution_pane_explore_button); - mSetWallpaperButton = view.findViewById(R.id.preview_attribution_pane_set_wallpaper_button); + mInfoPageController = new InfoPageController(view.findViewById(R.id.page_info), + mPreviewMode); mLowResImageView = view.findViewById(R.id.low_res_image); - mSpacer = view.findViewById(R.id.spacer); // Trim some memory from Glide to make room for the full-size image in this fragment. Glide.get(activity).setMemoryCategory(MemoryCategory.LOW); @@ -148,7 +132,6 @@ public class ImagePreviewFragment extends PreviewFragment { setUpExploreIntent(ImagePreviewFragment.this::initFullResView); }); - // Configure loading indicator with a MaterialProgressDrawable. setUpLoadingIndicator(); return view; @@ -159,32 +142,9 @@ public class ImagePreviewFragment extends PreviewFragment { // Nothing needed here. } - private void setUpLoadingIndicator() { - Context context = requireContext(); - mProgressDrawable = new MaterialProgressDrawable(context.getApplicationContext(), - mLoadingIndicator); - mProgressDrawable.setAlpha(255); - mProgressDrawable.setBackgroundColor(getResources().getColor(R.color.material_white_100, - context.getTheme())); - mProgressDrawable.setColorSchemeColors(getAttrColor( - new ContextThemeWrapper(context, getDeviceDefaultTheme()), - android.R.attr.colorAccent)); - mProgressDrawable.updateSizes(MaterialProgressDrawable.LARGE); - mLoadingIndicator.setImageDrawable(mProgressDrawable); - - // We don't want to show the spinner every time we load an image if it loads quickly; - // instead, only start showing the spinner if loading the image has taken longer than half - // of a second. - mLoadingIndicator.postDelayed(() -> { - if (mFullResImageView != null && !mFullResImageView.hasImage() - && !mTestingModeEnabled) { - mLoadingIndicator.setVisibility(View.VISIBLE); - mLoadingIndicator.setAlpha(1f); - if (mProgressDrawable != null) { - mProgressDrawable.start(); - } - } - }, 500); + @Override + protected boolean isLoaded() { + return mFullResImageView != null && mFullResImageView.hasImage(); } @Override @@ -198,8 +158,8 @@ public class ImagePreviewFragment extends PreviewFragment { @Override public void onDestroy() { super.onDestroy(); - if (mProgressDrawable != null) { - mProgressDrawable.stop(); + if (mLoadingProgressBar != null) { + mLoadingProgressBar.hide(); } mFullResImageView.recycle(); } @@ -214,63 +174,12 @@ public class ImagePreviewFragment extends PreviewFragment { @Override protected void setBottomSheetContentAlpha(float alpha) { - mExploreButton.setAlpha(alpha); - mAttributionTitle.setAlpha(alpha); - mAttributionSubtitle1.setAlpha(alpha); - mAttributionSubtitle2.setAlpha(alpha); + mInfoPageController.setContentAlpha(alpha); } - private void populateAttributionPane() { - final Context context = getContext(); - - final BottomSheetBehavior bottomSheetBehavior = BottomSheetBehavior.from(mBottomSheet); - - List<String> attributions = mWallpaper.getAttributions(context); - if (attributions.size() > 0 && attributions.get(0) != null) { - mAttributionTitle.setText(attributions.get(0)); - } - - if (attributions.size() > 1 && attributions.get(1) != null) { - mAttributionSubtitle1.setVisibility(View.VISIBLE); - mAttributionSubtitle1.setText(attributions.get(1)); - } - - if (attributions.size() > 2 && attributions.get(2) != null) { - mAttributionSubtitle2.setVisibility(View.VISIBLE); - mAttributionSubtitle2.setText(attributions.get(2)); - } - - setUpSetWallpaperButton(mSetWallpaperButton); - - setUpExploreButton(mExploreButton); - - if (mExploreButton.getVisibility() == View.VISIBLE - && mSetWallpaperButton.getVisibility() == View.VISIBLE) { - mSpacer.setVisibility(View.VISIBLE); - } else { - mSpacer.setVisibility(View.GONE); - } - - mBottomSheet.setVisibility(View.VISIBLE); - - // Initialize the state of the BottomSheet based on the current state because if the initial - // and current state are the same, the state change listener won't fire and set the correct - // arrow asset and text alpha. - if (bottomSheetBehavior.getState() == STATE_EXPANDED) { - setPreviewChecked(false); - mAttributionTitle.setAlpha(1f); - mAttributionSubtitle1.setAlpha(1f); - mAttributionSubtitle2.setAlpha(1f); - } else { - setPreviewChecked(true); - mAttributionTitle.setAlpha(0f); - mAttributionSubtitle1.setAlpha(0f); - mAttributionSubtitle2.setAlpha(0f); - } - - // Let the state change listener take care of animating a state change to the initial state - // if there's a state change. - bottomSheetBehavior.setState(mBottomSheetInitialState); + @Override + protected CharSequence getExploreButtonLabel(Context context) { + return context.getString(mWallpaper.getActionLabelRes(context)); } /** @@ -299,8 +208,8 @@ public class ImagePreviewFragment extends PreviewFragment { // Some of these may be null depending on if the Fragment is paused, stopped, // or destroyed. - if (mLoadingIndicator != null) { - mLoadingIndicator.setVisibility(View.GONE); + if (mLoadingProgressBar != null) { + mLoadingProgressBar.hide(); } // The page bitmap may be null if there was a decoding error, so show an // error dialog. @@ -315,12 +224,9 @@ public class ImagePreviewFragment extends PreviewFragment { setDefaultWallpaperZoomAndScroll(); crossFadeInMosaicView(); } - if (mProgressDrawable != null) { - mProgressDrawable.stop(); - } getActivity().invalidateOptionsMenu(); - populateAttributionPane(); + populateInfoPage(mInfoPageController); }); } @@ -347,14 +253,14 @@ public class ImagePreviewFragment extends PreviewFragment { } }); - mLoadingIndicator.animate() + mLoadingProgressBar.animate() .alpha(0f) .setDuration(shortAnimationDuration) .setListener(new AnimatorListenerAdapter() { @Override public void onAnimationEnd(Animator animation) { - if (mLoadingIndicator != null) { - mLoadingIndicator.setVisibility(View.GONE); + if (mLoadingProgressBar != null) { + mLoadingProgressBar.hide(); } } }); diff --git a/src/com/android/wallpaper/picker/LivePreviewFragment.java b/src/com/android/wallpaper/picker/LivePreviewFragment.java index fee60a8a..d577fa7f 100644 --- a/src/com/android/wallpaper/picker/LivePreviewFragment.java +++ b/src/com/android/wallpaper/picker/LivePreviewFragment.java @@ -15,12 +15,11 @@ */ package com.android.wallpaper.picker; -import static com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_EXPANDED; - import android.annotation.SuppressLint; import android.app.Activity; import android.app.AlertDialog; import android.app.WallpaperColors; +import android.app.WallpaperInfo; import android.app.WallpaperManager; import android.content.ComponentName; import android.content.Context; @@ -53,9 +52,6 @@ import android.view.View; import android.view.ViewGroup; import android.view.WindowManager.LayoutParams; import android.view.animation.AnimationUtils; -import android.widget.Button; -import android.widget.ImageView; -import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -70,9 +66,7 @@ import com.android.wallpaper.R; import com.android.wallpaper.compat.BuildCompat; import com.android.wallpaper.model.LiveWallpaperInfo; import com.android.wallpaper.module.WallpaperPersister.SetWallpaperCallback; -import com.android.wallpaper.widget.MaterialProgressDrawable; -import com.google.android.material.bottomsheet.BottomSheetBehavior; import com.google.android.material.tabs.TabLayout; import java.util.ArrayList; @@ -94,39 +88,30 @@ public class LivePreviewFragment extends PreviewFragment { * it in this preview fragment. * @see IWallpaperConnection */ - private WallpaperConnection mWallpaperConnection; + protected WallpaperConnection mWallpaperConnection; private Intent mWallpaperIntent; private Intent mDeleteIntent; private Intent mSettingsIntent; private List<Pair<String, View>> mPages; - private ImageView mLoadingIndicator; - private TextView mAttributionTitle; - private TextView mAttributionSubtitle1; - private TextView mAttributionSubtitle2; - private Button mExploreButton; - private Button mSetWallpaperButton; private ViewPager mViewPager; private TabLayout mTabLayout; private SliceView mSettingsSliceView; private LiveData<Slice> mSettingsLiveData; - private View mSpacer; private View mLoadingScrim; - private MaterialProgressDrawable mProgressDrawable; + private InfoPageController mInfoPageController; @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); android.app.WallpaperInfo info = mWallpaper.getWallpaperComponent(); - mWallpaperIntent = new Intent(WallpaperService.SERVICE_INTERFACE) - .setClassName(info.getPackageName(), info.getServiceName()); + mWallpaperIntent = getWallpaperIntent(info); setUpExploreIntent(null); android.app.WallpaperInfo currentWallpaper = WallpaperManager.getInstance(requireContext()).getWallpaperInfo(); - String deleteAction = getDeleteAction(info.getServiceInfo(), - (currentWallpaper == null) ? null : currentWallpaper.getServiceInfo()); + String deleteAction = getDeleteAction(info, currentWallpaper); if (!TextUtils.isEmpty(deleteAction)) { mDeleteIntent = new Intent(deleteAction); @@ -134,7 +119,7 @@ public class LivePreviewFragment extends PreviewFragment { mDeleteIntent.putExtra(EXTRA_LIVE_WALLPAPER_INFO, info); } - String settingsActivity = info.getSettingsActivity(); + String settingsActivity = getSettingsActivity(info); if (settingsActivity != null) { mSettingsIntent = new Intent(); mSettingsIntent.setComponent(new ComponentName(info.getPackageName(), @@ -149,6 +134,16 @@ public class LivePreviewFragment extends PreviewFragment { } } + @Nullable + protected String getSettingsActivity(WallpaperInfo info) { + return info.getSettingsActivity(); + } + + protected Intent getWallpaperIntent(WallpaperInfo info) { + return new Intent(WallpaperService.SERVICE_INTERFACE) + .setClassName(info.getPackageName(), info.getServiceName()); + } + @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { @@ -161,10 +156,10 @@ public class LivePreviewFragment extends PreviewFragment { Activity activity = requireActivity(); mLoadingScrim = view.findViewById(R.id.loading); - mLoadingIndicator = view.findViewById(R.id.loading_indicator); setUpLoadingIndicator(); - mWallpaperConnection = new WallpaperConnection(mWallpaperIntent, activity); + mWallpaperConnection = new WallpaperConnection(mWallpaperIntent, activity, + getWallpaperConnectionListener()); container.post(() -> { if (!mWallpaperConnection.connect()) { mWallpaperConnection = null; @@ -253,45 +248,18 @@ public class LivePreviewFragment extends PreviewFragment { mViewPager.setCurrentItem(0); } - private void setUpLoadingIndicator() { - Context context = requireContext(); - mProgressDrawable = new MaterialProgressDrawable(context.getApplicationContext(), - mLoadingIndicator); - mProgressDrawable.setAlpha(255); - mProgressDrawable.setBackgroundColor(getResources().getColor(R.color.material_white_100, - context.getTheme())); - mProgressDrawable.setColorSchemeColors(getAttrColor( - new ContextThemeWrapper(context, getDeviceDefaultTheme()), - android.R.attr.colorAccent)); - mProgressDrawable.updateSizes(MaterialProgressDrawable.LARGE); - mLoadingIndicator.setImageDrawable(mProgressDrawable); - - // We don't want to show the spinner every time we load a wallpaper if it loads quickly; - // instead, only start showing the spinner after 100 ms - mLoadingIndicator.postDelayed(() -> { - if ((mWallpaperConnection == null || !mWallpaperConnection.isEngineReady()) - && !mTestingModeEnabled) { - mLoadingIndicator.setVisibility(View.VISIBLE); - mLoadingIndicator.setAlpha(1f); - if (mProgressDrawable != null) { - mProgressDrawable.start(); - } - } - }, 100); + protected WallpaperConnectionListener getWallpaperConnectionListener() { + return null; } - private void initInfoPage() { - View pageInfo = getLayoutInflater().inflate(R.layout.preview_page_info, null /* root */); - - mAttributionTitle = pageInfo.findViewById(R.id.preview_attribution_pane_title); - mAttributionSubtitle1 = pageInfo.findViewById(R.id.preview_attribution_pane_subtitle1); - mAttributionSubtitle2 = pageInfo.findViewById(R.id.preview_attribution_pane_subtitle2); - mSpacer = pageInfo.findViewById(R.id.spacer); - - mExploreButton = pageInfo.findViewById(R.id.preview_attribution_pane_explore_button); - mSetWallpaperButton = pageInfo.findViewById( - R.id.preview_attribution_pane_set_wallpaper_button); + @Override + protected boolean isLoaded() { + return mWallpaperConnection != null && mWallpaperConnection.isEngineReady(); + } + private void initInfoPage() { + View pageInfo = InfoPageController.createView(getLayoutInflater()); + mInfoPageController = new InfoPageController(pageInfo, mPreviewMode); mPages.add(Pair.create(getString(R.string.tab_info), pageInfo)); } @@ -312,68 +280,23 @@ public class LivePreviewFragment extends PreviewFragment { mSettingsLiveData = SliceLiveData.fromUri(requireContext() /* context */, uriSettingsSlice); mSettingsLiveData.observeForever(mSettingsSliceView); + pageSettings.findViewById(R.id.preview_settings_pane_set_wallpaper_button) + .setOnClickListener(this::onSetWallpaperClicked); + mPages.add(Pair.create(getResources().getString(R.string.tab_customize), pageSettings)); } - private void populateAttributionPane() { - final Context context = getContext(); - - final BottomSheetBehavior bottomSheetBehavior = BottomSheetBehavior.from(mBottomSheet); - - List<String> attributions = mWallpaper.getAttributions(context); - if (attributions.size() > 0 && attributions.get(0) != null) { - mAttributionTitle.setText(attributions.get(0)); - } - - if (mWallpaper.getWallpaperComponent().getShowMetadataInPreview()) { - - if (attributions.size() > 1 && attributions.get(1) != null) { - mAttributionSubtitle1.setVisibility(View.VISIBLE); - mAttributionSubtitle1.setText(attributions.get(1)); - } - - if (attributions.size() > 2 && attributions.get(2) != null) { - mAttributionSubtitle2.setVisibility(View.VISIBLE); - mAttributionSubtitle2.setText(attributions.get(2)); - } - - } else { - mExploreIntent = null; - } - - setUpSetWallpaperButton(mSetWallpaperButton); - - setUpExploreButton(mExploreButton); - - if (mExploreButton.getVisibility() == View.VISIBLE - && mSetWallpaperButton.getVisibility() == View.VISIBLE) { - mSpacer.setVisibility(View.VISIBLE); - } else { - mSpacer.setVisibility(View.GONE); - } - - mBottomSheet.setVisibility(View.VISIBLE); - - // Initialize the state of the BottomSheet based on the current state because if the initial - // and current state are the same, the state change listener won't fire and set the correct - // arrow asset and text alpha. - if (mBottomSheetInitialState == STATE_EXPANDED) { - setPreviewChecked(false); - mAttributionTitle.setAlpha(1f); - mAttributionSubtitle1.setAlpha(1f); - mAttributionSubtitle2.setAlpha(1f); - } else { - setPreviewChecked(true); - mAttributionTitle.setAlpha(0f); - mAttributionSubtitle1.setAlpha(0f); - mAttributionSubtitle2.setAlpha(0f); + @Override + protected CharSequence getExploreButtonLabel(Context context) { + CharSequence exploreLabel = ((LiveWallpaperInfo) mWallpaper).getActionDescription(context); + if (TextUtils.isEmpty(exploreLabel)) { + exploreLabel = context.getString(mWallpaper.getActionLabelRes(context)); } - - bottomSheetBehavior.setState(mBottomSheetInitialState); + return exploreLabel; } @SuppressLint("NewApi") //Already checking with isAtLeastQ - private Uri getSettingsSliceUri(android.app.WallpaperInfo info) { + protected Uri getSettingsSliceUri(android.app.WallpaperInfo info) { if (BuildCompat.isAtLeastQ()) { return info.getSettingsSliceUri(); } @@ -391,6 +314,11 @@ public class LivePreviewFragment extends PreviewFragment { } @Override + protected int getLoadingIndicatorResId() { + return R.id.loading_indicator; + } + + @Override protected void setCurrentWallpaper(int destination) { mWallpaperSetter.setCurrentWallpaper(getActivity(), mWallpaper, null, destination, 0, null, new SetWallpaperCallback() { @@ -408,33 +336,20 @@ public class LivePreviewFragment extends PreviewFragment { @Override protected void setBottomSheetContentAlpha(float alpha) { - mExploreButton.setAlpha(alpha); - mAttributionTitle.setAlpha(alpha); - mAttributionSubtitle1.setAlpha(alpha); - mAttributionSubtitle2.setAlpha(alpha); + mInfoPageController.setContentAlpha(alpha); } - @Override - protected void setUpExploreButton(Button exploreButton) { - super.setUpExploreButton(exploreButton); - if (exploreButton.getVisibility() != View.VISIBLE) { - return; - } - Context context = requireContext(); - CharSequence exploreLabel = ((LiveWallpaperInfo) mWallpaper).getActionDescription(context); - if (!TextUtils.isEmpty(exploreLabel)) { - exploreButton.setText(exploreLabel); - } - } @Nullable - private String getDeleteAction(ServiceInfo serviceInfo, - @Nullable ServiceInfo currentService) { + protected String getDeleteAction(android.app.WallpaperInfo wallpaperInfo, + @Nullable android.app.WallpaperInfo currentInfo) { + ServiceInfo serviceInfo = wallpaperInfo.getServiceInfo(); if (!isPackagePreInstalled(serviceInfo.applicationInfo)) { Log.d(TAG, "This wallpaper is not pre-installed: " + serviceInfo.name); return null; } + ServiceInfo currentService = currentInfo == null ? null : currentInfo.getServiceInfo(); // A currently set Live wallpaper should not be deleted. if (currentService != null && TextUtils.equals(serviceInfo.name, currentService.name)) { return null; @@ -510,10 +425,27 @@ public class LivePreviewFragment extends PreviewFragment { return false; } - private class WallpaperConnection extends IWallpaperConnection.Stub + /** + * Interface to be notified of connect/disconnect events from {@link WallpaperConnection} + */ + public interface WallpaperConnectionListener { + /** + * Called after the Wallpaper service has been bound. + */ + void onConnected(); + + /** + * Called after the Wallpaper engine has been terminated and the service has been unbound. + */ + void onDisconnected(); + } + + protected class WallpaperConnection extends IWallpaperConnection.Stub implements ServiceConnection { + private final Activity mActivity; private final Intent mIntent; + private final WallpaperConnectionListener mListener; private IWallpaperService mService; private IWallpaperEngine mEngine; private boolean mConnected; @@ -521,20 +453,26 @@ public class LivePreviewFragment extends PreviewFragment { private boolean mIsEngineVisible; private boolean mEngineReady; - WallpaperConnection(Intent intent, Activity activity) { + WallpaperConnection(Intent intent, Activity activity, + @Nullable WallpaperConnectionListener listener) { mActivity = activity; mIntent = intent; + mListener = listener; } public boolean connect() { synchronized (this) { - if (!mActivity.bindService(mIntent, this, Context.BIND_AUTO_CREATE)) { + if (!mActivity.bindService(mIntent, this, + Context.BIND_AUTO_CREATE | Context.BIND_IMPORTANT)) { return false; } mConnected = true; - return true; } + if (mListener != null) { + mListener.onConnected(); + } + return true; } public void disconnect() { @@ -556,6 +494,9 @@ public class LivePreviewFragment extends PreviewFragment { } mService = null; } + if (mListener != null) { + mListener.onDisconnected(); + } } public void onServiceConnected(ComponentName name, IBinder service) { @@ -599,6 +540,10 @@ public class LivePreviewFragment extends PreviewFragment { } } + public IWallpaperEngine getEngine() { + return mEngine; + } + public ParcelFileDescriptor setWallpaper(String name) { return null; } @@ -619,14 +564,11 @@ public class LivePreviewFragment extends PreviewFragment { .setInterpolator(AnimationUtils.loadInterpolator(mActivity, android.R.interpolator.fast_out_linear_in)) .withEndAction(() -> { - if (mLoadingIndicator != null) { - mLoadingIndicator.setVisibility(View.GONE); - } - if (mProgressDrawable != null) { - mProgressDrawable.stop(); + if (mLoadingProgressBar != null) { + mLoadingProgressBar.hide(); } mLoadingScrim.setVisibility(View.INVISIBLE); - populateAttributionPane(); + populateInfoPage(mInfoPageController); }); }); mEngineReady = true; diff --git a/src/com/android/wallpaper/picker/PreviewActivity.java b/src/com/android/wallpaper/picker/PreviewActivity.java index 457de693..6785afed 100755 --- a/src/com/android/wallpaper/picker/PreviewActivity.java +++ b/src/com/android/wallpaper/picker/PreviewActivity.java @@ -18,15 +18,16 @@ package com.android.wallpaper.picker; import android.content.Context; import android.content.Intent; import android.os.Bundle; +import android.view.View; + +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; import com.android.wallpaper.R; import com.android.wallpaper.model.InlinePreviewIntentFactory; import com.android.wallpaper.model.WallpaperInfo; import com.android.wallpaper.module.InjectorProvider; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentManager; - /** * Activity that displays a preview of a specific wallpaper and provides the ability to set the * wallpaper as the user's current wallpaper. @@ -46,11 +47,10 @@ public class PreviewActivity extends BasePreviewActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_preview); - } - - @Override - public void onAttachedToWindow() { - super.onAttachedToWindow(); + getWindow().getDecorView().setSystemUiVisibility( + View.SYSTEM_UI_FLAG_LAYOUT_STABLE + | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN + | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION); FragmentManager fm = getSupportFragmentManager(); Fragment fragment = fm.findFragmentById(R.id.fragment_container); @@ -70,6 +70,7 @@ public class PreviewActivity extends BasePreviewActivity { } } + /** * Implementation that provides an intent to start a PreviewActivity. */ diff --git a/src/com/android/wallpaper/picker/PreviewFragment.java b/src/com/android/wallpaper/picker/PreviewFragment.java index f1a1625e..d0d8202b 100755 --- a/src/com/android/wallpaper/picker/PreviewFragment.java +++ b/src/com/android/wallpaper/picker/PreviewFragment.java @@ -21,24 +21,26 @@ import static com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_ import android.app.Activity; import android.content.Context; import android.content.Intent; -import android.content.pm.ActivityInfo; +import android.content.res.ColorStateList; import android.content.res.Resources.NotFoundException; import android.content.res.TypedArray; -import android.graphics.PorterDuff.Mode; -import android.graphics.drawable.Drawable; +import android.graphics.Insets; import android.graphics.drawable.GradientDrawable; import android.net.Uri; import android.os.Bundle; import android.util.Log; +import android.view.ContextThemeWrapper; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; +import android.view.View.OnClickListener; import android.view.ViewGroup; -import android.view.Window; +import android.view.WindowInsets; import android.widget.Button; import android.widget.CheckBox; +import android.widget.TextView; import android.widget.Toast; import androidx.annotation.CallSuper; @@ -49,11 +51,11 @@ import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; import androidx.core.view.ViewCompat; +import androidx.core.widget.ContentLoadingProgressBar; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; import com.android.wallpaper.R; -import com.android.wallpaper.compat.BuildCompat; import com.android.wallpaper.model.LiveWallpaperInfo; import com.android.wallpaper.model.WallpaperInfo; import com.android.wallpaper.module.ExploreIntentChecker; @@ -78,7 +80,8 @@ public abstract class PreviewFragment extends Fragment implements LoadWallpaperErrorDialogFragment.Listener { /** - * User can view wallpaper and attributions in full screen, but "Set wallpaper" button is hidden. + * User can view wallpaper and attributions in full screen, but "Set wallpaper" button is + * hidden. */ static final int MODE_VIEW_ONLY = 0; @@ -142,6 +145,7 @@ public abstract class PreviewFragment extends Fragment implements protected WallpaperSetter mWallpaperSetter; protected UserEventLogger mUserEventLogger; protected ViewGroup mBottomSheet; + protected ContentLoadingProgressBar mLoadingProgressBar; protected CheckBox mPreview; @@ -184,23 +188,12 @@ public abstract class PreviewFragment extends Fragment implements setHasOptionsMenu(true); - // Allow the layout to draw fullscreen even behind the status bar, so we can set as the status - // bar color a color that has a custom translucency in the theme. - Window window = activity.getWindow(); - window.getDecorView().setSystemUiVisibility( - View.SYSTEM_UI_FLAG_LAYOUT_STABLE - | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN - | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION); - - List<String> attributions = mWallpaper.getAttributions(activity); + List<String> attributions = getAttributions(activity); if (attributions.size() > 0 && attributions.get(0) != null) { activity.setTitle(attributions.get(0)); } } - @LayoutRes - protected abstract int getLayoutResId(); - @Override @CallSuper public View onCreateView(LayoutInflater inflater, ViewGroup container, @@ -214,19 +207,8 @@ public abstract class PreviewFragment extends Fragment implements activity.getSupportActionBar().setDisplayHomeAsUpEnabled(true); activity.getSupportActionBar().setDisplayShowTitleEnabled(false); - // Use updated fancy arrow icon for O+. - if (BuildCompat.isAtLeastO()) { - Drawable navigationIcon = getResources().getDrawable( - R.drawable.material_ic_arrow_back_black_24); - - // This Drawable's state is shared across the app, so make a copy of it before applying a - // color tint as not to affect other clients elsewhere in the app. - navigationIcon = navigationIcon.getConstantState().newDrawable().mutate(); - navigationIcon.setColorFilter( - getResources().getColor(R.color.material_white_100), Mode.SRC_IN); - navigationIcon.setAutoMirrored(true); - toolbar.setNavigationIcon(navigationIcon); - } + toolbar.getNavigationIcon().setTint(getAttrColor(activity, android.R.attr.colorPrimary)); + toolbar.getNavigationIcon().setAutoMirrored(true); ViewCompat.setPaddingRelative(toolbar, /* start */ getResources().getDimensionPixelSize( @@ -236,6 +218,9 @@ public abstract class PreviewFragment extends Fragment implements R.dimen.preview_toolbar_set_wallpaper_button_end_padding), /* bottom */ 0); + mLoadingProgressBar = view.findViewById(getLoadingIndicatorResId()); + mLoadingProgressBar.show(); + mBottomSheet = view.findViewById(getBottomSheetResId()); setUpBottomSheetView(mBottomSheet); @@ -254,14 +239,74 @@ public abstract class PreviewFragment extends Fragment implements : savedInstanceState.getInt(KEY_BOTTOM_SHEET_STATE, STATE_EXPANDED); setUpBottomSheetListeners(); + view.setOnApplyWindowInsetsListener((v, windowInsets) -> { + toolbar.setPadding(toolbar.getPaddingLeft(), + toolbar.getPaddingTop() + windowInsets.getSystemWindowInsetTop(), + toolbar.getPaddingRight(), toolbar.getBottom()); + mBottomSheet.setPadding(mBottomSheet.getPaddingLeft(), + mBottomSheet.getPaddingTop(), mBottomSheet.getPaddingRight(), + mBottomSheet.getPaddingBottom() + windowInsets.getSystemWindowInsetBottom()); + WindowInsets.Builder builder = new WindowInsets.Builder(windowInsets); + builder.setSystemWindowInsets(Insets.of(windowInsets.getSystemWindowInsetLeft(), + 0, windowInsets.getStableInsetRight(), 0)); + return builder.build(); + }); + return view; } + protected void populateInfoPage(InfoPageController infoPage) { + Context context = requireContext(); + + BottomSheetBehavior bottomSheetBehavior = BottomSheetBehavior.from(mBottomSheet); + + List<String> attributions = getAttributions(context); + boolean showMetadata = shouldShowMetadataInPreview(); + CharSequence exploreLabel = getExploreButtonLabel(context); + + infoPage.populate(attributions, showMetadata, this::onSetWallpaperClicked, + exploreLabel, + (showMetadata && mExploreIntent != null) ? this::onExploreClicked : null); + + mBottomSheet.setVisibility(View.VISIBLE); + + // Initialize the state of the BottomSheet based on the current state because if the initial + // and current state are the same, the state change listener won't fire and set the correct + // arrow asset and text alpha. + if (mBottomSheetInitialState == STATE_EXPANDED) { + setPreviewChecked(false); + infoPage.setContentAlpha(1f); + } else { + setPreviewChecked(true); + infoPage.setContentAlpha(0f); + } + + bottomSheetBehavior.setState(mBottomSheetInitialState); + } + + protected List<String> getAttributions(Context context) { + return mWallpaper.getAttributions(context); + } + + protected boolean shouldShowMetadataInPreview() { + android.app.WallpaperInfo wallpaperComponent = mWallpaper.getWallpaperComponent(); + return wallpaperComponent == null || wallpaperComponent.getShowMetadataInPreview(); + } + + @Nullable + protected abstract CharSequence getExploreButtonLabel(Context context); + + @LayoutRes + protected abstract int getLayoutResId(); + protected abstract void setUpBottomSheetView(ViewGroup bottomSheet); @IdRes protected abstract int getBottomSheetResId(); + @IdRes + protected abstract int getLoadingIndicatorResId(); + protected int getDeviceDefaultTheme() { return android.R.style.Theme_DeviceDefault; } @@ -342,33 +387,6 @@ public abstract class PreviewFragment extends Fragment implements } } - protected void setUpSetWallpaperButton(Button setWallpaperButton) { - if (mPreviewMode == MODE_VIEW_ONLY) { - setWallpaperButton.setVisibility(View.GONE); - } else { - setWallpaperButton.setVisibility(View.VISIBLE); - setWallpaperButton.setOnClickListener(this::onSetWallpaperClicked); - } - } - - protected void setUpExploreButton(Button exploreButton) { - exploreButton.setVisibility(View.GONE); - if (mExploreIntent == null) { - return; - } - Context context = requireContext(); - exploreButton.setVisibility(View.VISIBLE); - exploreButton.setText(context.getString( - mWallpaper.getActionLabelRes(context))); - - exploreButton.setOnClickListener(view -> { - mUserEventLogger.logActionClicked(mWallpaper.getCollectionId(context), - mWallpaper.getActionLabelRes(context)); - - startActivity(mExploreIntent); - }); - } - protected void setUpExploreIntent(@Nullable Runnable callback) { Context context = getContext(); if (context == null) { @@ -397,6 +415,18 @@ public abstract class PreviewFragment extends Fragment implements } } + /** + * Configure loading indicator with a MaterialProgressDrawable. + */ + protected void setUpLoadingIndicator() { + mLoadingProgressBar.setProgressTintList(ColorStateList.valueOf(getAttrColor( + new ContextThemeWrapper(requireContext(), getDeviceDefaultTheme()), + android.R.attr.colorAccent))); + mLoadingProgressBar.show(); + } + + protected abstract boolean isLoaded(); + @Override public void onSet(int destination) { setCurrentWallpaper(destination); @@ -429,11 +459,22 @@ public abstract class PreviewFragment extends Fragment implements outState.putInt(KEY_BOTTOM_SHEET_STATE, bottomSheetBehavior.getState()); } - private void onSetWallpaperClicked(View button) { + protected void onSetWallpaperClicked(View button) { mWallpaperSetter.requestDestination(getContext(), getFragmentManager(), this, mWallpaper instanceof LiveWallpaperInfo); } + private void onExploreClicked(View button) { + if (getContext() == null) { + return; + } + Context context = getContext(); + mUserEventLogger.logActionClicked(mWallpaper.getCollectionId(context), + mWallpaper.getActionLabelRes(context)); + + startActivity(mExploreIntent); + } + private void setUpBottomSheetListeners() { final BottomSheetBehavior bottomSheetBehavior = BottomSheetBehavior.from(mBottomSheet); @@ -530,14 +571,6 @@ public abstract class PreviewFragment extends Fragment implements } } - @IntDef({ - ActivityInfo.SCREEN_ORIENTATION_PORTRAIT, - ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE, - ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT, - ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE}) - private @interface ActivityInfoScreenOrientation { - } - /** * Returns whether layout direction is RTL (or false for LTR). Since native RTL layout support * was added in API 17, returns false for versions lower than 17. @@ -546,4 +579,94 @@ public abstract class PreviewFragment extends Fragment implements return getResources().getConfiguration().getLayoutDirection() == View.LAYOUT_DIRECTION_RTL; } -}
\ No newline at end of file + + protected static class InfoPageController { + + public static View createView(LayoutInflater inflater) { + return inflater.inflate(R.layout.preview_page_info, null /* root */); + } + + private final int mPreviewMode; + private final View mInfoPage; + private final TextView mAttributionTitle; + private final TextView mAttributionSubtitle1; + private final TextView mAttributionSubtitle2; + private final Button mExploreButton; + private final Button mSetWallpaperButton; + private final View mSpacer; + + public InfoPageController(View infoPage, int previewMode) { + mInfoPage = infoPage; + mPreviewMode = previewMode; + + mAttributionTitle = mInfoPage.findViewById(R.id.preview_attribution_pane_title); + mAttributionSubtitle1 = mInfoPage.findViewById(R.id.preview_attribution_pane_subtitle1); + mAttributionSubtitle2 = mInfoPage.findViewById(R.id.preview_attribution_pane_subtitle2); + mSpacer = mInfoPage.findViewById(R.id.spacer); + + mExploreButton = mInfoPage.findViewById(R.id.preview_attribution_pane_explore_button); + mSetWallpaperButton = mInfoPage.findViewById( + R.id.preview_attribution_pane_set_wallpaper_button); + } + + public void populate(List<String> attributions, boolean showMetadata, + OnClickListener setWallpaperOnClickListener, + CharSequence exploreButtonLabel, + @Nullable OnClickListener exploreOnClickListener) { + if (attributions.size() > 0 && attributions.get(0) != null) { + mAttributionTitle.setText(attributions.get(0)); + } + + if (showMetadata) { + if (attributions.size() > 1 && attributions.get(1) != null) { + mAttributionSubtitle1.setVisibility(View.VISIBLE); + mAttributionSubtitle1.setText(attributions.get(1)); + } + + if (attributions.size() > 2 && attributions.get(2) != null) { + mAttributionSubtitle2.setVisibility(View.VISIBLE); + mAttributionSubtitle2.setText(attributions.get(2)); + } + } + setUpSetWallpaperButton(setWallpaperOnClickListener); + + setUpExploreButton(exploreButtonLabel, exploreOnClickListener); + + if (mExploreButton.getVisibility() == View.VISIBLE + && mSetWallpaperButton.getVisibility() == View.VISIBLE) { + mSpacer.setVisibility(View.VISIBLE); + } else { + mSpacer.setVisibility(View.GONE); + } + } + + public void setContentAlpha(float alpha) { + mSetWallpaperButton.setAlpha(alpha); + mExploreButton.setAlpha(alpha); + mAttributionTitle.setAlpha(alpha); + mAttributionSubtitle1.setAlpha(alpha); + mAttributionSubtitle2.setAlpha(alpha); + } + + private void setUpSetWallpaperButton(OnClickListener setWallpaperOnClickListener) { + if (mPreviewMode == MODE_VIEW_ONLY) { + mSetWallpaperButton.setVisibility(View.GONE); + } else { + mSetWallpaperButton.setVisibility(View.VISIBLE); + mSetWallpaperButton.setOnClickListener(setWallpaperOnClickListener); + } + } + + private void setUpExploreButton(CharSequence label, + @Nullable OnClickListener exploreOnClickListener) { + mExploreButton.setVisibility(View.GONE); + if (exploreOnClickListener == null) { + return; + } + mExploreButton.setVisibility(View.VISIBLE); + mExploreButton.setText(label); + + mExploreButton.setOnClickListener(exploreOnClickListener); + } + } +} |