Merge "Merge Android Pie into master"
diff --git a/Android.mk b/Android.mk
index 8cd0dc1..507dd8e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -47,10 +47,16 @@
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
+LOCAL_STATIC_JAVA_LIBRARIES := \
+ android-support-annotations
+
LOCAL_STATIC_ANDROID_LIBRARIES := \
android-support-v7-appcompat \
- android-support-v4 \
- android-support-design \
+ android-support-compat \
+ android-support-core-utils \
+ android-support-core-ui \
+ android-support-fragment \
+ $(ANDROID_SUPPORT_DESIGN_TARGETS) \
android-support-transition \
android-support-v7-recyclerview
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 057d6c0..d82c778 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -38,6 +38,7 @@
<activity android:name="LiveWallpaperActivity"
android:label="@string/live_wallpaper_picker_label"
android:theme="@style/LivePickerTheme"
+ android:colorMode="wideColorGamut"
android:hardwareAccelerated="true">
<intent-filter>
<action android:name="android.service.wallpaper.LIVE_WALLPAPER_CHOOSER" />
@@ -50,6 +51,7 @@
<activity android:name="LiveWallpaperChange"
android:label="@string/live_wallpaper_preview_title"
+ android:colorMode="wideColorGamut"
android:theme="@style/Preview">
<intent-filter>
<action android:name="android.service.wallpaper.CHANGE_LIVE_WALLPAPER" />
@@ -59,6 +61,7 @@
<activity android:name="LiveWallpaperPreview"
android:label="@string/live_wallpaper_preview_title"
+ android:colorMode="wideColorGamut"
android:theme="@style/Preview" />
</application>
diff --git a/res/drawable/ic_device.xml b/res/drawable/ic_device.xml
index 82a69cb..6a48bbd 100644
--- a/res/drawable/ic_device.xml
+++ b/res/drawable/ic_device.xml
@@ -21,7 +21,7 @@
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" />
+ android:fillColor="#FF000000"
+ android:pathData="M17,1.01L7,1C5.9,1 5,1.9 5,3v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3C19,1.9 18.1,1.01 17,1.01zM17,21H7l0,-1h10V21zM17,18H7V6h10V18zM7,4V3h10v1H7z"/>
</vector>
diff --git a/res/drawable/ic_home.xml b/res/drawable/ic_home.xml
index 5eb2e92..4e6c73b 100644
--- a/res/drawable/ic_home.xml
+++ b/res/drawable/ic_home.xml
@@ -21,7 +21,7 @@
android:tint="?android:attr/colorAccent">
<path
- android:fillColor="#FFFFFFFF"
- android:pathData="M10 20v-6h4v6h5v-8h3L12 3 2 12h3v8z" />
+ android:fillColor="#FF000000"
+ android:pathData="M12,3L4,9v12h16V9L12,3zM18,19h-3v-6H9v6H6v-9l6,-4.5l6,4.5V19z"/>
</vector>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
new file mode 100644
index 0000000..11d49ec
--- /dev/null
+++ b/res/values-en-rCA/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+* Copyright (C) 2008 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 xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="application_name" msgid="4119979710394894209">"Live Wallpaper Picker"</string>
+ <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Select live wallpaper"</string>
+ <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Live wallpapers"</string>
+ <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Live wallpaper preview"</string>
+ <string name="configure_wallpaper" msgid="7396598925806288258">"Settings…"</string>
+ <string name="wallpaper_instructions" msgid="4215640646180727542">"Set wallpaper"</string>
+ <string name="live_wallpaper_empty" msgid="4278728108785853407">"No live wallpapers."</string>
+ <string name="set_live_wallpaper" msgid="2381437614949033266">"Set wallpaper"</string>
+ <string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> by <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
+ <string name="live_wallpaper_loading" msgid="2488371303130330734">"Loading live wallpaper…"</string>
+ <string name="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-rXC/strings.xml b/res/values-en-rXC/strings.xml
new file mode 100644
index 0000000..8f6082e
--- /dev/null
+++ b/res/values-en-rXC/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+* Copyright (C) 2008 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 xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="application_name" msgid="4119979710394894209">"Live Wallpaper Picker"</string>
+ <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Select live wallpaper"</string>
+ <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Live Wallpapers"</string>
+ <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Live wallpaper preview"</string>
+ <string name="configure_wallpaper" msgid="7396598925806288258">"Settings…"</string>
+ <string name="wallpaper_instructions" msgid="4215640646180727542">"Set wallpaper"</string>
+ <string name="live_wallpaper_empty" msgid="4278728108785853407">"No live wallpapers."</string>
+ <string name="set_live_wallpaper" msgid="2381437614949033266">"Set wallpaper"</string>
+ <string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> by <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
+ <string name="live_wallpaper_loading" msgid="2488371303130330734">"Loading live wallpaper…"</string>
+ <string name="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-gu/strings.xml b/res/values-gu/strings.xml
index a42c0a7..8b924fe 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -22,7 +22,7 @@
<string name="application_name" msgid="4119979710394894209">"લાઇવ વૉલપેપર પીકર"</string>
<string name="live_wallpaper_picker_title" msgid="4811278937634144675">"લાઇવ વૉલપેપર પસંદ કરો"</string>
<string name="live_wallpaper_picker_label" msgid="3218000114890071946">"લાઇવ વૉલપેપર્સ"</string>
- <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"લાઇવ વૉલપેપર પૂર્વાવલોકન"</string>
+ <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"લાઇવ વૉલપેપર પ્રીવ્યૂ"</string>
<string name="configure_wallpaper" msgid="7396598925806288258">"સેટિંગ્સ…"</string>
<string name="wallpaper_instructions" msgid="4215640646180727542">"વૉલપેપર સેટ કરો"</string>
<string name="live_wallpaper_empty" msgid="4278728108785853407">"કોઈ લાઇવ વૉલપેપર્સ નથી."</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 9e1cb1e..fc417f2 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -30,7 +30,7 @@
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> வழங்கியது <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"நேரலை வால்பேப்பரை ஏற்றுகிறது…"</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"முகப்புத் திரை"</string>
- <string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"முகப்புத் திரையும் பூட்டுத் திரையும்"</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/src/com/android/wallpaper/livepicker/LiveWallpaperActivity.java b/src/com/android/wallpaper/livepicker/LiveWallpaperActivity.java
index 9dd29c4..cc4ffd6 100644
--- a/src/com/android/wallpaper/livepicker/LiveWallpaperActivity.java
+++ b/src/com/android/wallpaper/livepicker/LiveWallpaperActivity.java
@@ -42,7 +42,10 @@
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == REQUEST_PREVIEW) {
- if (resultCode == RESULT_OK) finish();
+ if (resultCode == RESULT_OK) {
+ setResult(resultCode);
+ finish();
+ }
}
}
