Import translations. DO NOT MERGE am: 5afd06f076 -s ours
am: 79de5f7cc8 -s ours
Change-Id: I962b434b9fbb4ed18b6b9eda8cb4e6de0e7c1636
diff --git a/res/drawable/ic_arrow_back_white_24dp.xml b/res/drawable/ic_arrow_back_white_24dp.xml
new file mode 100644
index 0000000..6e3f196
--- /dev/null
+++ b/res/drawable/ic_arrow_back_white_24dp.xml
@@ -0,0 +1,24 @@
+<!--
+ ~ Copyright (C) 2017 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="M20,11H7.62l4.88,-4.88c0.39,-0.39 0.39,-1.02 0,-1.41s-1.02,-0.39 -1.41,0l0,0l-6.94,6.94c-0.2,0.2 -0.2,0.51 0,0.71l6.94,6.94c0.39,0.39 1.02,0.39 1.41,0s0.39,-1.02 0,-1.41L7.62,13H20c0.55,0 1,-0.45 1,-1S20.55,11 20,11z"/>
+</vector>
diff --git a/res/drawable/ic_keyboard_arrow_down_white_24dp.xml b/res/drawable/ic_keyboard_arrow_down_white_24dp.xml
index e4c2a23..45ab14a 100644
--- a/res/drawable/ic_keyboard_arrow_down_white_24dp.xml
+++ b/res/drawable/ic_keyboard_arrow_down_white_24dp.xml
@@ -1,5 +1,5 @@
<!--
- ~ Copyright (C) 2016 The Android Open Source Project
+ ~ Copyright (C) 2017 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.
@@ -20,5 +20,5 @@
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"/>
+ android:pathData="M8.12,9.29L12,13.17l3.88,-3.88a0.996,0.996 0,1 1,1.41 1.41l-4.59,4.59a0.996,0.996 0,0 1,-1.41 0L6.7,10.7a0.996,0.996 0,0 1,0 -1.41c0.39,-0.38 1.03,-0.39 1.42,0z"/>
</vector>
diff --git a/res/drawable/ic_keyboard_arrow_up_white_24dp.xml b/res/drawable/ic_keyboard_arrow_up_white_24dp.xml
index d7b3e13..434b8cd 100644
--- a/res/drawable/ic_keyboard_arrow_up_white_24dp.xml
+++ b/res/drawable/ic_keyboard_arrow_up_white_24dp.xml
@@ -1,5 +1,5 @@
<!--
- ~ Copyright (C) 2016 The Android Open Source Project
+ ~ Copyright (C) 2017 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.
@@ -20,5 +20,5 @@
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"/>
+ android:pathData="M15.88,14.71L12,10.83l-3.88,3.88c-0.39,0.39 -1.02,0.39 -1.41,0s-0.39,-1.02 0,-1.41l0,0l4.59,-4.59c0.39,-0.39 1.02,-0.39 1.41,0l0,0l4.59,4.59c0.39,0.39 0.39,1.02 0,1.41l0,0C16.91,15.09 16.27,15.1 15.88,14.71z"/>
</vector>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index b3595e5..7682346 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -21,11 +21,11 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="4119979710394894209">"Izbornik animiranih pozadinskih slika"</string>
<string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Odaberite animiranu pozadinsku sliku"</string>
- <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Aktivne pozadine"</string>
+ <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Animirane pozadinske slike"</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 pozadinsku sliku"</string>
- <string name="live_wallpaper_empty" msgid="4278728108785853407">"Nema aktivnih pozadina."</string>
+ <string name="live_wallpaper_empty" msgid="4278728108785853407">"Nema animiranih pozadinskih slika."</string>
<string name="set_live_wallpaper" msgid="2381437614949033266">"Postavi pozadinsku sliku"</string>
<string name="wallpaper_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čitavanje animirane pozadinske slike..."</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 7260950..11d49ec 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -21,7 +21,7 @@
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_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>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 7260950..11d49ec 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -21,7 +21,7 @@
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_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>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 7260950..11d49ec 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -21,7 +21,7 @@
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_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>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index df0b965..c327fa2 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -21,7 +21,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="4119979710394894209">"နောက်ခံပုံအရှင် ရွေးချယ်ခန်း"</string>
<string name="live_wallpaper_picker_title" msgid="4811278937634144675">"သက်ရှိနောက်ခံရွေးချယ်ခြင်း"</string>
- <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"နောက်ခံအရှင်များ"</string>
+ <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"သက်ဝင်နောက်ခံများ"</string>
<string name="live_wallpaper_preview_title" msgid="1130080613611954763">"နောက်ခံပုံအရှင် ကြိုကြည့်မယ်"</string>
<string name="configure_wallpaper" msgid="7396598925806288258">"ဆက်တင်များ"</string>
<string name="wallpaper_instructions" msgid="4215640646180727542">"နောက်ခံပုံ သတ်မှတ်ပါ"</string>
diff --git a/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java b/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java
index 3991a5c..6dab5c6 100644
--- a/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java
+++ b/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java
@@ -18,6 +18,7 @@
import android.app.Activity;
import android.app.AlertDialog;
+import android.app.WallpaperColors;
import android.app.WallpaperInfo;
import android.app.WallpaperManager;
import android.content.ActivityNotFoundException;
@@ -29,6 +30,7 @@
import android.content.pm.PackageManager;
import android.content.res.Resources.NotFoundException;
import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Bundle;
import android.os.IBinder;
@@ -118,10 +120,15 @@
mWallpaperIntent = new Intent(WallpaperService.SERVICE_INTERFACE)
.setClassName(info.getPackageName(), info.getServiceName());
- setActionBar((Toolbar) findViewById(R.id.toolbar));
+ Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+ setActionBar(toolbar);
getActionBar().setDisplayHomeAsUpEnabled(true);
getActionBar().setDisplayShowTitleEnabled(false);
+ Drawable backArrow = getResources().getDrawable(R.drawable.ic_arrow_back_white_24dp);
+ backArrow.setAutoMirrored(true);
+ toolbar.setNavigationIcon(backArrow);
+
mWallpaperManager = WallpaperManager.getInstance(this);
mWallpaperConnection = new WallpaperConnection(mWallpaperIntent);
@@ -432,7 +439,12 @@
}
mEngine = null;
}
- unbindService(this);
+ try {
+ unbindService(this);
+ } catch (IllegalArgumentException e) {
+ Log.w(LOG_TAG, "Can't unbind wallpaper service. "
+ + "It might have crashed, just ignoring.", e);
+ }
mService = null;
}
}
@@ -478,12 +490,17 @@
}
}
}
-
+
public ParcelFileDescriptor setWallpaper(String name) {
return null;
}
@Override
+ public void onWallpaperColorsChanged(WallpaperColors colors) throws RemoteException {
+
+ }
+
+ @Override
public void engineShown(IWallpaperEngine engine) throws RemoteException {
mLoading.post(() -> {
mLoading.animate()
