From da6dac806b3d935c2c5367667c83fc06493d7584 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Fri, 17 Feb 2017 11:32:34 -0800
Subject: [PATCH] Change MaskableIconDrawable to AdaptiveIconDrawable

Test: $ make -j31 dist

Bug: 35399620
Change-Id: I2f6632ea31e23a46ef57af569eb55e5a42df5028
---
 res/drawable/ic_launcher_settings.xml        | 4 ++--
 res/drawable/ic_shortcut_battery.xml         | 4 ++--
 res/drawable/ic_shortcut_data_usage.xml      | 4 ++--
 res/drawable/ic_shortcut_wireless.xml        | 4 ++--
 src/com/android/settings/CreateShortcut.java | 1 -
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/res/drawable/ic_launcher_settings.xml b/res/drawable/ic_launcher_settings.xml
index 57d54e5994c..7b09499c84e 100644
--- a/res/drawable/ic_launcher_settings.xml
+++ b/res/drawable/ic_launcher_settings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<maskable-icon xmlns:android="http://schemas.android.com/apk/res/android">
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="?android:attr/colorAccent"/>
     <foreground android:drawable="@mipmap/ic_launcher_settings"/>
-</maskable-icon>
+</adaptive-icon>
diff --git a/res/drawable/ic_shortcut_battery.xml b/res/drawable/ic_shortcut_battery.xml
index a61b1a3dc95..ffa9226aa4a 100644
--- a/res/drawable/ic_shortcut_battery.xml
+++ b/res/drawable/ic_shortcut_battery.xml
@@ -14,7 +14,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License
   -->
-<maskable-icon xmlns:android="http://schemas.android.com/apk/res/android">
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/shortcut_background"/>
     <foreground>
         <vector
@@ -30,4 +30,4 @@
             </group>
         </vector>
     </foreground>
-</maskable-icon>
\ No newline at end of file
+</adaptive-icon>
diff --git a/res/drawable/ic_shortcut_data_usage.xml b/res/drawable/ic_shortcut_data_usage.xml
index cc0c6bc8a83..36a148cb215 100644
--- a/res/drawable/ic_shortcut_data_usage.xml
+++ b/res/drawable/ic_shortcut_data_usage.xml
@@ -14,7 +14,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License
   -->
-<maskable-icon xmlns:android="http://schemas.android.com/apk/res/android">
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/shortcut_background"/>
     <foreground>
         <vector
@@ -31,4 +31,4 @@
             </group>
         </vector>
     </foreground>
-</maskable-icon>
\ No newline at end of file
+</adaptive-icon>
diff --git a/res/drawable/ic_shortcut_wireless.xml b/res/drawable/ic_shortcut_wireless.xml
index a5fc43a604f..2fd05a55816 100644
--- a/res/drawable/ic_shortcut_wireless.xml
+++ b/res/drawable/ic_shortcut_wireless.xml
@@ -14,7 +14,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License
   -->
-<maskable-icon xmlns:android="http://schemas.android.com/apk/res/android">
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/shortcut_background"/>
     <foreground>
         <vector
@@ -29,4 +29,4 @@
             </group>
         </vector>
     </foreground>
-</maskable-icon>
\ No newline at end of file
+</adaptive-icon>
diff --git a/src/com/android/settings/CreateShortcut.java b/src/com/android/settings/CreateShortcut.java
index bd7137772a9..7d5a6d218cd 100644
--- a/src/com/android/settings/CreateShortcut.java
+++ b/src/com/android/settings/CreateShortcut.java
@@ -29,7 +29,6 @@ import android.graphics.Bitmap;
 import android.graphics.Bitmap.Config;
 import android.graphics.Canvas;
 import android.graphics.drawable.Icon;
-import android.graphics.drawable.MaskableIconDrawable;
 import android.net.ConnectivityManager;
 import android.os.AsyncTask;
 import android.support.annotation.VisibleForTesting;