summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-12-15 10:03:08 (GMT)
committerLinux Build Service Account <lnxbuild@localhost>2016-12-15 10:03:08 (GMT)
commit78f6237b37c829c54e456f3f782ee564ad15b462 (patch)
tree774c3d1aeaf93f03d9505d74b9d2eead039906ed
parentcf093f3546f841d04b55588bed97c2efdafa5bad (diff)
parentb5ef268cf8119b893c208655a0139a803b6f1c48 (diff)
downloadandroid_packages_wallpapers_LivePicker-78f6237b37c829c54e456f3f782ee564ad15b462.zip
android_packages_wallpapers_LivePicker-78f6237b37c829c54e456f3f782ee564ad15b462.tar.gz
android_packages_wallpapers_LivePicker-78f6237b37c829c54e456f3f782ee564ad15b462.tar.bz2
Merge b5ef268cf8119b893c208655a0139a803b6f1c48 on remote branch
Change-Id: Idb635194062da013f2a544429e896f9e03ece198
-rw-r--r--Android.mk14
-rw-r--r--proguard.flags7
-rw-r--r--res/drawable-sw600dp/ic_device.xml27
-rw-r--r--res/drawable/ic_device.xml27
-rw-r--r--res/drawable/ic_home.xml27
-rw-r--r--res/drawable/ic_keyboard_arrow_down_white_24dp.xml24
-rw-r--r--res/drawable/ic_keyboard_arrow_up_white_24dp.xml24
-rw-r--r--res/layout/live_wallpaper_loading.xml24
-rw-r--r--res/layout/live_wallpaper_preview.xml157
-rw-r--r--res/layout/set_wallpaper_action.xml24
-rw-r--r--res/layout/wallpaper_target_dialog_item.xml29
-rw-r--r--res/menu/menu_preview.xml6
-rw-r--r--res/values-af/strings.xml2
-rw-r--r--res/values-am/strings.xml2
-rw-r--r--res/values-ar/strings.xml2
-rw-r--r--res/values-az-rAZ/strings.xml2
-rw-r--r--res/values-b+sr+Latn/strings.xml2
-rw-r--r--res/values-be-rBY/strings.xml2
-rw-r--r--res/values-bg/strings.xml2
-rw-r--r--res/values-bn-rBD/strings.xml2
-rw-r--r--res/values-bs-rBA/strings.xml14
-rw-r--r--res/values-ca/strings.xml2
-rw-r--r--res/values-cs/strings.xml2
-rw-r--r--res/values-da/strings.xml2
-rw-r--r--res/values-de/strings.xml2
-rw-r--r--res/values-el/strings.xml2
-rw-r--r--res/values-en-rAU/strings.xml2
-rw-r--r--res/values-en-rGB/strings.xml2
-rw-r--r--res/values-en-rIN/strings.xml2
-rw-r--r--res/values-es-rUS/strings.xml2
-rw-r--r--res/values-es/strings.xml2
-rw-r--r--res/values-et-rEE/strings.xml2
-rw-r--r--res/values-eu-rES/strings.xml2
-rw-r--r--res/values-fa/strings.xml2
-rw-r--r--res/values-fi/strings.xml2
-rw-r--r--res/values-fr-rCA/strings.xml4
-rw-r--r--res/values-fr/strings.xml4
-rw-r--r--res/values-gl-rES/strings.xml2
-rw-r--r--res/values-gu-rIN/strings.xml2
-rw-r--r--res/values-hi/strings.xml2
-rw-r--r--res/values-hr/strings.xml2
-rw-r--r--res/values-hu/strings.xml2
-rw-r--r--res/values-hy-rAM/strings.xml2
-rw-r--r--res/values-in/strings.xml2
-rw-r--r--res/values-is-rIS/strings.xml2
-rw-r--r--res/values-it/strings.xml2
-rw-r--r--res/values-iw/strings.xml2
-rw-r--r--res/values-ja/strings.xml2
-rw-r--r--res/values-ka-rGE/strings.xml2
-rw-r--r--res/values-kk-rKZ/strings.xml2
-rw-r--r--res/values-km-rKH/strings.xml2
-rw-r--r--res/values-kn-rIN/strings.xml2
-rw-r--r--res/values-ko/strings.xml2
-rw-r--r--res/values-ky-rKG/strings.xml2
-rw-r--r--res/values-lo-rLA/strings.xml2
-rw-r--r--res/values-lt/strings.xml2
-rw-r--r--res/values-lv/strings.xml2
-rw-r--r--res/values-mk-rMK/strings.xml2
-rw-r--r--res/values-ml-rIN/strings.xml2
-rw-r--r--res/values-mn-rMN/strings.xml2
-rw-r--r--res/values-mr-rIN/strings.xml2
-rw-r--r--res/values-ms-rMY/strings.xml2
-rw-r--r--res/values-my-rMM/strings.xml2
-rw-r--r--res/values-nb/strings.xml2
-rw-r--r--res/values-ne-rNP/strings.xml2
-rw-r--r--res/values-nl/strings.xml2
-rw-r--r--res/values-pa-rIN/strings.xml2
-rw-r--r--res/values-pl/strings.xml2
-rw-r--r--res/values-pt-rPT/strings.xml2
-rw-r--r--res/values-pt/strings.xml2
-rw-r--r--res/values-ro/strings.xml2
-rw-r--r--res/values-ru/strings.xml2
-rw-r--r--res/values-si-rLK/strings.xml2
-rw-r--r--res/values-sk/strings.xml2
-rw-r--r--res/values-sl/strings.xml2
-rw-r--r--res/values-sq-rAL/strings.xml2
-rw-r--r--res/values-sr/strings.xml2
-rw-r--r--res/values-sv/strings.xml2
-rw-r--r--res/values-sw/strings.xml2
-rw-r--r--res/values-sw720dp/dimes.xml27
-rw-r--r--res/values-sw720dp/styles.xml21
-rw-r--r--res/values-ta-rIN/strings.xml2
-rw-r--r--res/values-te-rIN/strings.xml2
-rw-r--r--res/values-th/strings.xml2
-rw-r--r--res/values-tl/strings.xml2
-rw-r--r--res/values-tr/strings.xml2
-rw-r--r--res/values-uk/strings.xml2
-rw-r--r--res/values-ur-rPK/strings.xml2
-rw-r--r--res/values-uz-rUZ/strings.xml2
-rw-r--r--res/values-vi/strings.xml2
-rw-r--r--res/values-zh-rCN/strings.xml2
-rw-r--r--res/values-zh-rHK/strings.xml2
-rw-r--r--res/values-zh-rTW/strings.xml2
-rw-r--r--res/values-zu/strings.xml2
-rw-r--r--res/values/colors.xml2
-rw-r--r--res/values/dimensions.xml15
-rw-r--r--res/values/strings.xml8
-rw-r--r--res/values/styles.xml36
-rw-r--r--src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java286
99 files changed, 827 insertions, 134 deletions
diff --git a/Android.mk b/Android.mk
index 75b3388..2460ff9 100644
--- a/Android.mk
+++ b/Android.mk
@@ -46,4 +46,18 @@ LOCAL_CERTIFICATE := platform
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
+LOCAL_STATIC_JAVA_LIBRARIES := \
+ android-support-v7-appcompat \
+ android-support-v4 \
+ android-support-design
+
+LOCAL_RESOURCE_DIR := \
+ $(LOCAL_PATH)/res \
+ frameworks/support/v7/appcompat/res \
+ frameworks/support/design/res \
+
+LOCAL_AAPT_FLAGS := --auto-add-overlay \
+ --extra-packages android.support.design \
+ --extra-packages android.support.v7.appcompat
+
include $(BUILD_PACKAGE)
diff --git a/proguard.flags b/proguard.flags
index ae1dddc..5320720 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -2,3 +2,10 @@
public void setLiveWallpaper(android.view.View);
public void configureLiveWallpaper(android.view.View);
}
+
+-keepclasseswithmembers class * {
+ public <init>(android.content.Context, android.util.AttributeSet);
+}
+
+-keep class android.support.design.widget.CoordinatorLayout
+-keep class android.support.design.widget.BottomSheetBehavior \ No newline at end of file
diff --git a/res/drawable-sw600dp/ic_device.xml b/res/drawable-sw600dp/ic_device.xml
new file mode 100644
index 0000000..9af391c
--- /dev/null
+++ b/res/drawable-sw600dp/ic_device.xml
@@ -0,0 +1,27 @@
+<!--
+ ~ Copyright (C) 2016 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"
+ android:tint="?android:attr/colorAccent">
+
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M21 4H3c-1.1 0-2 .9-2 2v12c0 1.1.9 2 2 2h18c1.1 0 1.99-.9 1.99-2L23 6c0-1.1-.9-2-2-2zm-2 14H5V6h14v12z" />
+
+</vector>
diff --git a/res/drawable/ic_device.xml b/res/drawable/ic_device.xml
new file mode 100644
index 0000000..82a69cb
--- /dev/null
+++ b/res/drawable/ic_device.xml
@@ -0,0 +1,27 @@
+<!--
+Copyright (C) 2016 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"
+ android:tint="?android:attr/colorAccent">
+
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M17 1.01L7 1c-1.1 0-2 .9-2 2v18c0 1.1.9 2 2 2h10c1.1 0 2-.9 2-2V3c0-1.1-.9-1.99-2-1.99zM17 19H7V5h10v14z" />
+
+</vector>
diff --git a/res/drawable/ic_home.xml b/res/drawable/ic_home.xml
new file mode 100644
index 0000000..5eb2e92
--- /dev/null
+++ b/res/drawable/ic_home.xml
@@ -0,0 +1,27 @@
+<!--
+Copyright (C) 2016 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"
+ android:tint="?android:attr/colorAccent">
+
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M10 20v-6h4v6h5v-8h3L12 3 2 12h3v8z" />
+
+</vector>
diff --git a/res/drawable/ic_keyboard_arrow_down_white_24dp.xml b/res/drawable/ic_keyboard_arrow_down_white_24dp.xml
new file mode 100644
index 0000000..e4c2a23
--- /dev/null
+++ b/res/drawable/ic_keyboard_arrow_down_white_24dp.xml
@@ -0,0 +1,24 @@
+<!--
+ ~ Copyright (C) 2016 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:width="24.0dp"
+ android:height="24.0dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="#FFFFFF"
+ android:pathData="M7.41,7.84L12.0,12.42l4.59,-4.58L18.0,9.25l-6.0,6.0 -6.0,-6.0z"/>
+</vector>
diff --git a/res/drawable/ic_keyboard_arrow_up_white_24dp.xml b/res/drawable/ic_keyboard_arrow_up_white_24dp.xml
new file mode 100644
index 0000000..d7b3e13
--- /dev/null
+++ b/res/drawable/ic_keyboard_arrow_up_white_24dp.xml
@@ -0,0 +1,24 @@
+<!--
+ ~ Copyright (C) 2016 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:width="24.0dp"
+ android:height="24.0dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="#FFFFFF"
+ android:pathData="M7.41,15.41L12.0,10.83l4.59,4.58L18.0,14.0l-6.0,-6.0 -6.0,6.0z"/>
+</vector>
diff --git a/res/layout/live_wallpaper_loading.xml b/res/layout/live_wallpaper_loading.xml
deleted file mode 100644
index dff8b86..0000000
--- a/res/layout/live_wallpaper_loading.xml
+++ /dev/null
@@ -1,24 +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.
--->
-
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
-
- android:gravity="center"
-
- android:text="@string/live_wallpaper_loading"
- android:textAppearance="?android:attr/textAppearanceMedium" />
diff --git a/res/layout/live_wallpaper_preview.xml b/res/layout/live_wallpaper_preview.xml
index 6dcb644..fb8ab5c 100644
--- a/res/layout/live_wallpaper_preview.xml
+++ b/res/layout/live_wallpaper_preview.xml
@@ -1,25 +1,136 @@
-<?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.
--->
-<Button xmlns:android="http://schemas.android.com/apk/res/android"
- style="@style/ActionBarSetWallpaperStyle"
+ ~ Copyright (C) 2016 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"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
- 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" />
+ android:layout_height="match_parent">
+
+ <FrameLayout
+ android:id="@+id/loading"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="#ff000000"
+ android:forceHasOverlappingRendering="false">
+
+ <ProgressBar
+ style="@android:style/Widget.Material.ProgressBar"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:indeterminate="true"/>
+
+ </FrameLayout>
+
+ <FrameLayout android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:fitsSystemWindows="true">
+
+ <android.support.design.widget.CoordinatorLayout
+ android:id="@+id/coordinator_layout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom">
+
+ <RelativeLayout android:id="@+id/bottom_sheet"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom"
+ android:minHeight="@dimen/preview_attribution_pane_expanded_height"
+ android:orientation="vertical"
+ android:background="@color/translucent_black"
+ app:behavior_peekHeight="@dimen/preview_attribution_pane_collapsed_height"
+ app:layout_behavior="android.support.design.widget.BottomSheetBehavior">
+
+ <ImageButton android:id="@+id/preview_attribution_pane_arrow"
+ android:contentDescription="@string/expand_attribution_panel"
+ android:layout_width="48dp"
+ android:layout_height="48dp"
+ android:layout_alignParentEnd="true"
+ android:focusable="true"
+ android:clickable="true"
+ android:src="@drawable/ic_keyboard_arrow_up_white_24dp"
+ style="?android:attr/borderlessButtonStyle"/>
+
+ <TextView
+ android:id="@+id/preview_attribution_pane_title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="start"
+ android:layout_marginStart="@dimen/preview_attribution_pane_content_side_margin"
+ android:layout_marginEnd="@dimen/preview_attribution_pane_content_side_margin"
+ android:layout_marginTop="@dimen/preview_attribution_pane_title_top_margin"
+ android:layout_toStartOf="@id/preview_attribution_pane_arrow"
+ android:ellipsize="end"
+ android:textAppearance="@style/AttributionPaneTitle"
+ android:forceHasOverlappingRendering="false"/>
+
+ <TextView android:id="@+id/preview_attribution_pane_subtitle1"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="@dimen/preview_attribution_pane_content_side_margin"
+ android:layout_marginEnd="@dimen/preview_attribution_pane_content_side_margin"
+ android:layout_marginTop="@dimen/preview_attribution_pane_subtitle1_top_margin"
+ android:layout_below="@id/preview_attribution_pane_title"
+ android:layout_toStartOf="@id/preview_attribution_pane_arrow"
+ android:textAppearance="@android:style/TextAppearance.Material.Body1"
+ android:forceHasOverlappingRendering="false"/>
+
+ <TextView android:id="@+id/preview_attribution_pane_subtitle2"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textSize="@dimen/abc_text_size_caption_material"
+ android:layout_marginStart="@dimen/preview_attribution_pane_content_side_margin"
+ android:layout_marginEnd="@dimen/preview_attribution_pane_content_side_margin"
+ android:layout_marginTop="@dimen/preview_attribution_pane_subtitle2_top_margin"
+ android:layout_below="@id/preview_attribution_pane_subtitle1"
+ android:layout_toStartOf="@id/preview_attribution_pane_arrow"
+ android:textAppearance="@android:style/TextAppearance.Material.Caption"
+ android:forceHasOverlappingRendering="false"/>
+
+ <Button android:id="@+id/preview_attribution_pane_explore_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="?android:attr/colorAccent"
+ android:layout_marginLeft="@dimen/preview_attribution_pane_explore_left_margin"
+ android:layout_marginStart="@dimen/preview_attribution_pane_explore_left_margin"
+ android:layout_marginTop="@dimen/preview_attribution_pane_explore_top_margin"
+ android:layout_marginBottom="@dimen/preview_attribution_pane_explore_bottom_margin"
+ android:layout_below="@id/preview_attribution_pane_subtitle2"
+ android:layout_gravity="center_vertical"
+ style="?android:attr/borderlessButtonStyle"
+ android:forceHasOverlappingRendering="false"/>
+
+ <View android:id="@id/spacer"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/preview_attribution_pane_spacer_height"
+ android:layout_below="@id/preview_attribution_pane_subtitle2"
+ android:visibility="gone"/>
+
+ </RelativeLayout>
+
+ </android.support.design.widget.CoordinatorLayout>
+
+ <android.widget.Toolbar android:id="@+id/toolbar"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="top"
+ android:paddingStart="@dimen/preview_toolbar_up_button_padding"
+ android:paddingEnd="@dimen/preview_toolbar_set_wallpaper_button_end_padding"
+ style="@style/TranslucentToolbarStyle"/>
+
+ </FrameLayout>
+</FrameLayout>
diff --git a/res/layout/set_wallpaper_action.xml b/res/layout/set_wallpaper_action.xml
new file mode 100644
index 0000000..02f4fcd
--- /dev/null
+++ b/res/layout/set_wallpaper_action.xml
@@ -0,0 +1,24 @@
+<!--
+ ~ Copyright (C) 2016 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
+ -->
+
+<Button
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ style="?android:attr/actionButtonStyle"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:text="@string/set_live_wallpaper"
+ android:textAppearance="?android:attr/actionMenuTextAppearance"
+ android:background="?android:attr/selectableItemBackgroundBorderless"/> \ No newline at end of file
diff --git a/res/layout/wallpaper_target_dialog_item.xml b/res/layout/wallpaper_target_dialog_item.xml
new file mode 100644
index 0000000..70d399f
--- /dev/null
+++ b/res/layout/wallpaper_target_dialog_item.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2016 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
+ -->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@android:id/text1"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:minHeight="?android:attr/listPreferredItemHeightSmall"
+ android:textAppearance="?android:attr/textAppearanceListItemSmall"
+ android:textColor="?android:attr/textColorAlertDialogListItem"
+ android:gravity="center_vertical"
+ android:alpha="0.87"
+ android:paddingStart="?android:attr/dialogPreferredPadding"
+ android:drawablePadding="32dp"
+ android:paddingEnd="?android:attr/dialogPreferredPadding"
+ android:ellipsize="marquee" /> \ No newline at end of file
diff --git a/res/menu/menu_preview.xml b/res/menu/menu_preview.xml
index 26adc2d..471e506 100644
--- a/res/menu/menu_preview.xml
+++ b/res/menu/menu_preview.xml
@@ -22,4 +22,10 @@
android:showAsAction="ifRoom"
android:title="@string/configure_wallpaper"/>
+ <item
+ android:id="@+id/set_wallpaper"
+ android:title="@string/set_live_wallpaper"
+ android:showAsAction="always|withText"
+ android:actionLayout="@layout/set_wallpaper_action"/>
+
</menu>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 4317746..e514f4d 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Laai tans aktiewe muurpapier…"</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Tuisskerm"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Tuisskerm en sluitskerm"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Vou muurpapierinligtingpaneel in"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Vou muurpapierinligtingpaneel uit"</string>
</resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 3b033be..c434c58 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"ቀጥታ የሚተላለፍ ልጣፍ በመስቀል ላይ..."</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"መነሻ ገጽ"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"መነሻ ገጽ እና ማያ ገጽ ቁልፍ"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"የልጣፍ መረጃ ፓነልን ሰብስብ"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"የልጣፍ መረጃ ፓነልን ዘርጋ"</string>
</resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 6ee80e2..b58a18b 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"جارٍ تحميل الخلفية المتحركة..."</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"الشاشة الرئيسية"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"الشاشة الرئيسية وشاشة التأمين"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"تصغير لوحة معلومات الخلفية"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"توسيع لوحة معلومات الخلفية"</string>
</resources>
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
index f5eb57c..f7ffba0 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Canlı divar kağızı yüklənir..."</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Əsas ekran"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Əsas ekran və kilid ekranı"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Divar kağızı məlumat panelini yiğcamlaşdırın"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Divar kağızı məlumat panelini genişləndirin"</string>
</resources>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 5b048e2..8711a4d 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Učitavanje animirane pozadine…"</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Početni ekran"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Početni ekran i zaključani ekran"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Skuplja tablu sa informacijama o pozadini"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Proširuje tablu sa informacijama o pozadini"</string>
</resources>
diff --git a/res/values-be-rBY/strings.xml b/res/values-be-rBY/strings.xml
index 553ef51..b92ac9a 100644
--- a/res/values-be-rBY/strings.xml
+++ b/res/values-be-rBY/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Загрузка жывых шпалер..."</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Галоўны экран"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Галоўны экран і экран блакіроўкі"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Згарнуць панэль інфармацыі пра шпалеры"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Разгарнуць панэль інфармацыі пра шпалеры"</string>
</resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index a9f9fc9..732f566 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Динамичният тапет се зарежда..."</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Начален екран"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Начален и заключен екран"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Свиване на панела с информация за тапета"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Разгъване на панела с информация за тапета"</string>
</resources>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index 5aa7301..8a741ec 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"লাইভ ওয়ালপেপার লোড হচ্ছে..."</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"হোম স্ক্রীন"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"হোম স্ক্রীন ও লক স্ক্রীন"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"ওয়ালপেপার তথ্যের প্যানেলকে সংকুচিত করুন"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"ওয়ালপেপার তথ্যের প্যানেলকে প্রসারিত করুন"</string>
</resources>
diff --git a/res/values-bs-rBA/strings.xml b/res/values-bs-rBA/strings.xml
index 6199ede..b3595e5 100644
--- a/res/values-bs-rBA/strings.xml
+++ b/res/values-bs-rBA/strings.xml
@@ -19,16 +19,18 @@
<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 aktivnih pozadina"</string>
- <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Odaberite aktivnu pozadinu"</string>
+ <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">"Aktivne pozadine"</string>
- <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Pregled aktivne pozadine"</string>
+ <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Pregled animirane pozadinske slike"</string>
<string name="configure_wallpaper" msgid="7396598925806288258">"Postavke..."</string>
- <string name="wallpaper_instructions" msgid="4215640646180727542">"Postavi pozadinu"</string>
+ <string name="wallpaper_instructions" msgid="4215640646180727542">"Postavi pozadinsku sliku"</string>
<string name="live_wallpaper_empty" msgid="4278728108785853407">"Nema aktivnih pozadina."</string>
- <string name="set_live_wallpaper" msgid="2381437614949033266">"Postavi pozadinu"</string>
+ <string name="set_live_wallpaper" msgid="2381437614949033266">"Postavi pozadinsku sliku"</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">"Učitava se aktivna pozadina..."</string>
+ <string name="live_wallpaper_loading" msgid="2488371303130330734">"Učitavanje animirane pozadinske slike..."</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Početni ekran"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Početni ekran i zaključavanje ekrana"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Skloni podatke o pozadinskoj slici"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Prikaži podatke o pozadinskoj slici"</string>
</resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 77b4056..c133eb9 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"S\'està carregant el fons de pantalla animat..."</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Pantalla d\'inici"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Pantalla d\'inici i pantalla de bloqueig"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Replega el tauler d\'informació sobre el fons de pantalla"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Desplega el tauler d\'informació sobre el fons de pantalla"</string>
</resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 19625e7..93db124 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Načítání živé tapety…"</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Plocha"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Plocha a obrazovka uzamčení"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Sbalit informační panel tapety"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Rozbalit informační panel tapety"</string>
</resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index a94dee8..9abd4ab 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Indlæser animeret baggrund..."</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Startskærm"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Startskærm og låseskærm"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Skjul panelet med oplysninger om baggrunden"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Udvid panelet med oplysninger om baggrunden"</string>
</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 5e42c0d..b3cdd39 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Live-Hintergrund wird geladen…"</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Startbildschirm"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Start- und Sperrbildschirm"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Infofeld für Hintergrund minimieren"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Infofeld für Hintergrund maximieren"</string>
</resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index cba7e2a..9dc479c 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Φόρτωση ζωντανής ταπετσαρίας…"</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Αρχική οθόνη"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Αρχική οθόνη και κλείδωμα οθόνης"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Σύμπτυξη πλαισίου πληροφοριών ταπετσαρίας"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Ανάπτυξη πλαισίου πληροφοριών ταπετσαρίας"</string>
</resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index a13bd63..7260950 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Loading live wallpaper…"</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Home screen"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Home screen and lock screen"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Collapse wallpaper info panel"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Expand wallpaper info panel"</string>
</resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index a13bd63..7260950 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Loading live wallpaper…"</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Home screen"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Home screen and lock screen"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Collapse wallpaper info panel"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Expand wallpaper info panel"</string>
</resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index a13bd63..7260950 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Loading live wallpaper…"</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Home screen"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Home screen and lock screen"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Collapse wallpaper info panel"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Expand wallpaper info panel"</string>
</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 4b59c0f..bc3bfb2 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Cargando fondo de pantalla animado…"</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Pantalla principal"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Pantalla principal y pantalla bloqueada"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Contraer panel de información del fondo de pantalla"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Expandir panel de información del fondo de pantalla"</string>
</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index b505325..ec6270a 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Cargando fondo de pantalla animado…"</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Pantalla de inicio"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Pantalla de inicio y de bloqueo"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Ocultar el panel de información del fondo de pantalla"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Mostrar el panel de información del fondo de pantalla"</string>
</resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 14f0a8d..cf3ab85 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Liikuva taustapildi laadimine ..."</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Avaekraan"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Avaekraan ja lukustuskuva"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Taustapildi teabepaneeli ahendamine"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Taustapildi teabepaneeli laiendamine"</string>
</resources>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index a088a74..1302b2d 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Horma-paper dinamikoa kargatzen…"</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Hasierako pantaila"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Hasierako pantaila eta pantaila blokeatua"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Tolestu horma-paperari buruzko informazioaren panela"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Zabaldu horma-paperari buruzko informazioaren panela"</string>
</resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 4d61b31..d8bb54e 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"در حال بارگیری کاغذدیواری زنده..."</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"صفحه اصلی"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"صفحه اصلی و قفل صفحه"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"کوچک کردن پانل اطلاعات کاغذ‌دیواری"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"بزرگ کردن پانل اطلاعات کاغذ‌دیواری"</string>
</resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index e00edc4..dd5f663 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Ladataan live-taustakuvaa…"</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Aloitusnäyttö"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Aloitusnäyttö ja lukitusnäyttö"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Tiivistä taustakuvan tietopaneeli"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Laajenna taustakuvan tietopaneeli"</string>
</resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index ba4566d..ebafd1d 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -25,10 +25,12 @@
<string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Aperçu du fond d\'écran animé"</string>
<string name="configure_wallpaper" msgid="7396598925806288258">"Paramètres…"</string>
<string name="wallpaper_instructions" msgid="4215640646180727542">"Sélectionner"</string>
- <string name="live_wallpaper_empty" msgid="4278728108785853407">"Aucun fond d\'écran animé"</string>
+ <string name="live_wallpaper_empty" msgid="4278728108785853407">"Aucun fond d\'écran animé."</string>
<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="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Écran d\'accueil"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Écran d\'accueil et écran de verrouillage"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Réduire le panneau d\'information du fond d\'écran"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Développer le panneau d\'information du fond d\'écran"</string>
</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index f4b8aef..ebafd1d 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -25,10 +25,12 @@
<string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Aperçu du fond d\'écran animé"</string>
<string name="configure_wallpaper" msgid="7396598925806288258">"Paramètres…"</string>
<string name="wallpaper_instructions" msgid="4215640646180727542">"Sélectionner"</string>
- <string name="live_wallpaper_empty" msgid="4278728108785853407">"Sans fond d\'écran animé"</string>
+ <string name="live_wallpaper_empty" msgid="4278728108785853407">"Aucun fond d\'écran animé."</string>
<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="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Écran d\'accueil"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Écran d\'accueil et écran de verrouillage"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Réduire le panneau d\'information du fond d\'écran"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Développer le panneau d\'information du fond d\'écran"</string>
</resources>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index 7ed3388..5a3eb67 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Cargando fondo de pantalla animado…"</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Pantalla de inicio"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Pantalla de inicio e pantalla de bloqueo"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Contrae o panel de información do fondo de pantalla"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Desprega o panel de información do fondo de pantalla"</string>
</resources>
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml
index 702b2cb..a42c0a7 100644
--- a/res/values-gu-rIN/strings.xml
+++ b/res/values-gu-rIN/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"લાઇવ વૉલપેપર લોડ કરી રહ્યું છે…"</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"હોમ સ્ક્રીન"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"હોમ સ્ક્રીન અને લૉક સ્ક્રીન"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"વૉલપેપર માહિતી પૅનલ સંકુચિત કરો"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"વૉલપેપર માહિતી પૅનલ વિસ્તૃત કરો"</string>
</resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 694cd50..1a8628b 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"एनीमेशन वाला वॉलपेपर लोड हो रहा है…"</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"होम स्क्रीन"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"होम स्क्रीन और लॉक स्क्रीन"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"वॉलपेपर जानकारी फलक संक्षिप्त करें"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"वॉलपेपर जानकारी फलक विस्तृत करें"</string>
</resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 5ac1c21..218b920 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Učitavanje animirane pozadine…"</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Početni zaslon"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Početni zaslon i zaključan zaslon"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Sažmi ploču s podacima o pozadini"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Proširi ploču s podacima o pozadini"</string>
</resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index d3c2424..fb510f4 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Élő háttérkép betöltése..."</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Kezdőképernyő"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Kezdőképernyő és lezárási képernyő"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Háttérkép információs panelének összecsukása"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Háttérkép információs panelének kibontása"</string>
</resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 52618ec..7743dbd 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Բեռնվում է կենդանի պաստառը..."</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Հիմնական էկրան"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Հիմնական էկրան և կողպէկրան"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Կոծկել պաստառի տվյալների վահանակը"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Ընդարձակել պաստառի տվյալների վահանակը"</string>
</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 896e956..8a10002 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Memuat wallpaper animasi…"</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Layar utama"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Layar utama dan layar kunci"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Ciutkan panel info wallpaper"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Luaskan panel info wallpaper"</string>
</resources>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index 6fb3aeb..9cf3864 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Hleður kvikt veggfóður…"</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Heimaskjár"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Heimaskjár og lásskjár"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Loka upplýsingasvæði veggfóðurs"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Stækka upplýsingasvæði veggfóðurs"</string>
</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index b67d6b5..dd4ae95 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Caricamento sfondo animato…"</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Schermata Home"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Schermata Home e schermata di blocco"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Comprimi il riquadro informazioni dello sfondo"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Espandi il riquadro informazioni dello sfondo"</string>
</resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index c3e863e..7b135ac 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"טוען טפט מונפש…"</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"מסך דף הבית"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"מסך דף הבית ומסך נעילה"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"כווץ את חלונית פרטי הטפט"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"הרחב את חלונית פרטי הטפט"</string>
</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index fe9ffed..f52cedb 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"ライブ壁紙を読み込み中…"</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"ホーム画面"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"ホーム画面とロック画面"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"壁紙の情報パネルを折りたたむ"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"壁紙の情報パネルを展開"</string>
</resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index aac6472..e18c88b 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"იტვირთება ცოცხალი ფონი…"</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"მთავარი ეკრანი"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"მთავარი ეკრანი და ჩაკეტილი ეკრანი"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"ფონის ინფორმაციის პანელის ჩაკეცვა"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"ფონის ინფორმაციის პანელის გაშლა"</string>
</resources>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index 0eac7f0..4b7c1d2 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Анимациялық артқы фонды жүктеуде…"</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Негізгі экран"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Негізгі экран және құлыпталған экран"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Тұсқағаздың ақпарат панелін жию"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Тұсқағаздың ақпарат панелін жаю"</string>
</resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index c42b8fc..2b8ed9f 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"កំពុង​ផ្ទុក​ផ្ទាំង​រូបភាព​មាន​ចលនា..."</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"អេក្រង់ដើម"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"អេក្រង់ដើម និងអេក្រង់ជាប់សោ"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"បង្រួមផ្ទាំងព័ត៌មានផ្ទាំងរូបភាព"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"ពង្រីកផ្ទាំងព័ត៌មានផ្ទាំងរូបភាព"</string>
</resources>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 6c1daa1..8ef50b7 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"ಲೈವ್ ವಾಲ್‌ಪೇಪರ್‌ ಅನ್ನು ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"ಮುಖಪುಟದ ಪರದೆ"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"ಮುಖಪುಟದ ಪರದೆ ಮತ್ತು ಲಾಕ್ ಪರದೆ"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"ವಾಲ್‌ಪೇಪರ್ ಮಾಹಿತಿ ಫಲಕ ಸಂಕುಚಿಸಿ"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"ವಾಲ್‌ಪೇಪರ್ ಮಾಹಿತಿ ಫಲಕ ವಿಸ್ತರಿಸಿ"</string>
</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 7e52f93..eace4ae 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"라이브 배경화면 로드 중..."</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"메인 스크린"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"메인 스크린 및 잠금 화면"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"배경화면 정보 패널 접기"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"배경화면 정보 패널 펼치기"</string>
</resources>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index ed6bf5b..9d7f0e8 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Жандуу тушкагаз жүктөлүүдө…"</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Башкы экран"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Башкы экран жана кулпуланган экран"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Тушкагаздын маалымат панелин жыйыштыруу"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Тушкагаздын маалымат панелин жайып көрсөтүү"</string>
</resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 5f3a647..7a0bb28 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"ກຳລັງໂຫລດພາບພື້ນຫຼັງແບບເຄື່ອນໄຫວ…"</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"ໜ້າຈໍຫຼັກ"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"ໜ້າຈໍຫຼັກ ແລະ ໜ້າຈໍລັອກ"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"ຫຍໍ້ແຖບຂໍ້ມູນຮູບພື້ນຫຼັງ"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"ຂະຫຍາຍແຖບຂໍ້ມູນຮູບພື້ນຫຼັງ"</string>
</resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 0388f34..2abe33f 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Įkeliamas judantis darbalaukio fonas..."</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Pagrindinis ekranas"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Pagrindinis ekranas ir užrakinimo ekranas"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Sutraukti ekrano fono informacijos skydelį"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Išskleisti ekrano fono informacijos skydelį"</string>
</resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index d12904c..94c4551 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Notiek mainīgās tapetes ielāde..."</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Sākuma ekrāns"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Sākuma ekrāns un bloķēšanas ekrāns"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Sakļaut fona tapetes informācijas paneli"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Izvērst fona tapetes informācijas paneli"</string>
</resources>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index 28ae4cd..dc2a1ab 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Вчитување раздвижен тапет..."</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Почетен екран"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Почетен и заклучен екран"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Собери ја информациската табла на тапетот"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Прошири ја информациската табла на тапетот"</string>
</resources>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index de55503..41eeb63 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"സജീവ വാൾപേപ്പർ ലോഡുചെയ്യുന്നു..."</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"ഹോം സ്‌ക്രീൻ"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"ഹോം സ്ക്രീനും ലോക്ക് സ്ക്രീനും"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"വാൾപേപ്പർ വിവര പാനൽ ചുരുക്കുക"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"വാൾപേപ്പർ വിവര പാനൽ വികസിപ്പിക്കുക"</string>
</resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 6e590c6..2c71e97 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Хөдөлгөөнт ханын зургийг ачааллаж байна…"</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Нүүр хуудас"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Нүүр хуудас болон түгжигдсэн дэлгэц"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Ханын зургийн мэдээллийн самбарыг хураах"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Ханын зургийн мэдээллийн самбарыг дэлгэх"</string>
</resources>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index 319d917..b3cefa1 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"थेट वॉलपेपर लोड करत आहे…"</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"मुख्यपृष्ठ"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"मुख्यपृष्ठ आणि लॉक स्क्रीन"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"वॉलपेपर माहिती पॅनेेल संकुचित करा"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"वॉलपेपर माहिती पॅनेल विस्तृत करा"</string>
</resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 3eded62..f9671ff 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Memuatkan kertas dinding hidup..."</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Skrin utama"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Skrin utama dan skrin kunci"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Runtuhkan panel maklumat kertas dinding"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Kembangkan panel maklumat kertas dinding"</string>
</resources>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index d9bca2b..df0b965 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"နောက်ခံပုံအရှင်ကို ဆွဲခေါ်နေပါတယ် …"</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"ပင်မစာမျက်နှာ"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"ပင်မစာမျက်နှာနှင့် လော့ခ်စာမျက်နှာ"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"နောက်ခံပုံအချက်အလက်ပြသည့်အကွက်ကို ခေါက်သိမ်းရန်"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"နောက်ခံပုံအချက်အလက်ပြသည့်အကွက်ကို ဖြန့်ချရန်"</string>
</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index f057a92..6da4547 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Laster inn animert bakgrunn ..."</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Startskjerm"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Startskjerm og låseskjerm"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Skjul informasjonspanelet for bakgrunnen"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Vis informasjonspanelet for bakgrunnen"</string>
</resources>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index ee098d0..f7dde00 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"लाइभ वालपेपर लोड हुँदै ..."</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"गृह स्क्रिन"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"गृह स्क्रिन र लक स्क्रिन"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"वालपेपर सम्बन्धी जानकारीको प्यानेललाई संक्षिप्त गर्नुहोस्"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"वालपेपर सम्बन्धी जानकारीको प्यानेललाई विस्तृत गर्नुहोस्"</string>
</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index b17f35f..1e7c00e 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Interactieve achtergrond laden…"</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Startscherm"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Startscherm en vergrendelingsscherm"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Informatievenster van achtergrond samenvouwen"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Informatievenster van achtergrond uitvouwen"</string>
</resources>
diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa-rIN/strings.xml
index cce8fc4..af9b8fd 100644
--- a/res/values-pa-rIN/strings.xml
+++ b/res/values-pa-rIN/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"ਲਾਈਵ ਵਾਲਪੇਪਰ ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"ਮੁੱਖ ਸਕ੍ਰੀਨ"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"ਮੁੱਖ ਸਕ੍ਰੀਨ ਅਤੇ ਲੌਕ ਸਕ੍ਰੀਨ"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"ਵਾਲਪੇਪਰ ਜਾਣਕਾਰੀ ਪੈਨਲ ਸੁੰਗੇੜੋ"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"ਵਾਲਪੇਪਰ ਜਾਣਕਾਰੀ ਪੈਨਲ ਦਾ ਵਿਸਤਾਰ ਕਰੋ"</string>
</resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 8da9bf1..0bce88d 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Wczytywanie animowanej tapety…"</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Ekran główny"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Ekran główny i ekran blokady"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Zwiń panel informacyjny tapety"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Rozwiń panel informacyjny tapety"</string>
</resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index d2506fa..1089892 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"A carregar a imagem de fundo activa…"</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Ecrã principal"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Ecrã principal e ecrã de bloqueio"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Reduzir o painel de informações da imagem de fundo"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Expandir o painel de informações da imagem de fundo"</string>
</resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 9e717a5..5fc9dbc 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Carregando p. de fundo interativo..."</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Tela inicial"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Tela inicial e tela de bloqueio"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Recolher painel de informações de plano de fundo"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Expandir painel de informações de plano de fundo"</string>
</resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index ca93265..64978a1 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Se încarcă imaginea de fundal live..."</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Ecranul de pornire"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Ecranul de pornire și ecranul de blocare"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Restrângeți panoul de informații al imaginii de fundal"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Extindeți panoul de informații al imaginii de fundal"</string>
</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 5886bb1..969b75a 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Загрузка живых обоев…"</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Главный экран"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Главный экран и экран блокировки"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Свернуть панель с информацией об обоях"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Развернуть панель с информацией об обоях"</string>
</resources>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index 8248399..7b58f9c 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"සජීවී වෝල්පේපරය පූරණය වේ…"</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"මුල් පිටු තිරය"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"මුල් පිටු තිරය සහ අගුලු තිරය"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"වෝල්පේපර තතු පැනලය හකුළුවන්න"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"වෝල්පේපර තතු පැනලය දිග හරින්න"</string>
</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 5b40f77..f4d5f94 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Načítava sa dynamická tapeta…"</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Plocha"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Plocha a uzamknutá obrazovka"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Zbaliť informačný panel tapety"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Rozbaliť informačný panel tapety"</string>
</resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index d6e4085..bcbb150 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Nalaganje animiranih slik za ozadje ..."</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Začetni zaslon"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Začetni zaslon in zaklenjen zaslon"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Strnitev podokna z informacijami o ozadju"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Razširitev podokna z informacijami o ozadju"</string>
</resources>
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
index 492f96f..247a897 100644
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq-rAL/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Po ngarkon imazhe të drejtpërdrejta sfondi..."</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Ekrani bazë"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Ekrani bazë dhe ekrani i kyçjes"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Palos panelin e informacionit të imazhit të sfondit"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Zgjero panelin e informacionit të imazhit të sfondit"</string>
</resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 997240b..38d8756 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Учитавање анимиране позадине…"</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Почетни екран"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Почетни екран и закључани екран"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Скупља таблу са информацијама о позадини"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Проширује таблу са информацијама о позадини"</string>
</resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index d789171..eb41039 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Läser in levande bakgrund…"</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Startskärm"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Startskärm och låsskärm"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Komprimera bakgrundens informationspanel"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Utöka bakgrundens informationspanel"</string>
</resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index b80837d..8354cdb 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Inapakia taswira hai..."</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Skrini ya kwanza"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Skrini ya kwanza na skrini iliyofungwa"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Kunja kidirisha cha maelezo ya mandhari"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Panua kidirisha cha maelezo ya mandhari"</string>
</resources>
diff --git a/res/values-sw720dp/dimes.xml b/res/values-sw720dp/dimes.xml
new file mode 100644
index 0000000..54380b9
--- /dev/null
+++ b/res/values-sw720dp/dimes.xml
@@ -0,0 +1,27 @@
+<!--
+ ~ Copyright (C) 2016 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>
+
+ <!-- Dimensions for the preview fragment. -->
+ <dimen name="preview_toolbar_up_button_padding">8dp</dimen>
+ <dimen name="preview_toolbar_set_wallpaper_button_padding">20dp</dimen>
+
+ <!-- Dimensions for the preview attribution pane. -->
+ <dimen name="preview_attribution_pane_content_side_margin">24dp</dimen>
+ <dimen name="preview_attribution_pane_explore_left_margin">10dp</dimen>
+
+</resources> \ No newline at end of file
diff --git a/res/values-sw720dp/styles.xml b/res/values-sw720dp/styles.xml
new file mode 100644
index 0000000..7e1209c
--- /dev/null
+++ b/res/values-sw720dp/styles.xml
@@ -0,0 +1,21 @@
+<!--
+ ~ Copyright (C) 2016 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="AttributionPaneTitle" parent="@android:style/TextAppearance.Material.Headline"/>
+
+</resources> \ No newline at end of file
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index 9fb9f25..5d89464 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"நேரலை வால்பேப்பரை ஏற்றுகிறது…"</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"முகப்புத் திரை"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"முகப்புத் திரையும் பூட்டுத் திரையும்"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"வால்பேப்பரின் தகவல் பேனலைச் சுருக்கும் பொத்தான்"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"வால்பேப்பரின் தகவல் பேனலை விரிக்கும் பொத்தான்"</string>
</resources>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index 1670c10..e6db105 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"ప్రదర్శిత వాల్‌పేపర్‌ను లోడ్ చేస్తోంది…"</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"హోమ్ స్క్రీన్"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"హోమ్ స్క్రీన్ మరియు లాక్ స్క్రీన్"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"వాల్‌పేపర్ సమాచార ప్యానెల్‌ను కుదిస్తుంది"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"వాల్‌పేపర్ సమాచార ప్యానెల్‌ను విస్తరింపజేస్తుంది"</string>
</resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index eb9eec0..18be90b 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"กำลังโหลดวอลเปเปอร์ภาพเคลื่อนไหว…"</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"หน้าจอหลัก"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"หน้าจอหลักและหน้าจอล็อก"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"ยุบแผงข้อมูลวอลเปเปอร์"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"ขยายแผงข้อมูลวอลเปเปอร์"</string>
</resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index ccdd1f0..b9c0240 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Naglo-load ng live wallpaper..."</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Home screen"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Home screen at lock screen"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"I-collapse ang panel ng impormasyon ng wallpaper"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Palawakin ang panel ng impormasyon ng wallpaper"</string>
</resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index b7de07b..39caafd 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Animasyonlu duvar kağıdı yükleniyor…"</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Ana ekran"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Ana ekran ve kilit ekranı"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Duvar kağıdı bilgi panelini daralt"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Duvar kağıdı bilgi panelini genişlet"</string>
</resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index b99b874..471a870 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Завантаження…"</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Головний екран"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Головний екран і заблокований екран"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Згорнути панель з інформацією про фоновий малюнок"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Розгорнути панель з інформацією про фоновий малюнок"</string>
</resources>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index c288fdd..5743c9d 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"لائیو وال پیپر لوڈ ہو رہا ہے…"</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"ہوم اسکرین"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"ہوم اسکرین اور مقفل اسکرین"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"وال پیپر معلوماتی پینل سکیڑیں"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"وال پیپر معلوماتی پینل پھیلائیں"</string>
</resources>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index e0feb0d..ea33fed 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Jonli fon rasmlari yuklanmoqda…"</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Bosh ekran"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Bosh va qulf ekrani"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Fon rasmi haqida ma’lumot panelini yig‘ish"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Fon rasmi haqida ma’lumot panelini ochish"</string>
</resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index fa8a0aa..30f6eaa 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Đang tải hình nền động..."</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Màn hình chính"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Màn hình chính và màn hình khóa"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Thu gọn bảng thông tin hình nền"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Mở rộng bảng thông tin hình nền"</string>
</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index c2cfb04..27b9378 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"正在加载动态壁纸…"</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"主屏幕"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"主屏幕和锁定屏幕"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"折叠壁纸信息面板"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"展开壁纸信息面板"</string>
</resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 822fc3b..550a5cf 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"正在載入即時桌布…"</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"主畫面"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"主畫面或上鎖畫面"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"收合桌布資訊面板"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"展開桌布資訊面板"</string>
</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index fd9cad5..11cb882 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"正在載入動態桌布…"</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"主畫面"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"主畫面和螢幕鎖定"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"收合桌布資訊面板"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"展開桌布資訊面板"</string>
</resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 86b2ee2..48e1f0c 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -31,4 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"Ilayisha iphephadonga elibukhoma..."</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Isikrini sasekhaya"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Isikrini sasekhaya nokukhiya isikrini"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"Goqa iphaneli yolwazi lwesithombe sangemuva"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"Nweba iphaneli yolwazi yesithombe sangemuva"</string>
</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index d49e104..a81efb6 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -20,5 +20,7 @@
<resources>
<color name="live_wallpaper_thumbnail_background">#CC666666</color>
<color name="live_wallpaper_thumbnail_text_color">#FFFFFFFF</color>
+
+ <color name="translucent_black">#96000000</color>
</resources>
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index d08e573..73792df 100644
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -25,4 +25,19 @@
<dimen name="screen_margin_sides">0dip</dimen>
+ <!-- Dimensions for the preview fragment. -->
+ <dimen name="preview_toolbar_up_button_padding">0dp</dimen>
+ <dimen name="preview_toolbar_set_wallpaper_button_end_padding">12dp</dimen>
+
+ <!-- Dimensions for the preview attribution pane. -->
+ <dimen name="preview_attribution_pane_collapsed_height">48dp</dimen>
+ <dimen name="preview_attribution_pane_expanded_height">96dp</dimen>
+ <dimen name="preview_attribution_pane_content_side_margin">16dp</dimen>
+ <dimen name="preview_attribution_pane_title_top_margin">13dp</dimen>
+ <dimen name="preview_attribution_pane_subtitle1_top_margin">12dp</dimen>
+ <dimen name="preview_attribution_pane_subtitle2_top_margin">2dp</dimen>
+ <dimen name="preview_attribution_pane_explore_left_margin">2dp</dimen>
+ <dimen name="preview_attribution_pane_explore_top_margin">12dp</dimen>
+ <dimen name="preview_attribution_pane_explore_bottom_margin">16dp</dimen>
+ <dimen name="preview_attribution_pane_spacer_height">32dp</dimen>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3e9ac84..99e48e6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -46,4 +46,12 @@
<string name="which_wallpaper_option_home_screen">Home screen</string>
<!-- Option for setting the wallpaper on both the home screen and lock screen. -->
<string name="which_wallpaper_option_home_screen_and_lock_screen">Home screen and lock screen</string>
+
+ <!-- Content description for a button letting the user collapse a visual panel showing info
+ about the wallpaper being previewed. [CHAR LIMIT=none] -->
+ <string name="collapse_attribution_panel">Collapse wallpaper info panel</string>
+
+ <!-- Content description for a button letting the user expand a visual panel showing info about
+ the wallpaper being previewed. [CHAR LIMIT=none] -->
+ <string name="expand_attribution_panel">Expand wallpaper info panel</string>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 01747e7..c3dc2b3 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -21,28 +21,28 @@
<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>
+ <style name="Preview" parent="@style/Theme.AppCompat">
+
+ <!-- Set no title and no action bar because we use a toolbar instead. -->
+ <item name="android:windowActionBar">false</item>
+ <item name="android:windowNoTitle">true</item>
<item name="android:windowBackground">@android:color/transparent</item>
- <item name="android:colorBackgroundCacheHint">@null</item>
- </style>
+ <item name="android:windowContentOverlay">@null</item>
+
+ <!-- Set status bar and navigation buttons to be translucent. -->
+ <item name="android:colorPrimaryDark">@color/translucent_black</item>
+ <item name="android:navigationBarColor">@color/translucent_black</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>
+ <item name="colorAccent">@*android:color/accent_device_default_dark</item>
+
+ <item name="android:windowDisablePreview">true</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 name="TranslucentToolbarStyle" parent="@style/Widget.AppCompat.Toolbar">
+ <item name="android:background">@color/translucent_black</item>
+ <item name="android:theme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
</style>
+ <style name="AttributionPaneTitle" parent="@android:style/TextAppearance.Material.Subhead"/>
+
</resources> \ No newline at end of file
diff --git a/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java b/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java
index 85f241f..f5bfce9 100644
--- a/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java
+++ b/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java
@@ -16,37 +16,46 @@
package com.android.wallpaper.livepicker;
-import android.app.ActionBar;
import android.app.Activity;
import android.app.AlertDialog;
-import android.app.WallpaperManager;
import android.app.WallpaperInfo;
-import android.app.Dialog;
+import android.app.WallpaperManager;
+import android.content.ActivityNotFoundException;
+import android.content.ComponentName;
+import android.content.Context;
import android.content.DialogInterface;
-import android.graphics.Rect;
-import android.service.wallpaper.IWallpaperConnection;
-import android.service.wallpaper.IWallpaperService;
-import android.service.wallpaper.IWallpaperEngine;
-import android.service.wallpaper.WallpaperSettingsActivity;
-import android.content.ServiceConnection;
import android.content.Intent;
-import android.content.Context;
-import android.content.ComponentName;
-import android.os.RemoteException;
+import android.content.ServiceConnection;
+import android.content.pm.PackageManager;
+import android.content.res.Resources.NotFoundException;
+import android.graphics.Rect;
+import android.net.Uri;
+import android.os.Bundle;
import android.os.IBinder;
import android.os.ParcelFileDescriptor;
-import android.os.Bundle;
+import android.os.RemoteException;
+import android.service.wallpaper.IWallpaperConnection;
+import android.service.wallpaper.IWallpaperEngine;
+import android.service.wallpaper.IWallpaperService;
import android.service.wallpaper.WallpaperService;
+import android.service.wallpaper.WallpaperSettingsActivity;
+import android.support.design.widget.BottomSheetBehavior;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.ContextThemeWrapper;
import android.view.Menu;
import android.view.MenuItem;
import android.view.MotionEvent;
import android.view.View;
-import android.view.WindowManager;
+import android.view.View.OnClickListener;
import android.view.ViewGroup;
-import android.view.Window;
-import android.view.LayoutInflater;
-import android.util.Log;
+import android.view.WindowManager.LayoutParams;
+import android.view.animation.AnimationUtils;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.ImageButton;
import android.widget.TextView;
+import android.widget.Toolbar;
import java.io.IOException;
@@ -55,6 +64,8 @@ public class LiveWallpaperPreview extends Activity {
private static final String LOG_TAG = "LiveWallpaperPreview";
+ private static final boolean SHOW_DUMMY_DATA = false;
+
private WallpaperManager mWallpaperManager;
private WallpaperConnection mWallpaperConnection;
@@ -62,8 +73,14 @@ public class LiveWallpaperPreview extends Activity {
private String mPackageName;
private Intent mWallpaperIntent;
- private View mView;
- private Dialog mDialog;
+ private TextView mAttributionTitle;
+ private TextView mAttributionSubtitle1;
+ private TextView mAttributionSubtitle2;
+ private Button mAttributionExploreButton;
+ private ImageButton mPreviewPaneArrow;
+ private View mBottomSheet;
+ private View mSpacer;
+ private View mLoading;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -78,29 +95,160 @@ public class LiveWallpaperPreview extends Activity {
setResult(RESULT_CANCELED);
finish();
}
-
initUI(info);
}
protected void initUI(WallpaperInfo info) {
+ getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE
+ | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+ | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION);
+ setContentView(R.layout.live_wallpaper_preview);
+ mAttributionTitle = (TextView) findViewById(R.id.preview_attribution_pane_title);
+ mAttributionSubtitle1 = (TextView) findViewById(R.id.preview_attribution_pane_subtitle1);
+ mAttributionSubtitle2 = (TextView) findViewById(R.id.preview_attribution_pane_subtitle2);
+ mAttributionExploreButton = (Button) findViewById(
+ R.id.preview_attribution_pane_explore_button);
+ mPreviewPaneArrow = (ImageButton) findViewById(R.id.preview_attribution_pane_arrow);
+ mBottomSheet = findViewById(R.id.bottom_sheet);
+ mSpacer = findViewById(R.id.spacer);
+ mLoading = findViewById(R.id.loading);
+
mSettings = info.getSettingsActivity();
mPackageName = info.getPackageName();
mWallpaperIntent = new Intent(WallpaperService.SERVICE_INTERFACE)
.setClassName(info.getPackageName(), info.getServiceName());
- final ActionBar actionBar = getActionBar();
- actionBar.setCustomView(R.layout.live_wallpaper_preview);
- mView = actionBar.getCustomView();
+ setActionBar((Toolbar) findViewById(R.id.toolbar));
+ getActionBar().setDisplayHomeAsUpEnabled(true);
+ getActionBar().setDisplayShowTitleEnabled(false);
mWallpaperManager = WallpaperManager.getInstance(this);
mWallpaperConnection = new WallpaperConnection(mWallpaperIntent);
+
+ populateAttributionPane(info);
+ }
+
+ private void populateAttributionPane(WallpaperInfo info) {
+ if (!info.getShowMetadataInPreview() && !SHOW_DUMMY_DATA) {
+ mBottomSheet.setVisibility(View.GONE);
+ return;
+ }
+ final BottomSheetBehavior bottomSheetBehavior = BottomSheetBehavior.from(mBottomSheet);
+
+ OnClickListener onClickListener = new OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ if (bottomSheetBehavior.getState() == BottomSheetBehavior.STATE_COLLAPSED) {
+ bottomSheetBehavior.setState(BottomSheetBehavior.STATE_EXPANDED);
+ } else if (bottomSheetBehavior.getState() == BottomSheetBehavior.STATE_EXPANDED) {
+ bottomSheetBehavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
+ }
+ }
+ };
+ mAttributionTitle.setOnClickListener(onClickListener);
+ mPreviewPaneArrow.setOnClickListener(onClickListener);
+
+ bottomSheetBehavior.setBottomSheetCallback(new BottomSheetBehavior.BottomSheetCallback() {
+ @Override
+ public void onStateChanged(View bottomSheet, int newState) {
+ if (newState == BottomSheetBehavior.STATE_COLLAPSED) {
+ mPreviewPaneArrow.setImageResource(R.drawable.ic_keyboard_arrow_up_white_24dp);
+ mPreviewPaneArrow.setContentDescription(
+ getResources().getString(R.string.expand_attribution_panel));
+ } else if (newState == BottomSheetBehavior.STATE_EXPANDED) {
+ mPreviewPaneArrow.setImageResource(
+ R.drawable.ic_keyboard_arrow_down_white_24dp);
+ mPreviewPaneArrow.setContentDescription(
+ getResources().getString(R.string.collapse_attribution_panel));
+ }
+ }
+
+ @Override
+ public void onSlide(View bottomSheet, float slideOffset) {
+ float alpha;
+ if (slideOffset >= 0) {
+ alpha = slideOffset;
+ } else {
+ alpha = 1f - slideOffset;
+ }
+ mAttributionTitle.setAlpha(slideOffset);
+ mAttributionSubtitle1.setAlpha(slideOffset);
+ mAttributionSubtitle2.setAlpha(slideOffset);
+ mAttributionExploreButton.setAlpha(slideOffset);
+ }
+ });
+
+ bottomSheetBehavior.setState(BottomSheetBehavior.STATE_EXPANDED);
+ mPreviewPaneArrow.setImageResource(R.drawable.ic_keyboard_arrow_down_white_24dp);
+
+ if (SHOW_DUMMY_DATA) {
+ mAttributionTitle.setText("Diorama, Yosemite");
+ mAttributionSubtitle1.setText("Live Earth Collection - Android Earth");
+ mAttributionSubtitle2.setText("Lorem ipsum dolor sit amet, consectetur adipiscing elit."
+ + " Sed imperdiet et mauris molestie laoreet. Proin volutpat elit nec magna"
+ + " tempus, ac aliquet lectus volutpat.");
+ mAttributionExploreButton.setText("Explore");
+ } else {
+ PackageManager pm = getPackageManager();
+
+ CharSequence title = info.loadLabel(pm);
+ if (!TextUtils.isEmpty(title)) {
+ mAttributionTitle.setText(title);
+ } else {
+ mAttributionTitle.setVisibility(View.GONE);
+ }
+
+ try {
+ CharSequence author = info.loadAuthor(pm);
+ if (TextUtils.isEmpty(author)) {
+ throw new NotFoundException();
+ }
+ mAttributionSubtitle1.setText(author);
+ } catch (NotFoundException e) {
+ mAttributionSubtitle1.setVisibility(View.GONE);
+ }
+
+ try {
+ CharSequence description = info.loadDescription(pm);
+ if (TextUtils.isEmpty(description)) {
+ throw new NotFoundException();
+ }
+ mAttributionSubtitle2.setText(description);
+ } catch (NotFoundException e) {
+ mAttributionSubtitle2.setVisibility(View.GONE);
+ }
+
+ try {
+ Uri contextUri = info.loadContextUri(pm);
+ CharSequence contextDescription = info.loadContextDescription(pm);
+ if (contextUri == null) {
+ throw new NotFoundException();
+ }
+ mAttributionExploreButton.setText(contextDescription);
+ mAttributionExploreButton.setOnClickListener(v -> {
+ Intent intent = new Intent(Intent.ACTION_VIEW, contextUri);
+ intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ try {
+ startActivity(intent);
+ } catch (ActivityNotFoundException e) {
+ Log.e(LOG_TAG, "Couldn't find activity for context link.", e);
+ }
+ });
+ } catch (NotFoundException e) {
+ mAttributionExploreButton.setVisibility(View.GONE);
+ mSpacer.setVisibility(View.VISIBLE);
+ }
+ }
+
+
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
- if (mSettings != null) {
- getMenuInflater().inflate(R.menu.menu_preview, menu);
- }
+ getMenuInflater().inflate(R.menu.menu_preview, menu);
+ menu.findItem(R.id.configure).setVisible(mSettings != null);
+ menu.findItem(R.id.set_wallpaper).getActionView().setOnClickListener(
+ this::setLiveWallpaper);
return super.onCreateOptionsMenu(menu);
}
@@ -116,9 +264,10 @@ public class LiveWallpaperPreview extends Activity {
finish();
} else {
// Otherwise, prompt to either set on home or both home and lock screen.
- new AlertDialog.Builder(this)
+ Context themedContext = new ContextThemeWrapper(this, android.R.style.Theme_DeviceDefault_Settings);
+ new AlertDialog.Builder(themedContext)
.setTitle(R.string.set_live_wallpaper)
- .setItems(R.array.which_wallpaper_options, new DialogInterface.OnClickListener() {
+ .setAdapter(new WallpaperTargetAdapter(themedContext), new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
try {
@@ -129,9 +278,7 @@ public class LiveWallpaperPreview extends Activity {
mWallpaperManager.clear(WallpaperManager.FLAG_LOCK);
}
setResult(RESULT_OK);
- } catch (RuntimeException e) {
- Log.w(LOG_TAG, "Failure setting wallpaper", e);
- } catch (IOException e) {
+ } catch (RuntimeException|IOException e) {
Log.w(LOG_TAG, "Failure setting wallpaper", e);
}
finish();
@@ -149,12 +296,19 @@ public class LiveWallpaperPreview extends Activity {
@Override
public boolean onOptionsItemSelected(MenuItem item) {
- if (item.getItemId() == R.id.configure) {
+ int id = item.getItemId();
+ if (id == R.id.configure) {
Intent intent = new Intent();
intent.setComponent(new ComponentName(mPackageName, mSettings));
intent.putExtra(WallpaperSettingsActivity.EXTRA_PREVIEW_MODE, true);
startActivity(intent);
return true;
+ } else if (id == R.id.set_wallpaper) {
+ setLiveWallpaper(getWindow().getDecorView());
+ return true;
+ } else if (id == android.R.id.home) {
+ onBackPressed();
+ return true;
}
return super.onOptionsItemSelected(item);
}
@@ -187,9 +341,7 @@ public class LiveWallpaperPreview extends Activity {
public void onAttachedToWindow() {
super.onAttachedToWindow();
- showLoading();
-
- mView.post(new Runnable() {
+ getWindow().getDecorView().post(new Runnable() {
public void run() {
if (!mWallpaperConnection.connect()) {
mWallpaperConnection = null;
@@ -198,31 +350,10 @@ public class LiveWallpaperPreview extends Activity {
});
}
- private void showLoading() {
- LayoutInflater inflater = LayoutInflater.from(this);
- TextView content = (TextView) inflater.inflate(R.layout.live_wallpaper_loading, null);
-
- mDialog = new Dialog(this, android.R.style.Theme_Black);
-
- Window window = mDialog.getWindow();
- WindowManager.LayoutParams lp = window.getAttributes();
-
- lp.width = WindowManager.LayoutParams.MATCH_PARENT;
- lp.height = WindowManager.LayoutParams.MATCH_PARENT;
- window.setType(WindowManager.LayoutParams.TYPE_APPLICATION_MEDIA);
-
- mDialog.setContentView(content, new ViewGroup.LayoutParams(
- ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT
- ));
- mDialog.show();
- }
-
@Override
public void onDetachedFromWindow() {
super.onDetachedFromWindow();
- if (mDialog != null) mDialog.dismiss();
-
if (mWallpaperConnection != null) {
mWallpaperConnection.disconnect();
}
@@ -286,7 +417,7 @@ public class LiveWallpaperPreview extends Activity {
return true;
}
}
-
+
public void disconnect() {
synchronized (this) {
mConnected = false;
@@ -307,10 +438,9 @@ public class LiveWallpaperPreview extends Activity {
if (mWallpaperConnection == this) {
mService = IWallpaperService.Stub.asInterface(service);
try {
- final View view = mView;
- final View root = view.getRootView();
- mService.attach(this, view.getWindowToken(),
- WindowManager.LayoutParams.TYPE_APPLICATION_MEDIA_OVERLAY,
+ final View root = getWindow().getDecorView();
+ mService.attach(this, root.getWindowToken(),
+ LayoutParams.TYPE_APPLICATION_MEDIA,
true, root.getWidth(), root.getHeight(),
new Rect(0, 0, 0, 0));
} catch (RemoteException e) {
@@ -352,6 +482,40 @@ public class LiveWallpaperPreview extends Activity {
@Override
public void engineShown(IWallpaperEngine engine) throws RemoteException {
+ mLoading.post(() -> {
+ mLoading.animate()
+ .alpha(0f)
+ .setDuration(220)
+ .setInterpolator(AnimationUtils.loadInterpolator(LiveWallpaperPreview.this,
+ android.R.interpolator.fast_out_linear_in))
+ .withEndAction(() -> mLoading.setVisibility(View.INVISIBLE));
+ });
+ }
+ }
+
+ private static class WallpaperTargetAdapter extends ArrayAdapter<CharSequence> {
+
+ public WallpaperTargetAdapter(Context context) {
+ super(context, R.layout.wallpaper_target_dialog_item,
+ context.getResources().getTextArray(R.array.which_wallpaper_options));
+ }
+
+ @Override
+ public boolean hasStableIds() {
+ return true;
+ }
+
+ @Override
+ public long getItemId(int position) {
+ return position;
+ }
+
+ @Override
+ public View getView(int position, View convertView, ViewGroup parent) {
+ TextView tv = (TextView) super.getView(position, convertView, parent);
+ tv.setCompoundDrawablesRelativeWithIntrinsicBounds(
+ position == 0 ? R.drawable.ic_home : R.drawable.ic_device, 0, 0, 0);
+ return tv;
}
}
}