summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--res/drawable/ic_settings.xml26
-rw-r--r--res/drawable/ic_tick.xml26
-rw-r--r--res/layout-xlarge/live_wallpaper_entry.xml45
-rw-r--r--res/layout-xlarge/live_wallpaper_list.xml51
-rw-r--r--res/layout/live_wallpaper_base.xml20
-rw-r--r--res/layout/live_wallpaper_entry.xml10
-rw-r--r--res/layout/live_wallpaper_list.xml38
-rw-r--r--res/layout/live_wallpaper_preview.xml43
-rw-r--r--res/menu/menu_preview.xml (renamed from res/layout-xlarge/live_wallpaper_base.xml)14
-rw-r--r--res/values-af/strings.xml1
-rw-r--r--res/values-am/strings.xml1
-rw-r--r--res/values-ar/strings.xml1
-rw-r--r--res/values-az-rAZ/strings.xml1
-rw-r--r--res/values-bg/strings.xml1
-rw-r--r--res/values-bn-rBD/strings.xml1
-rw-r--r--res/values-ca/strings.xml1
-rw-r--r--res/values-cs/strings.xml1
-rw-r--r--res/values-da/strings.xml1
-rw-r--r--res/values-de/strings.xml1
-rw-r--r--res/values-el/strings.xml1
-rw-r--r--res/values-en-rAU/strings.xml5
-rw-r--r--res/values-en-rGB/strings.xml5
-rw-r--r--res/values-en-rIN/strings.xml5
-rw-r--r--res/values-es-rUS/strings.xml3
-rw-r--r--res/values-es/strings.xml1
-rw-r--r--res/values-et-rEE/strings.xml1
-rw-r--r--res/values-eu-rES/strings.xml1
-rw-r--r--res/values-fa/strings.xml11
-rw-r--r--res/values-fi/strings.xml1
-rw-r--r--res/values-fr-rCA/strings.xml1
-rw-r--r--res/values-fr/strings.xml1
-rw-r--r--res/values-gl-rES/strings.xml1
-rw-r--r--res/values-gu-rIN/strings.xml1
-rw-r--r--res/values-hi/strings.xml1
-rw-r--r--res/values-hr/strings.xml15
-rw-r--r--res/values-hu/strings.xml1
-rw-r--r--res/values-hy-rAM/strings.xml1
-rw-r--r--res/values-in/strings.xml1
-rw-r--r--res/values-is-rIS/strings.xml1
-rw-r--r--res/values-it/strings.xml1
-rw-r--r--res/values-iw/strings.xml1
-rw-r--r--res/values-ja/strings.xml1
-rw-r--r--res/values-ka-rGE/strings.xml1
-rw-r--r--res/values-kk-rKZ/strings.xml9
-rw-r--r--res/values-km-rKH/strings.xml1
-rw-r--r--res/values-kn-rIN/strings.xml1
-rw-r--r--res/values-ko/strings.xml1
-rw-r--r--res/values-lo-rLA/strings.xml1
-rw-r--r--res/values-lt/strings.xml5
-rw-r--r--res/values-lv/strings.xml1
-rw-r--r--res/values-mk-rMK/strings.xml1
-rw-r--r--res/values-ml-rIN/strings.xml1
-rw-r--r--res/values-mn-rMN/strings.xml1
-rw-r--r--res/values-mr-rIN/strings.xml1
-rw-r--r--res/values-ms-rMY/strings.xml1
-rw-r--r--res/values-my-rMM/strings.xml1
-rw-r--r--res/values-nb/strings.xml3
-rw-r--r--res/values-ne-rNP/strings.xml1
-rw-r--r--res/values-nl/strings.xml1
-rw-r--r--res/values-pa-rIN/strings.xml1
-rw-r--r--res/values-pl/strings.xml1
-rw-r--r--res/values-pt-rPT/strings.xml1
-rw-r--r--res/values-pt/strings.xml3
-rw-r--r--res/values-ro/strings.xml1
-rw-r--r--res/values-ru/strings.xml1
-rw-r--r--res/values-si-rLK/strings.xml1
-rw-r--r--res/values-sk/strings.xml11
-rw-r--r--res/values-sl/strings.xml1
-rw-r--r--res/values-sq-rAL/strings.xml5
-rw-r--r--res/values-sr/strings.xml1
-rw-r--r--res/values-sv/strings.xml1
-rw-r--r--res/values-sw/strings.xml1
-rw-r--r--res/values-ta-rIN/strings.xml1
-rw-r--r--res/values-te-rIN/strings.xml5
-rw-r--r--res/values-th/strings.xml1
-rw-r--r--res/values-tl/strings.xml1
-rw-r--r--res/values-tr/strings.xml1
-rw-r--r--res/values-uk/strings.xml3
-rw-r--r--res/values-ur-rPK/strings.xml1
-rw-r--r--res/values-uz-rUZ/strings.xml5
-rw-r--r--res/values-vi/strings.xml1
-rw-r--r--res/values-xlarge/dimensions.xml4
-rw-r--r--res/values-xlarge/styles.xml22
-rw-r--r--res/values-zh-rCN/strings.xml1
-rw-r--r--res/values-zh-rHK/strings.xml1
-rw-r--r--res/values-zh-rTW/strings.xml1
-rw-r--r--res/values-zu/strings.xml1
-rw-r--r--res/values/dimensions.xml5
-rw-r--r--res/values/strings.xml2
-rw-r--r--res/values/styles.xml39
-rw-r--r--src/com/android/wallpaper/livepicker/LiveWallpaperActivity.java125
-rw-r--r--src/com/android/wallpaper/livepicker/LiveWallpaperChange.java44
-rw-r--r--src/com/android/wallpaper/livepicker/LiveWallpaperListAdapter.java3
-rw-r--r--src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java71
94 files changed, 224 insertions, 518 deletions
diff --git a/res/drawable/ic_settings.xml b/res/drawable/ic_settings.xml
new file mode 100644
index 0000000..a9a5708
--- /dev/null
+++ b/res/drawable/ic_settings.xml
@@ -0,0 +1,26 @@
+<!--
+Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:height="24.0dp"
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0"
+ android:width="24.0dp" >
+
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M19.43 12.98c.04-.32.07-.64.07-.98s-.03-.66-.07-.98l2.11-1.65c.19-.15.24-.42.12-.64l-2-3.46c-.12-.22-.39-.3-.61-.22l-2.49 1c-.52-.4-1.08-.73-1.69-.98l-.38-2.65C14.46 2.18 14.25 2 14 2h-4c-.25 0-.46.18-.49.42l-.38 2.65c-.61.25-1.17.59-1.69.98l-2.49-1c-.23-.09-.49 0-.61.22l-2 3.46c-.13.22-.07.49.12.64l2.11 1.65c-.04.32-.07.65-.07.98s.03.66.07.98l-2.11 1.65c-.19.15-.24.42-.12.64l2 3.46c.12.22.39.3.61.22l2.49-1c.52.4 1.08.73 1.69.98l.38 2.65c.03.24.24.42.49.42h4c.25 0 .46-.18.49-.42l.38-2.65c.61-.25 1.17-.59 1.69-.98l2.49 1c.23.09.49 0 .61-.22l2-3.46c.12-.22.07-.49-.12-.64l-2.11-1.65zM12 15.5c-1.93 0-3.5-1.57-3.5-3.5s1.57-3.5 3.5-3.5 3.5 1.57 3.5 3.5-1.57 3.5-3.5 3.5z" />
+
+</vector>
diff --git a/res/drawable/ic_tick.xml b/res/drawable/ic_tick.xml
new file mode 100644
index 0000000..4389a16
--- /dev/null
+++ b/res/drawable/ic_tick.xml
@@ -0,0 +1,26 @@
+<!--
+Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:height="24.0dp"
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0"
+ android:width="24.0dp" >
+
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M9 16.2L4.8 12l-1.4 1.4L9 19 21 7l-1.4-1.4L9 16.2z" />
+
+</vector>
diff --git a/res/layout-xlarge/live_wallpaper_entry.xml b/res/layout-xlarge/live_wallpaper_entry.xml
deleted file mode 100644
index cecdf59..0000000
--- a/res/layout-xlarge/live_wallpaper_entry.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:padding="8dp">
- <ImageView
- android:id="@+id/thumbnail"
- android:layout_width="@dimen/live_wallpaper_grid_item_width"
- android:layout_height="@dimen/live_wallpaper_grid_item_height"
- android:layout_gravity="center"
- android:layout_weight="1"
- android:scaleType="centerCrop" />
- <TextView
- android:id="@+id/title"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:layout_gravity="center"
- android:gravity="bottom"
- android:singleLine="true"
- android:ellipsize="marquee"
-
- android:textColor="#FFFFFFFF"
- android:textSize="14sp"
- android:shadowColor="#FF000000"
- android:shadowDx="0.0"
- android:shadowDy="1.0"
- android:shadowRadius="1.0" />
-</LinearLayout>
diff --git a/res/layout-xlarge/live_wallpaper_list.xml b/res/layout-xlarge/live_wallpaper_list.xml
deleted file mode 100644
index 49a1786..0000000
--- a/res/layout-xlarge/live_wallpaper_list.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingLeft="24dp"
- android:paddingRight="24dp"
- android:paddingTop="24dp"
- android:paddingBottom="24dp"
- android:gravity="center">
- <GridView
- android:id="@android:id/list"
- android:layout_width="702dp"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:numColumns="3"
- android:stretchMode="none"
- android:columnWidth="@dimen/live_wallpaper_grid_item_width"
- android:verticalSpacing="0dp"
- android:horizontalSpacing="0dp"
- android:drawSelectorOnTop="false" />
- <TextView
- android:id="@android:id/empty"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
-
- android:gravity="center"
- android:visibility="gone"
-
- android:text="@string/live_wallpaper_empty"
- android:textColor="#FFFFFFFF"
- android:textSize="14sp"
- android:shadowColor="#FF000000"
- android:shadowDx="0.0"
- android:shadowDy="1.0"
- android:shadowRadius="1.0" />
-</FrameLayout> \ No newline at end of file
diff --git a/res/layout/live_wallpaper_base.xml b/res/layout/live_wallpaper_base.xml
index bb4c960..dfbd212 100644
--- a/res/layout/live_wallpaper_base.xml
+++ b/res/layout/live_wallpaper_base.xml
@@ -16,9 +16,21 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="match_parent">
- <fragment class="com.android.wallpaper.livepicker.LiveWallpaperActivity$WallpaperDialog"
- android:id="@+id/live_wallpaper_fragment"
+ android:layout_height="match_parent"
+ android:paddingLeft="@dimen/screen_margin_sides"
+ android:paddingRight="@dimen/screen_margin_sides">
+ <ListView
+ android:id="@android:id/list"
android:layout_width="match_parent"
- android:layout_height="match_parent" />
+ android:layout_height="match_parent"
+ android:drawSelectorOnTop="false" />
+
+ <TextView
+ android:id="@android:id/empty"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center"
+ android:visibility="gone"
+ android:text="@string/live_wallpaper_empty"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
</FrameLayout>
diff --git a/res/layout/live_wallpaper_entry.xml b/res/layout/live_wallpaper_entry.xml
index df75e84..a133841 100644
--- a/res/layout/live_wallpaper_entry.xml
+++ b/res/layout/live_wallpaper_entry.xml
@@ -17,43 +17,33 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
-
android:paddingStart="6dip"
android:paddingEnd="6dip"
android:paddingTop="6dip"
android:paddingBottom="6dip"
-
android:minHeight="?android:attr/listPreferredItemHeight">
<ImageView
android:id="@+id/thumbnail"
-
android:layout_width="@dimen/live_wallpaper_thumbnail_width"
android:layout_height="@dimen/live_wallpaper_thumbnail_height"
-
android:layout_gravity="center_vertical"
-
android:scaleType="centerCrop" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
-
android:layout_marginStart="10dip"
android:layout_marginEnd="8dip"
android:layout_centerVertical="true"
android:layout_toEndOf="@id/thumbnail"
-
android:orientation="vertical">
<TextView
android:id="@+id/title"
-
android:layout_width="match_parent"
android:layout_height="wrap_content"
-
android:textAppearance="?android:attr/textAppearanceMedium"
-
android:singleLine="true"
android:ellipsize="marquee" />
diff --git a/res/layout/live_wallpaper_list.xml b/res/layout/live_wallpaper_list.xml
deleted file mode 100644
index a3c22bb..0000000
--- a/res/layout/live_wallpaper_list.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
- <ListView
- android:id="@android:id/list"
-
- android:layout_width="match_parent"
- android:layout_height="match_parent"
-
- android:drawSelectorOnTop="false" />
-
- <TextView
- android:id="@android:id/empty"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
-
- android:gravity="center"
- android:visibility="gone"
-
- android:text="@string/live_wallpaper_empty"
- android:textAppearance="?android:attr/textAppearanceMedium" />
-</FrameLayout> \ No newline at end of file
diff --git a/res/layout/live_wallpaper_preview.xml b/res/layout/live_wallpaper_preview.xml
index 1fa7ec8..6dcb644 100644
--- a/res/layout/live_wallpaper_preview.xml
+++ b/res/layout/live_wallpaper_preview.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
+<!--
+ Copyright (C) 2009 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -13,36 +14,12 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<Button xmlns:android="http://schemas.android.com/apk/res/android"
+ style="@style/ActionBarSetWallpaperStyle"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
-
- android:layout_gravity="center_horizontal|bottom"
- android:background="#88000000"
- style="?android:attr/buttonBarStyle">
-
- <Button
- android:id="@+id/configure"
-
- android:layout_width="0dip"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:layout_gravity="center_vertical"
-
- android:text="@string/configure_wallpaper"
-
- android:onClick="configureLiveWallpaper"
- style="?android:attr/buttonBarButtonStyle" />
-
- <Button
- android:layout_width="0dip"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:layout_gravity="center_vertical"
-
- android:text="@string/wallpaper_instructions"
-
- android:onClick="setLiveWallpaper"
- style="?android:attr/buttonBarButtonStyle" />
-</LinearLayout>
+ android:layout_height="match_parent"
+ android:drawablePadding="8dp"
+ android:drawableStart="@drawable/ic_tick"
+ android:gravity="start|center_vertical"
+ android:onClick="setLiveWallpaper"
+ android:text="@string/wallpaper_instructions" />
diff --git a/res/layout-xlarge/live_wallpaper_base.xml b/res/menu/menu_preview.xml
index 3c1888c..26adc2d 100644
--- a/res/layout-xlarge/live_wallpaper_base.xml
+++ b/res/menu/menu_preview.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
+<!--
+ Copyright (C) 2015 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -13,7 +14,12 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content" /> \ No newline at end of file
+ <item
+ android:id="@+id/configure"
+ android:icon="@drawable/ic_settings"
+ android:showAsAction="ifRoom"
+ android:title="@string/configure_wallpaper"/>
+
+</menu>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 0e9860b..455d58d 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"Stel muurpapier"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> deur <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Laai tans aktiewe muurpapier…"</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"Kanselleer"</string>
</resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 195c60f..11eb491 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"ልጣፍ አዘጋጅ"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> በ <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"ቀጥታ የሚተላለፍ ልጣፍ በመስቀል ላይ..."</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"ይቅር"</string>
</resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 2e005c9..683556d 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"تعيين خلفية"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> بواسطة <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"جارٍ تحميل الخلفية المتحركة..."</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"إلغاء"</string>
</resources>
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
index 5eb080c..98fb76d 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"Divar kağızı seçin"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="AUTHOR">%2$s</xliff:g> tərəfindən <xliff:g id="TITLE">%1$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Canlı divar kağızı yüklənir..."</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"Ləğv et"</string>
</resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index dc96d2a..357abbe 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"Задаване на тапет"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> от <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Динамичният тапет се зарежда..."</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"Отказ"</string>
</resources>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index 81441fd..e112f77 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"ওয়ালপেপার সেট করুন"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="AUTHOR">%2$s</xliff:g> এর দ্বারা <xliff:g id="TITLE">%1$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"লাইভ ওয়ালপেপার লোড হচ্ছে..."</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"বাতিল করুন"</string>
</resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index f1167b9..fead895 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"Estableix el fons de pantalla"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> per <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"S\'està carregant el fons de pantalla animat..."</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"Cancel·la"</string>
</resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index ad1daa7..946223a 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"Nastavit tapetu"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> (autor: <xliff:g id="AUTHOR">%2$s</xliff:g>)"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Načítání živé tapety…"</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"Zrušit"</string>
</resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 264799a..7ff86e5 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"Angiv baggrund"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g>af <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Indlæser animeret baggrund..."</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"Annuller"</string>
</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 6761f19..18f1ffe 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"Hintergrund festlegen"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> von <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Live-Hintergrund wird geladen…"</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"Abbrechen"</string>
</resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index f3973c2..27618cc 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"Ορισμός ταπετσαρίας"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g>του/της <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Φόρτωση ζωντανής ταπετσαρίας…"</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"Ακύρωση"</string>
</resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index b83f22e..dd4736b 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -21,13 +21,12 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="4119979710394894209">"Live Wallpaper Picker"</string>
<string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Select live wallpaper"</string>
- <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Live Wallpaper"</string>
+ <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Live Wallpapers"</string>
<string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Live wallpaper preview"</string>
<string name="configure_wallpaper" msgid="7396598925806288258">"Settings…"</string>
<string name="wallpaper_instructions" msgid="4215640646180727542">"Set wallpaper"</string>
- <string name="live_wallpaper_empty" msgid="4278728108785853407">"No live wallpaper."</string>
+ <string name="live_wallpaper_empty" msgid="4278728108785853407">"No live wallpapers."</string>
<string name="set_live_wallpaper" msgid="2381437614949033266">"Set wallpaper"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> by <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Loading live wallpaper…"</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"Cancel"</string>
</resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index b83f22e..dd4736b 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -21,13 +21,12 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="4119979710394894209">"Live Wallpaper Picker"</string>
<string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Select live wallpaper"</string>
- <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Live Wallpaper"</string>
+ <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Live Wallpapers"</string>
<string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Live wallpaper preview"</string>
<string name="configure_wallpaper" msgid="7396598925806288258">"Settings…"</string>
<string name="wallpaper_instructions" msgid="4215640646180727542">"Set wallpaper"</string>
- <string name="live_wallpaper_empty" msgid="4278728108785853407">"No live wallpaper."</string>
+ <string name="live_wallpaper_empty" msgid="4278728108785853407">"No live wallpapers."</string>
<string name="set_live_wallpaper" msgid="2381437614949033266">"Set wallpaper"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> by <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Loading live wallpaper…"</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"Cancel"</string>
</resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index b83f22e..dd4736b 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -21,13 +21,12 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="4119979710394894209">"Live Wallpaper Picker"</string>
<string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Select live wallpaper"</string>
- <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Live Wallpaper"</string>
+ <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Live Wallpapers"</string>
<string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Live wallpaper preview"</string>
<string name="configure_wallpaper" msgid="7396598925806288258">"Settings…"</string>
<string name="wallpaper_instructions" msgid="4215640646180727542">"Set wallpaper"</string>
- <string name="live_wallpaper_empty" msgid="4278728108785853407">"No live wallpaper."</string>
+ <string name="live_wallpaper_empty" msgid="4278728108785853407">"No live wallpapers."</string>
<string name="set_live_wallpaper" msgid="2381437614949033266">"Set wallpaper"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> by <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Loading live wallpaper…"</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"Cancel"</string>
</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index e1ccf0a..04b8556 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -25,9 +25,8 @@
<string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Vista previa del fondo de pantalla animado"</string>
<string name="configure_wallpaper" msgid="7396598925806288258">"Configuración…"</string>
<string name="wallpaper_instructions" msgid="4215640646180727542">"Definir como fondo de pantalla"</string>
- <string name="live_wallpaper_empty" msgid="4278728108785853407">"No se han elegido como fondos de pantalla."</string>
+ <string name="live_wallpaper_empty" msgid="4278728108785853407">"No hay fondos de pantalla."</string>
<string name="set_live_wallpaper" msgid="2381437614949033266">"Definir como fondo de pantalla"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g>por <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Cargando fondo de pantalla animado…"</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"Cancelar"</string>
</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 57ab6ff..0062cd3 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"Establecer fondo de pantalla"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> de <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Cargando fondo de pantalla animado…"</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"Cancelar"</string>
</resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 8103c5b..c0d46b5 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"Määra taustapilt"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> autorilt <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Liikuva taustapildi laadimine ..."</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"Tühista"</string>
</resources>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index d853706..ef1f2f1 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"Ezarri horma-papera"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g>. Egilea: <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Horma-paper dinamikoa kargatzen…"</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"Utzi"</string>
</resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 83b50ad..57647bc 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -20,14 +20,13 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="4119979710394894209">"Live Wallpaper Picker"</string>
- <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"‏انتخاب live wallpaper"</string>
+ <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"انتخاب کاغذدیواری زنده"</string>
<string name="live_wallpaper_picker_label" msgid="3218000114890071946">"تصاویر زمینهٔ زنده"</string>
- <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"‏پیش‌نمایش Live wallpaper"</string>
+ <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"پیش‌نمایش کاغذدیواری زنده"</string>
<string name="configure_wallpaper" msgid="7396598925806288258">"تنظیمات..."</string>
- <string name="wallpaper_instructions" msgid="4215640646180727542">"تنظیم تصویر زمینه"</string>
+ <string name="wallpaper_instructions" msgid="4215640646180727542">"تنظیم کاغذدیواری"</string>
<string name="live_wallpaper_empty" msgid="4278728108785853407">"تصویر زمینه زنده ای موجود نیست."</string>
- <string name="set_live_wallpaper" msgid="2381437614949033266">"تنظیم تصویر زمینه"</string>
+ <string name="set_live_wallpaper" msgid="2381437614949033266">"تنظیم کاغذدیواری"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> توسط <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
- <string name="live_wallpaper_loading" msgid="2488371303130330734">"در حال بارگیری تصویر زمینه زنده..."</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"لغو"</string>
+ <string name="live_wallpaper_loading" msgid="2488371303130330734">"در حال بارگیری کاغذدیواری زنده..."</string>
</resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index fe83e83..7e45a01 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"Aseta taustakuva"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g>, tekijä: <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Ladataan live-taustakuvaa…"</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"Peruuta"</string>
</resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index bcd6cab..3b28810 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"Sélectionner"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> de <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Chargement du fond d\'écran animé…"</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"Annuler"</string>
</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index e7186c0..b3d8539 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"Sélectionner"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> de <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Chargement du fond d\'écran animé…"</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"Annuler"</string>
</resources>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index dde30e2..c0734d7 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"Establecer fondo de pantalla"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g>, creado por <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Cargando fondo de pantalla animado…"</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"Cancelar"</string>
</resources>
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml
index 2e4695d..0a641ea 100644
--- a/res/values-gu-rIN/strings.xml
+++ b/res/values-gu-rIN/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"વૉલપેપર સેટ કરો"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="AUTHOR">%2$s</xliff:g> દ્વારા <xliff:g id="TITLE">%1$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"લાઇવ વૉલપેપર લોડ કરી રહ્યું છે…"</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"રદ કરો"</string>
</resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index f18e411..9d83e36 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"वॉलपेपर सेट करें"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> द्वारा <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"एनीमेशन वाला वॉलपेपर लोड हो रहा है…"</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"अभी नहीं"</string>
</resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index a4eef05..4c4c207 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -20,14 +20,13 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="4119979710394894209">"Izbornik animiranih pozadinskih slika"</string>
- <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Odaberite animiranu pozadinsku sliku"</string>
- <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Pozadinske slike uživo"</string>
- <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Pregled animirane pozadinske slike"</string>
+ <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Odaberite animiranu pozadinu"</string>
+ <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Animirane pozadine"</string>
+ <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Pregled animirane pozadine"</string>
<string name="configure_wallpaper" msgid="7396598925806288258">"Postavke…"</string>
- <string name="wallpaper_instructions" msgid="4215640646180727542">"Postavi pozadinsku sliku"</string>
- <string name="live_wallpaper_empty" msgid="4278728108785853407">"Nema animiranih pozadinskih slika."</string>
- <string name="set_live_wallpaper" msgid="2381437614949033266">"Postavi pozadinsku sliku"</string>
+ <string name="wallpaper_instructions" msgid="4215640646180727542">"Postavi pozadinu"</string>
+ <string name="live_wallpaper_empty" msgid="4278728108785853407">"Nema animiranih pozadina."</string>
+ <string name="set_live_wallpaper" msgid="2381437614949033266">"Postavi pozadinu"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> od autora/ice: <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
- <string name="live_wallpaper_loading" msgid="2488371303130330734">"Učitavanje animirane pozadinske slike…"</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"Odustani"</string>
+ <string name="live_wallpaper_loading" msgid="2488371303130330734">"Učitavanje animirane pozadine…"</string>
</resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 9f41f57..5e98227 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"Háttérkép kiválasztása"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g>; készítette: <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Élő háttérkép betöltése..."</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"Mégse"</string>
</resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 621d9bc..d29bb78 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"Սահմանել պաստառ"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> ըստ <xliff:g id="AUTHOR">%2$s</xliff:g>-ի"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Բեռնվում է կենդանի պաստառը..."</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"Չեղարկել"</string>
</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index f479812..a4eeec0 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"Setel wallpaper"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> oleh <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Memuat wallpaper animasi…"</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"Batal"</string>
</resources>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index b9a183a..591ccfd 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"Velja veggfóður"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> eftir <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Hleður kvikt veggfóður…"</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"Hætta við"</string>
</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 2618b77..9e6b7d1 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"Imposta sfondo"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> di <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Caricamento sfondo animato…"</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"Annulla"</string>
</resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 9d64e1f..e419ab9 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"הגדר טפט"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> מאת <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"טוען טפט מונפש…"</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"בטל"</string>
</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 4ea95d5..baf5695 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"壁紙を設定"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g>(作成者: <xliff:g id="AUTHOR">%2$s</xliff:g>)"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"ライブ壁紙を読み込み中…"</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"キャンセル"</string>
</resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index e608c78..9431a01 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"ფონის დაყენება"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> ავტორი: <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"იტვირთება ცოცხალი ფონი…"</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"გაუქმება"</string>
</resources>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index 1106e34..c03956c 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -21,13 +21,12 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="4119979710394894209">"Live Wallpaper Picker (анимациялық артқы фон таңдағыш) қолданбасы"</string>
<string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Анимациялық артқы фон таңдау"</string>
- <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Анимациялық артқы фондар"</string>
+ <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Анимациялық тұсқағаз"</string>
<string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Анимациялық артқы фондарды алдын ала көру"</string>
<string name="configure_wallpaper" msgid="7396598925806288258">"Параметрлер"</string>
- <string name="wallpaper_instructions" msgid="4215640646180727542">"Артқы фонды орнату"</string>
- <string name="live_wallpaper_empty" msgid="4278728108785853407">"Ешқандай анимациялық артқы фондар жоқ."</string>
- <string name="set_live_wallpaper" msgid="2381437614949033266">"Артқы фонды орнату"</string>
+ <string name="wallpaper_instructions" msgid="4215640646180727542">"Тұсқағаз орнату"</string>
+ <string name="live_wallpaper_empty" msgid="4278728108785853407">"Анимациялық тұсқағаз жоқ."</string>
+ <string name="set_live_wallpaper" msgid="2381437614949033266">"Тұсқағаз орнату"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> авторы <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Анимациялық артқы фонды жүктеуде…"</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"Өшіру"</string>
</resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index ba9b82c..2280240 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"កំណត់​ផ្ទាំង​រូបភាព"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> ដោយ <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"កំពុង​ផ្ទុក​ផ្ទាំង​រូបភាព​មាន​ចលនា..."</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"បោះ​បង់​"</string>
</resources>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index a15f68a..d5dbf6f 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"ವಾಲ್‌ಪೇಪರ್ ಹೊಂದಿಸಿ"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="AUTHOR">%2$s</xliff:g> ಅವರ <xliff:g id="TITLE">%1$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"ಲೈವ್ ವಾಲ್‌ಪೇಪರ್‌ ಅನ್ನು ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"ರದ್ದುಮಾಡು"</string>
</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index cdcb81a..9ed8af2 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"배경화면 설정"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> 개발자: <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"라이브 배경화면 로드 중..."</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"취소"</string>
</resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index bff89c0..70df5b2 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"ຕັ້ງພາບພື້ນຫຼັງ"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> ໂດຍ <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"ກຳລັງໂຫລດພາບພື້ນຫຼັງແບບເຄື່ອນໄຫວ…"</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"ຍົກເລີກ"</string>
</resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 6835bc9..fcb8d05 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -21,13 +21,12 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="4119979710394894209">"Judančių darbalaukio fonų parinkimo programa"</string>
<string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Pasirinkti judantį darbalaukio foną"</string>
- <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Judantys darbalaukio fonai"</string>
+ <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Sąveikieji fonai"</string>
<string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Judančio darbalaukio fono peržiūra"</string>
<string name="configure_wallpaper" msgid="7396598925806288258">"Nustatymai…"</string>
<string name="wallpaper_instructions" msgid="4215640646180727542">"Nustatyti darbalaukio foną"</string>
- <string name="live_wallpaper_empty" msgid="4278728108785853407">"Nėra judančių darbalaukio fonų."</string>
+ <string name="live_wallpaper_empty" msgid="4278728108785853407">"Nėra sąveikiųjų fonų."</string>
<string name="set_live_wallpaper" msgid="2381437614949033266">"Nustatyti darbalaukio foną"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> autorius <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Įkeliamas judantis darbalaukio fonas..."</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"Atšaukti"</string>
</resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 13f29ab..d0ab1e4 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"Iestatīt tapeti"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g>, autors: <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Notiek mainīgās tapetes ielāde..."</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"Atcelt"</string>
</resources>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index 5cd2285..9661698 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"Подеси тапет"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> од <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Вчитување раздвижен тапет..."</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"Откажи"</string>
</resources>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index c8fc5af..637a018 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"വാൾപേപ്പർ സജ്ജീകരിക്കുക"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> / <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"സജീവ വാൾപേപ്പർ ലോഡുചെയ്യുന്നു..."</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"റദ്ദാക്കുക"</string>
</resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 58964d3..3583331 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"Ханын зургийг тохируулах"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="AUTHOR">%2$s</xliff:g>-н <xliff:g id="TITLE">%1$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Хөдөлгөөнт ханын зургийг ачааллаж байна…"</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"Цуцлах"</string>
</resources>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index 492e5b4..9d72b34 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"वॉलपेपर सेट करा"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="AUTHOR">%2$s</xliff:g> द्वारे <xliff:g id="TITLE">%1$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"थेट वॉलपेपर लोड करत आहे…"</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"रद्द करा"</string>
</resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 50898ac..f7308b3 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"Tetapkan kertas dinding"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> oleh <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Memuatkan kertas dinding hidup..."</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"Batal"</string>
</resources>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index bdd28d2..5038931 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"နောက်ခံအား သတ်မှတ်ရန်"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> ကို ရေးသားသူ <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"နောက်ခံပုံအရှင်ကို ဆွဲခေါ်နေပါတယ် …"</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"ထားတော့"</string>
</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 111bba1..daa2ad2 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -25,9 +25,8 @@
<string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Forhåndsvisning av animert bakgrunn"</string>
<string name="configure_wallpaper" msgid="7396598925806288258">"Innstillinger"</string>
<string name="wallpaper_instructions" msgid="4215640646180727542">"Velg som bakgrunnsbilde"</string>
- <string name="live_wallpaper_empty" msgid="4278728108785853407">"Ingen animerte bakgrunnsbilder."</string>
+ <string name="live_wallpaper_empty" msgid="4278728108785853407">"Ingen animerte bakgrunner."</string>
<string name="set_live_wallpaper" msgid="2381437614949033266">"Velg som bakgrunnsbilde"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> av <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Laster inn animert bakgrunn ..."</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"Avbryt"</string>
</resources>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index cc95a69..dddc163 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"वालपेपरलाई मिलाउनुहोस्"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> बाट <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"लाइभ वालपेपर लोड हुँदै ..."</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"रद्द गर्नुहोस्"</string>
</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 0c8371e..e4046b4 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"Achtergrond instellen"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> door <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Interactieve achtergrond laden…"</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"Annuleren"</string>
</resources>
diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa-rIN/strings.xml
index 210c086..18a38cf 100644
--- a/res/values-pa-rIN/strings.xml
+++ b/res/values-pa-rIN/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"ਵਾਲਪੇਪਰ ਸੈਟ ਕਰੋ"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="AUTHOR">%2$s</xliff:g> ਵੱਲੋਂ <xliff:g id="TITLE">%1$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"ਲਾਈਵ ਵਾਲਪੇਪਰ ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ..."</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"ਰੱਦ ਕਰੋ"</string>
</resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 3597fa6..c9ad92d 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"Ustaw tapetę"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g>, autor: <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Wczytywanie animowanej tapety…"</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"Anuluj"</string>
</resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 9ce7eb0..9cbacb2 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"Definir imagem de fundo"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> de <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"A carregar a imagem de fundo activa…"</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"Cancelar"</string>
</resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index d11fa02..0d359a0 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -20,7 +20,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="4119979710394894209">"Opções de plano de fundo interativo"</string>
- <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Selecionar Plano de fundo interativo"</string>
+ <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Selecionar plano de fundo interativo"</string>
<string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Planos de fundo interativos"</string>
<string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Visualização do p. de fundo interativo"</string>
<string name="configure_wallpaper" msgid="7396598925806288258">"Configurações…"</string>
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"Definir plano de fundo"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> por <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Carregando p. de fundo interativo..."</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"Cancelar"</string>
</resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 215d8a9..43b59c5 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"Setaţi imaginea de fundal"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> de <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Se încarcă imaginea de fundal live..."</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"Anulați"</string>
</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 469e210..d7c48a1 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"Установить фоновый рисунок"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g>, автор: <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Загрузка живых обоев…"</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"Отмена"</string>
</resources>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index 5d53d9b..34bc324 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"වෝල්පේපරය සකසන්න"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="AUTHOR">%2$s</xliff:g> ගේ <xliff:g id="TITLE">%1$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"සජීවී වෝල්පේපරය පූරණය වේ…"</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"අවලංගු කරන්න"</string>
</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 6b583a0..23737bc 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -20,14 +20,13 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="4119979710394894209">"Live Wallpaper Picker"</string>
- <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Vybrať živú tapetu"</string>
- <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Živé tapety"</string>
- <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Ukážka živej tapety"</string>
+ <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Vybrať dynamickú tapetu"</string>
+ <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Dynamické tapety"</string>
+ <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Ukážka dynamickej tapety"</string>
<string name="configure_wallpaper" msgid="7396598925806288258">"Nastavenia…"</string>
<string name="wallpaper_instructions" msgid="4215640646180727542">"Nastaviť tapetu"</string>
- <string name="live_wallpaper_empty" msgid="4278728108785853407">"Žiadne živé tapety."</string>
+ <string name="live_wallpaper_empty" msgid="4278728108785853407">"Žiadne dynamické tapety."</string>
<string name="set_live_wallpaper" msgid="2381437614949033266">"Nastaviť tapetu"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> Autor: <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
- <string name="live_wallpaper_loading" msgid="2488371303130330734">"Prebieha načítanie živej tapety..."</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"Zrušiť"</string>
+ <string name="live_wallpaper_loading" msgid="2488371303130330734">"Načítava sa dynamická tapeta…"</string>
</resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 1b7e1a9..be6f53d 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"Nastavi sliko za ozadje"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g>Avtor: <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Nalaganje animiranih slik za ozadje ..."</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"Prekliči"</string>
</resources>
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
index f392b56..5d0d9c6 100644
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq-rAL/strings.xml
@@ -21,13 +21,12 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="4119979710394894209">"Zgjedhësi i \"Imazhit të drejtpërdrejtë në sfond\""</string>
<string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Përzgjidh imazh të drejtpërdrejtë sfondi"</string>
- <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Imazhe të drejtpërdrejta sfondi"</string>
+ <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Imazhe dinamike sfondi"</string>
<string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Shikim paraprak i imazhit të drejtpërdrejtë të sfondit"</string>
<string name="configure_wallpaper" msgid="7396598925806288258">"Cilësimet..."</string>
<string name="wallpaper_instructions" msgid="4215640646180727542">"Cakto imazhin në sfond"</string>
- <string name="live_wallpaper_empty" msgid="4278728108785853407">"Nuk ka imazhe të drejtpërdrejta sfondi."</string>
+ <string name="live_wallpaper_empty" msgid="4278728108785853407">"Nuk ka imazhe dinamike sfondi"</string>
<string name="set_live_wallpaper" msgid="2381437614949033266">"Cakto imazhin në sfond"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> nga <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Po ngarkon imazhe të drejtpërdrejta sfondi..."</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"Anulo"</string>
</resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index a5ce444..1bfc12e 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"Подеси позадину"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> од аутора: <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Учитавање анимиране позадине…"</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"Откажи"</string>
</resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index cbb4b7f..90dbcc8 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"Ange bakgrund"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> av <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Läser in levande bakgrund…"</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"Avbryt"</string>
</resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 200a7be..f2c86b9 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"Weka mandhari"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> kutoka kwa <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Inapakia taswira hai..."</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"Ghairi"</string>
</resources>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index 7e66ee9..936f911 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"வால்பேப்பரை அமை"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> வழங்கியது <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"நேரலை வால்பேப்பரை ஏற்றுகிறது…"</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"ரத்துசெய்"</string>
</resources>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index 8c7c84f..6f4fa57 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -21,13 +21,12 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="4119979710394894209">"ప్రదర్శిత వాల్‌పేపర్ పికెర్"</string>
<string name="live_wallpaper_picker_title" msgid="4811278937634144675">"ప్రదర్శిత వాల్‌పేపర్‌ను ఎంచుకోండి"</string>
- <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"ప్రదర్శిత వాల్‌పేపర్‌లు"</string>
+ <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"లైవ్ వాల్‌పేపర్‌లు"</string>
<string name="live_wallpaper_preview_title" msgid="1130080613611954763">"ప్రదర్శిత వాల్‌పేపర్ పరిదృశ్యం"</string>
<string name="configure_wallpaper" msgid="7396598925806288258">"సెట్టింగ్‌లు…"</string>
<string name="wallpaper_instructions" msgid="4215640646180727542">"వాల్‌పేపర్‌ను సెట్ చేయి"</string>
- <string name="live_wallpaper_empty" msgid="4278728108785853407">"ప్రదర్శిత వాల్‌పేపర్‌లు లేవు."</string>
+ <string name="live_wallpaper_empty" msgid="4278728108785853407">"లైవ్ వాల్‌పేపర్‌లు లేవు."</string>
<string name="set_live_wallpaper" msgid="2381437614949033266">"వాల్‌పేపర్‌ను సెట్ చేయి"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="AUTHOR">%2$s</xliff:g> ద్వారా <xliff:g id="TITLE">%1$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"ప్రదర్శిత వాల్‌పేపర్‌ను లోడ్ చేస్తోంది…"</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"రద్దు చేయి"</string>
</resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 5d14dd3..1538968 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"ตั้งค่าวอลเปเปอร์"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> โดย <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"กำลังโหลดวอลเปเปอร์ภาพเคลื่อนไหว…"</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"ยกเลิก"</string>
</resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 1676de3..ee706c3 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"Itakda ang wallpaper"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> ni <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Naglo-load ng live wallpaper..."</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"Kanselahin"</string>
</resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index a2e0ad1..17464ec 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"Duvar kağıdını ayarla"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> Oluşturan: <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Animasyonlu duvar kağıdı yükleniyor…"</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"İptal"</string>
</resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index d64aff8..92c653c 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -25,9 +25,8 @@
<string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Перегл. анімов. фон. мал."</string>
<string name="configure_wallpaper" msgid="7396598925806288258">"Налаштування"</string>
<string name="wallpaper_instructions" msgid="4215640646180727542">"Зробити фоном"</string>
- <string name="live_wallpaper_empty" msgid="4278728108785853407">"Нема анім. фон. мал."</string>
+ <string name="live_wallpaper_empty" msgid="4278728108785853407">"Немає анімов. малюнка"</string>
<string name="set_live_wallpaper" msgid="2381437614949033266">"Зробити фоном"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> автор <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Завантаження…"</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"Скасувати"</string>
</resources>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index 83abc72..8954622 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"وال پیپر سیٹ کریں"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> بذریعہ <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"لائیو وال پیپر لوڈ ہو رہا ہے…"</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"منسوخ کریں"</string>
</resources>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index d845192..f17cc26 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -24,10 +24,9 @@
<string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Jonli fon rasmlari"</string>
<string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Jonli fon rasmlarini oldindan ko‘rish"</string>
<string name="configure_wallpaper" msgid="7396598925806288258">"Sozlamalar"</string>
- <string name="wallpaper_instructions" msgid="4215640646180727542">"Fon rasmini o‘rnatish"</string>
+ <string name="wallpaper_instructions" msgid="4215640646180727542">"Fonga rasm o‘rnatish"</string>
<string name="live_wallpaper_empty" msgid="4278728108785853407">"Jonli fon rasmlari yo‘q."</string>
- <string name="set_live_wallpaper" msgid="2381437614949033266">"Fon rasmini o‘rnatish"</string>
+ <string name="set_live_wallpaper" msgid="2381437614949033266">"Fonga rasm o‘rnatish"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> ga <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Jonli fon rasmlari yuklanmoqda…"</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"Bekor qilish"</string>
</resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index d3f3673..e13f75f 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"Đặt hình nền"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> bởi <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Đang tải hình nền động..."</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"Hủy"</string>
</resources>
diff --git a/res/values-xlarge/dimensions.xml b/res/values-xlarge/dimensions.xml
index b60f099..14edc8e 100644
--- a/res/values-xlarge/dimensions.xml
+++ b/res/values-xlarge/dimensions.xml
@@ -18,7 +18,5 @@
-->
<resources>
- <dimen name="live_wallpaper_grid_item_width">224dip</dimen>
- <dimen name="live_wallpaper_grid_item_height">192dip</dimen>
- <dimen name="live_wallpaper_preview_button_width">200dip</dimen>
+ <dimen name="screen_margin_sides">128dip</dimen>
</resources>
diff --git a/res/values-xlarge/styles.xml b/res/values-xlarge/styles.xml
deleted file mode 100644
index c7e0e33..0000000
--- a/res/values-xlarge/styles.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-* Copyright (C) 2010 The Android Open Source Project
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
--->
-
-<resources>
- <style name="LivePickerTheme" parent="@*android:Theme.Holo.Dialog.NoFrame" />
-</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 5e8b5b3..f69e107 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"设置壁纸"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g>提供者:<xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"正在加载动态壁纸…"</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"取消"</string>
</resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index ca55e74..da4c6e4 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"設定桌布"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g>,作者:<xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"正在載入即時桌布…"</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"取消"</string>
</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index fd33730..ef0d22c 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"設定桌布"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> 製作者:<xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"正在載入動態桌布…"</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"取消"</string>
</resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index b44a273..39f8119 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -29,5 +29,4 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"Setha iphephadonga"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g>ngu-<xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Ilayisha iphephadonga elibukhoma..."</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"Khansela"</string>
</resources>
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index 89074de..d08e573 100644
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -22,6 +22,7 @@
<dimen name="live_wallpaper_thumbnail_text_offset">12dip</dimen>
<dimen name="live_wallpaper_thumbnail_width">75dip</dimen>
<dimen name="live_wallpaper_thumbnail_height">75dip</dimen>
- <dimen name="dialog_content_inset">0dip</dimen>
- <dimen name="live_wallpaper_preview_button_width">160dip</dimen>
+
+ <dimen name="screen_margin_sides">0dip</dimen>
+
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7af69c7..9c508de 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -41,7 +41,5 @@
<string name="wallpaper_title_and_author"><xliff:g id="title" example="Galaxy">%1$s</xliff:g> by <xliff:g id="author" example="Google">%2$s</xliff:g></string>
<!-- Message, tells the user the selected live wallpaper is loading. -->
<string name="live_wallpaper_loading">Loading live wallpaper…</string>
- <!-- Button label, action, cancels the wallpaper picker dialog [CHAR_LIMIT=40]-->
- <string name="wallpaper_cancel">Cancel</string>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 8684f16..01747e7 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -18,24 +18,31 @@
-->
<resources>
- <style name="WallpaperTitle">
- <item name="android:textSize">20dip</item>
- <item name="android:shadowColor">#FF000000</item>
- <item name="android:shadowRadius">2.5</item>
- <item name="android:shadowDx">0</item>
- <item name="android:shadowDy">0</item>
- <item name="android:textColor">#FFFFFFFF</item>
- <item name="android:gravity">left</item>
- </style>
-
- <style name="Preview" parent="android:Theme.Holo">
- <item name="android:windowNoTitle">true</item>
+
+ <style name="LivePickerTheme" parent="@android:style/Theme.DeviceDefault.Settings" />
+
+ <style name="Preview" parent="@android:style/Theme.DeviceDefault">
+ <item name="android:actionBarStyle">@style/PreviewActionBar</item>
+ <item name="android:windowAnimationStyle">@android:style/Animation.Activity</item>
+ <item name="android:windowFullscreen">true</item>
+ <item name="android:windowActionBarOverlay">true</item>
+ <item name="android:windowTranslucentNavigation">true</item>
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:colorBackgroundCacheHint">@null</item>
- <item name="android:windowAnimationStyle">@android:style/Animation.Activity</item>
</style>
- <style name="LivePickerTheme" parent="android:style/Theme.Holo">
- <item name="android:windowNoTitle">true</item>
+ <style name="PreviewActionBar" parent="@android:style/Widget.DeviceDefault.ActionBar">
+ <item name="android:displayOptions">showCustom</item>
+ <item name="android:background">#88000000</item>
+ <item name="android:contentInsetEnd">0dp</item>
+ <item name="android:contentInsetLeft">0dp</item>
+ <item name="android:contentInsetRight">0dp</item>
+ <item name="android:contentInsetStart">0dp</item>
+ </style>
+
+ <style name="ActionBarSetWallpaperStyle" parent="@android:style/Widget.DeviceDefault.ActionButton">
+ <item name="android:textColor">#ffffffff</item>
+ <item name="android:background">?android:attr/selectableItemBackgroundBorderless</item>
</style>
-</resources>
+
+</resources> \ No newline at end of file
diff --git a/src/com/android/wallpaper/livepicker/LiveWallpaperActivity.java b/src/com/android/wallpaper/livepicker/LiveWallpaperActivity.java
index d8de4e1..9dd29c4 100644
--- a/src/com/android/wallpaper/livepicker/LiveWallpaperActivity.java
+++ b/src/com/android/wallpaper/livepicker/LiveWallpaperActivity.java
@@ -16,39 +16,25 @@
package com.android.wallpaper.livepicker;
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.app.DialogFragment;
-import android.app.Fragment;
+import android.app.ListActivity;
import android.app.WallpaperInfo;
-import android.os.Bundle;
-import android.content.DialogInterface;
import android.content.Intent;
-import android.util.Log;
-import android.view.LayoutInflater;
+import android.os.Bundle;
import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.BaseAdapter;
+import android.widget.ListView;
-public class LiveWallpaperActivity extends Activity {
- private static final String LOG_TAG = "LiveWallpapersPicker";
+public class LiveWallpaperActivity extends ListActivity {
private static final int REQUEST_PREVIEW = 100;
+ private LiveWallpaperListAdapter mAdapter;
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.live_wallpaper_base);
- Fragment fragmentView = getFragmentManager().findFragmentById(R.id.live_wallpaper_fragment);
- if (fragmentView == null) {
- /* When the screen is XLarge, the fragment is not included in the layout, so show it
- * as a dialog
- */
- DialogFragment fragment = WallpaperDialog.newInstance();
- fragment.show(getFragmentManager(), "dialog");
- }
+ mAdapter = new LiveWallpaperListAdapter(this);
+ setListAdapter(mAdapter);
}
@Override
@@ -60,91 +46,16 @@ public class LiveWallpaperActivity extends Activity {
}
}
- public static class WallpaperDialog extends DialogFragment implements
- AdapterView.OnItemClickListener{
- private static final String EMBEDDED_KEY = "com.android.wallpaper.livepicker."
- + "LiveWallpaperActivity$WallpaperDialog.EMBEDDED_KEY";
- private LiveWallpaperListAdapter mAdapter;
- private boolean mEmbedded;
-
- public static WallpaperDialog newInstance() {
- WallpaperDialog dialog = new WallpaperDialog();
- dialog.setCancelable(true);
- return dialog;
- }
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- if (savedInstanceState != null && savedInstanceState.containsKey(EMBEDDED_KEY)) {
- mEmbedded = savedInstanceState.getBoolean(EMBEDDED_KEY);
- } else {
- mEmbedded = isInLayout();
- }
- }
-
- @Override
- public void onSaveInstanceState(Bundle outState) {
- outState.putBoolean(EMBEDDED_KEY, mEmbedded);
- }
-
- @Override
- public void onDismiss(DialogInterface dialog) {
- /* On orientation changes, the dialog is effectively "dismissed" so this is called
- * when the activity is no longer associated with this dying dialog fragment. We
- * should just safely ignore this case by checking if getActivity() returns null
- */
- Activity activity = getActivity();
- if (activity != null) {
- activity.finish();
- }
- }
-
- @Override
- public Dialog onCreateDialog(Bundle savedInstanceState) {
- final int contentInset = getResources().getDimensionPixelSize(
- R.dimen.dialog_content_inset);
- View view = generateView(getActivity().getLayoutInflater(), null);
-
- AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
- builder.setNegativeButton(R.string.wallpaper_cancel, null);
- builder.setTitle(R.string.live_wallpaper_picker_title);
- builder.setView(view, contentInset, contentInset, contentInset, contentInset);
- return builder.create();
- }
-
- @Override
- public View onCreateView(LayoutInflater inflater, ViewGroup container,
- Bundle savedInstanceState) {
- /* If this fragment is embedded in the layout of this activity, then we should
- * generate a view to display. Otherwise, a dialog will be created in
- * onCreateDialog()
- */
- if (mEmbedded) {
- return generateView(inflater, container);
- }
- return null;
- }
-
- @SuppressWarnings("unchecked")
- private View generateView(LayoutInflater inflater, ViewGroup container) {
- View layout = inflater.inflate(R.layout.live_wallpaper_list, container, false);
-
- mAdapter = new LiveWallpaperListAdapter(getActivity());
- AdapterView<BaseAdapter> adapterView =
- (AdapterView<BaseAdapter>) layout.findViewById(android.R.id.list);
- adapterView.setAdapter(mAdapter);
- adapterView.setOnItemClickListener(this);
- adapterView.setEmptyView(layout.findViewById(android.R.id.empty));
- return layout;
- }
-
- public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
- LiveWallpaperListAdapter.LiveWallpaperInfo wallpaperInfo =
- (LiveWallpaperListAdapter.LiveWallpaperInfo) mAdapter.getItem(position);
- final Intent intent = wallpaperInfo.intent;
- final WallpaperInfo info = wallpaperInfo.info;
- LiveWallpaperPreview.showPreview(getActivity(), REQUEST_PREVIEW, intent, info);
+ @Override
+ protected void onListItemClick(ListView l, View v, int position, long id) {
+ LiveWallpaperListAdapter.LiveWallpaperInfo wallpaperInfo =
+ (LiveWallpaperListAdapter.LiveWallpaperInfo) mAdapter.getItem(position);
+ final WallpaperInfo info = wallpaperInfo.info;
+ if (info != null) {
+ Intent preview = new Intent(this, LiveWallpaperPreview.class);
+ preview.putExtra(LiveWallpaperPreview.EXTRA_LIVE_WALLPAPER_INFO, info);
+ startActivityForResult(preview, REQUEST_PREVIEW);
}
}
+
}
diff --git a/src/com/android/wallpaper/livepicker/LiveWallpaperChange.java b/src/com/android/wallpaper/livepicker/LiveWallpaperChange.java
index 586bdb0..efaf563 100644
--- a/src/com/android/wallpaper/livepicker/LiveWallpaperChange.java
+++ b/src/com/android/wallpaper/livepicker/LiveWallpaperChange.java
@@ -16,32 +16,26 @@
package com.android.wallpaper.livepicker;
-import java.io.IOException;
-import java.util.List;
-
-import org.xmlpull.v1.XmlPullParserException;
-
-import android.app.Activity;
import android.app.WallpaperInfo;
import android.app.WallpaperManager;
-import android.os.Bundle;
-import android.os.Parcelable;
import android.content.ComponentName;
import android.content.Intent;
import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.ResolveInfo;
-import android.content.pm.ServiceInfo;
+import android.os.Parcelable;
import android.service.wallpaper.WallpaperService;
import android.util.Log;
-public class LiveWallpaperChange extends Activity {
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.io.IOException;
+import java.util.List;
+
+public class LiveWallpaperChange extends LiveWallpaperPreview {
private static final String TAG = "CHANGE_LIVE_WALLPAPER";
@Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
+ protected void init() {
Parcelable obj = getIntent().getParcelableExtra(
WallpaperManager.EXTRA_LIVE_WALLPAPER_COMPONENT);
if (obj == null || !(obj instanceof ComponentName)) {
@@ -63,21 +57,16 @@ public class LiveWallpaperChange extends Activity {
for (int i=0; i<list.size(); i++) {
ResolveInfo ri = list.get(i);
if (ri.serviceInfo.name.equals(comp.getClassName())) {
- WallpaperInfo info = null;
+ WallpaperInfo info;
try {
info = new WallpaperInfo(this, ri);
- } catch (XmlPullParserException e) {
- Log.w(TAG, "Bad wallpaper " + ri.serviceInfo, e);
- finish();
- return;
- } catch (IOException e) {
+ } catch (XmlPullParserException|IOException e) {
Log.w(TAG, "Bad wallpaper " + ri.serviceInfo, e);
finish();
return;
}
- Intent intent = new Intent(WallpaperService.SERVICE_INTERFACE);
- intent.setClassName(info.getPackageName(), info.getServiceName());
- LiveWallpaperPreview.showPreview(this, 0, intent, info);
+
+ initUI(info);
return;
}
}
@@ -86,13 +75,4 @@ public class LiveWallpaperChange extends Activity {
Log.w(TAG, "Not a live wallpaper: " + comp);
finish();
}
-
- @Override
- protected void onActivityResult(int requestCode, int resultCode, Intent data) {
- super.onActivityResult(requestCode, resultCode, data);
-
- // forward result code
- setResult(resultCode);
- finish();
- }
}
diff --git a/src/com/android/wallpaper/livepicker/LiveWallpaperListAdapter.java b/src/com/android/wallpaper/livepicker/LiveWallpaperListAdapter.java
index e526f9e..b245fb6 100644
--- a/src/com/android/wallpaper/livepicker/LiveWallpaperListAdapter.java
+++ b/src/com/android/wallpaper/livepicker/LiveWallpaperListAdapter.java
@@ -127,7 +127,6 @@ public class LiveWallpaperListAdapter extends BaseAdapter implements ListAdapter
public class LiveWallpaperInfo {
public Drawable thumbnail;
public WallpaperInfo info;
- public Intent intent;
}
private class ViewHolder {
@@ -185,8 +184,6 @@ public class LiveWallpaperListAdapter extends BaseAdapter implements ListAdapter
}
LiveWallpaperInfo wallpaper = new LiveWallpaperInfo();
- wallpaper.intent = new Intent(WallpaperService.SERVICE_INTERFACE);
- wallpaper.intent.setClassName(info.getPackageName(), info.getServiceName());
wallpaper.info = info;
Drawable thumb = info.loadThumbnail(packageManager);
diff --git a/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java b/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java
index 72ba27a..2f32e36 100644
--- a/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java
+++ b/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java
@@ -16,6 +16,7 @@
package com.android.wallpaper.livepicker;
+import android.app.ActionBar;
import android.app.Activity;
import android.app.WallpaperManager;
import android.app.WallpaperInfo;
@@ -33,6 +34,9 @@ import android.os.RemoteException;
import android.os.IBinder;
import android.os.ParcelFileDescriptor;
import android.os.Bundle;
+import android.service.wallpaper.WallpaperService;
+import android.view.Menu;
+import android.view.MenuItem;
import android.view.MotionEvent;
import android.view.View;
import android.view.WindowManager;
@@ -43,9 +47,7 @@ import android.util.Log;
import android.widget.TextView;
public class LiveWallpaperPreview extends Activity {
- static final String EXTRA_LIVE_WALLPAPER_INTENT = "android.live_wallpaper.intent";
- static final String EXTRA_LIVE_WALLPAPER_SETTINGS = "android.live_wallpaper.settings";
- static final String EXTRA_LIVE_WALLPAPER_PACKAGE = "android.live_wallpaper.package";
+ static final String EXTRA_LIVE_WALLPAPER_INFO = "android.live_wallpaper.info";
private static final String LOG_TAG = "LiveWallpaperPreview";
@@ -55,46 +57,49 @@ public class LiveWallpaperPreview extends Activity {
private String mSettings;
private String mPackageName;
private Intent mWallpaperIntent;
+
private View mView;
private Dialog mDialog;
- static void showPreview(Activity activity, int code, Intent intent, WallpaperInfo info) {
- if (info == null) {
- Log.w(LOG_TAG, "Failure showing preview", new Throwable());
- return;
- }
- Intent preview = new Intent(activity, LiveWallpaperPreview.class);
- preview.putExtra(EXTRA_LIVE_WALLPAPER_INTENT, intent);
- preview.putExtra(EXTRA_LIVE_WALLPAPER_SETTINGS, info.getSettingsActivity());
- preview.putExtra(EXTRA_LIVE_WALLPAPER_PACKAGE, info.getPackageName());
- activity.startActivityForResult(preview, code);
- }
-
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ init();
+ }
+ protected void init() {
Bundle extras = getIntent().getExtras();
- mWallpaperIntent = (Intent) extras.get(EXTRA_LIVE_WALLPAPER_INTENT);
- if (mWallpaperIntent == null) {
+ WallpaperInfo info = extras.getParcelable(EXTRA_LIVE_WALLPAPER_INFO);
+ if (info == null) {
setResult(RESULT_CANCELED);
finish();
}
- setContentView(R.layout.live_wallpaper_preview);
- mView = findViewById(R.id.configure);
+ initUI(info);
+ }
- mSettings = extras.getString(EXTRA_LIVE_WALLPAPER_SETTINGS);
- mPackageName = extras.getString(EXTRA_LIVE_WALLPAPER_PACKAGE);
- if (mSettings == null) {
- mView.setVisibility(View.GONE);
- }
+ protected void initUI(WallpaperInfo info) {
+ mSettings = info.getSettingsActivity();
+ mPackageName = info.getPackageName();
+ mWallpaperIntent = new Intent(WallpaperService.SERVICE_INTERFACE)
+ .setClassName(info.getPackageName(), info.getServiceName());
- mWallpaperManager = WallpaperManager.getInstance(this);
+ final ActionBar actionBar = getActionBar();
+ actionBar.setCustomView(R.layout.live_wallpaper_preview);
+ mView = actionBar.getCustomView();
+ mWallpaperManager = WallpaperManager.getInstance(this);
mWallpaperConnection = new WallpaperConnection(mWallpaperIntent);
}
+ @Override
+ public boolean onCreateOptionsMenu(Menu menu) {
+ if (mSettings != null) {
+ getMenuInflater().inflate(R.menu.menu_preview, menu);
+ }
+ return super.onCreateOptionsMenu(menu);
+ }
+
public void setLiveWallpaper(View v) {
try {
mWallpaperManager.getIWallpaperManager().setWallpaperComponent(
@@ -110,12 +115,16 @@ public class LiveWallpaperPreview extends Activity {
finish();
}
- @SuppressWarnings({"UnusedDeclaration"})
- public void configureLiveWallpaper(View v) {
- Intent intent = new Intent();
- intent.setComponent(new ComponentName(mPackageName, mSettings));
- intent.putExtra(WallpaperSettingsActivity.EXTRA_PREVIEW_MODE, true);
- startActivity(intent);
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ if (item.getItemId() == R.id.configure) {
+ Intent intent = new Intent();
+ intent.setComponent(new ComponentName(mPackageName, mSettings));
+ intent.putExtra(WallpaperSettingsActivity.EXTRA_PREVIEW_MODE, true);
+ startActivity(intent);
+ return true;
+ }
+ return super.onOptionsItemSelected(item);
}
@Override