summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2017-07-03 07:37:16 (GMT)
committerandroid-build-team Robot <android-build-team-robot@google.com>2017-07-03 07:37:16 (GMT)
commitad704f7ec2466125431c97b50ad8839175e9407b (patch)
tree7e6ee41606d245101a3acf5ba2631a55a1ac3aea
parent14cab79c7a3d2e278de158746091ab59bde4b291 (diff)
parent21f3494cac8e7c58f49dfa9980e7e1edfaf834e8 (diff)
downloadandroid_packages_wallpapers_LivePicker-ad704f7ec2466125431c97b50ad8839175e9407b.zip
android_packages_wallpapers_LivePicker-ad704f7ec2466125431c97b50ad8839175e9407b.tar.gz
android_packages_wallpapers_LivePicker-ad704f7ec2466125431c97b50ad8839175e9407b.tar.bz2
release-request-9336bb6f-90e7-478e-9d85-062ca3fdf6a3-for-git_oc-dr1-release-4152361 snap-temp-L91700000079439679
Change-Id: I3d9b052889865e7559d3642ec1e8141fbc0c19b5
-rw-r--r--res/drawable/ic_arrow_back_white_24dp.xml24
-rw-r--r--src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java8
2 files changed, 31 insertions, 1 deletions
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/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java b/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java
index a341cc4..baaa13c 100644
--- a/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java
+++ b/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java
@@ -30,6 +30,7 @@ import android.content.ServiceConnection;
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;
@@ -119,10 +120,15 @@ public class LiveWallpaperPreview extends Activity {
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);