diff options
author | Oren Blasberg <orenb@google.com> | 2017-06-28 21:22:06 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-06-28 21:22:06 +0000 |
commit | db162ddd0ff5beaf05cd98198c7cf3a5f24f5d42 (patch) | |
tree | 7e6ee41606d245101a3acf5ba2631a55a1ac3aea | |
parent | da78695f440cca1d3efdf880d9ceda4a2245b09f (diff) | |
parent | 8cb186859f3d9f39c9dfec4bb560179636f301f9 (diff) | |
download | android_packages_wallpapers_LivePicker-db162ddd0ff5beaf05cd98198c7cf3a5f24f5d42.tar.gz android_packages_wallpapers_LivePicker-db162ddd0ff5beaf05cd98198c7cf3a5f24f5d42.tar.bz2 android_packages_wallpapers_LivePicker-db162ddd0ff5beaf05cd98198c7cf3a5f24f5d42.zip |
Update LivePicker "back arrow" vector asset. am: 21f3494cac
am: 8cb186859f
Change-Id: If8e387f579accd5788a2b1f16240709d4b9da9d6
-rw-r--r-- | res/drawable/ic_arrow_back_white_24dp.xml | 24 | ||||
-rw-r--r-- | src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java | 8 |
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); |