summaryrefslogtreecommitdiffstats
path: root/res/drawable
diff options
context:
space:
mode:
authorRichard Chou <richardchou@google.com>2018-11-21 13:46:10 +0800
committerRichard Chou <richardchou@google.com>2019-01-26 04:55:46 +0800
commit00e8d9afba8bd20bc73e9507e0e42d6f9962ceef (patch)
tree166d051b82b6797a3a0dbfcb3c1510ac6d1ef361 /res/drawable
parent9f295e7a7ef9ca17d42abf500a6d24fe37aa3990 (diff)
downloadandroid_packages_wallpapers_LivePicker-00e8d9afba8bd20bc73e9507e0e42d6f9962ceef.tar.gz
android_packages_wallpapers_LivePicker-00e8d9afba8bd20bc73e9507e0e42d6f9962ceef.tar.bz2
android_packages_wallpapers_LivePicker-00e8d9afba8bd20bc73e9507e0e42d6f9962ceef.zip
Supports inline control for live wallpapers
To support inline control (Slice), WallpaperInfo has a new attribute settingsSliceUri. A ViewPager is added to LiveWallpapersPicker for the display of both wallpaper attribution and settings Slice. Bug: 111862421 Test: Manual Change-Id: I28e808ec58f12179da1acc000634d6c41eec805b
Diffstat (limited to 'res/drawable')
-rw-r--r--res/drawable/btn_outlined_material.xml22
-rw-r--r--res/drawable/btn_outlined_mtrl_shape.xml33
2 files changed, 55 insertions, 0 deletions
diff --git a/res/drawable/btn_outlined_material.xml b/res/drawable/btn_outlined_material.xml
new file mode 100644
index 0000000..7e26ea5
--- /dev/null
+++ b/res/drawable/btn_outlined_material.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2019 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.
+-->
+
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+ android:color="?android:attr/colorControlHighlight">
+ <item android:id="@android:id/mask"
+ android:drawable="@*android:drawable/btn_default_mtrl_shape"/>
+ <item android:drawable="@drawable/btn_outlined_mtrl_shape"/>
+</ripple>
diff --git a/res/drawable/btn_outlined_mtrl_shape.xml b/res/drawable/btn_outlined_mtrl_shape.xml
new file mode 100644
index 0000000..bc6cff2
--- /dev/null
+++ b/res/drawable/btn_outlined_mtrl_shape.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2019 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.
+-->
+
+<!-- Used as the canonical button shape. -->
+
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+ android:insetLeft="@*android:dimen/button_inset_horizontal_material"
+ android:insetTop="@*android:dimen/button_inset_vertical_material"
+ android:insetRight="@*android:dimen/button_inset_horizontal_material"
+ android:insetBottom="@*android:dimen/button_inset_vertical_material">
+ <shape android:shape="rectangle">
+ <corners android:radius="?android:attr/buttonCornerRadius"/>
+ <padding android:bottom="@*android:dimen/button_padding_vertical_material"
+ android:left="@*android:dimen/button_padding_horizontal_material"
+ android:right="@*android:dimen/button_padding_horizontal_material"
+ android:top="@*android:dimen/button_padding_vertical_material"/>
+ <stroke android:width="@dimen/btn_outlined_stroke"
+ android:color="@*android:color/primary_device_default_light"/>
+ </shape>
+</inset>