Merge "Change MaskableIconDrawable to AdaptiveIconDrawable"

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>

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>
+</adaptive-icon>

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>
+</adaptive-icon>

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>
+</adaptive-icon>

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;