Merge tag 'android-7.1.0_r4' of https://android.googlesource.com/platform/packages/wallpapers/LivePicker into 71

Android 7.1.0 release 4

1 files changed, 24 insertions, 0 deletions

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