Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46f85019 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Change MaskableIconDrawable to AdaptiveIconDrawable"

parents 76cf6f9a da6dac80

res/drawable/ic_launcher_settings.xml

+2 −2
Original line number Diff line number Diff line 
<?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

+2 −2
Original line number Diff line number Diff line
@@ -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>

res/drawable/ic_shortcut_data_usage.xml

+2 −2
Original line number Diff line number Diff line
@@ -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>

res/drawable/ic_shortcut_wireless.xml

+2 −2
Original line number Diff line number Diff line
@@ -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>

src/com/android/settings/CreateShortcut.java

+0 −1
Original line number Diff line number Diff line
@@ -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;