From e1fd5af2e5ac87d96dd32801afecafb43e851874 Mon Sep 17 00:00:00 2001
From: Mill Chen <millchen@google.com>
Date: Fri, 22 Feb 2019 20:40:52 +0800
Subject: [PATCH] Update wallpaper icon for SUW Anything else screen

A dot icon is displaying for "Change wallpaper" option on SUW Anything
else screen, the cause is that we updated new colorful icons for
homepage suggestions. So we changed the drawable back and deleted the
unused icon.

Bug: 125426694
Test: visual
Change-Id: I8cf6d6dda311a45362a47ea31dc352ba4d452f80
---
 AndroidManifest.xml                      |  2 +-
 res/drawable/ic_suggestion_wallpaper.xml | 25 ------------------------
 2 files changed, 1 insertion(+), 26 deletions(-)
 delete mode 100644 res/drawable/ic_suggestion_wallpaper.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a5586f7955e..e42715f7d1e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -788,7 +788,7 @@
 
         <activity android:name=".wallpaper.WallpaperSuggestionActivity"
                   android:label="@string/wallpaper_settings_title"
-                  android:icon="@drawable/ic_suggestion_wallpaper"
+                  android:icon="@drawable/ic_wallpaper"
                   android:theme="@android:style/Theme.NoDisplay">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/res/drawable/ic_suggestion_wallpaper.xml b/res/drawable/ic_suggestion_wallpaper.xml
deleted file mode 100644
index 32defcecdc1..00000000000
--- a/res/drawable/ic_suggestion_wallpaper.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-  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.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24"
-        android:viewportHeight="24"
-        android:tint="?android:attr/colorControlNormal">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M9,12.71l2.14,2.58l3,-3.87L18,16.57H6L9,12.71zM5,5h6V3H5C3.9,3 3,3.9 3,5v6h2V5zM19,19h-6v2h6c1.1,0 2,-0.9 2,-2v-6h-2V19zM5,19v-6H3v6c0,1.1 0.9,2 2,2h6v-2H5zM19,5v6h2V5c0,-1.1 -0.9,-2 -2,-2h-6v2H19zM16,9c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1c-0.55,0 -1,0.45 -1,1S15.45,9 16,9z"/>
-</vector>