| commit | 806fbef0c68388c94c767078ba413d3f6eaf9834 | [log] [tgz] |
|---|---|---|
| author | Robin Lee <rgl@google.com> | Thu Feb 02 14:52:15 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Feb 02 14:52:16 2017 +0000 |
| tree | 9006c276e63a92e3843b08b78227db1be2fb0622 | |
| parent | 58543f1dd45afb1a70c594f41f9f703b8b0b8eaa [diff] | |
| parent | 728d0bc4a0118db753209d088dc65ac6f4705bcc [diff] |
Merge "Revert "Change launcher icons to MaskableIconDrawable Test: manual test""
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 382e362..4b8ee88 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml
@@ -83,7 +83,7 @@ <uses-permission android:name="android.permission.DELETE_PACKAGES"/> <application android:label="@string/settings_label" - android:icon="@drawable/ic_launcher_settings" + android:icon="@mipmap/ic_launcher_settings" android:taskAffinity="" android:theme="@style/Theme.Settings" android:hardwareAccelerated="true"
diff --git a/res/drawable/ic_launcher_settings.xml b/res/drawable/ic_launcher_settings.xml deleted file mode 100644 index fc63648..0000000 --- a/res/drawable/ic_launcher_settings.xml +++ /dev/null
@@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<maskable-icon xmlns:android="http://schemas.android.com/apk/res/android"> - <background android:color="?android:attr/colorAccent"/> - <foreground android:drawable="@mipmap/ic_launcher_settings"/> -</maskable-icon> \ No newline at end of file
diff --git a/res/mipmap-hdpi/ic_launcher_settings.png b/res/mipmap-hdpi/ic_launcher_settings.png index ddce98e..252e6b4 100644 --- a/res/mipmap-hdpi/ic_launcher_settings.png +++ b/res/mipmap-hdpi/ic_launcher_settings.png Binary files differ
diff --git a/res/mipmap-mdpi/ic_launcher_settings.png b/res/mipmap-mdpi/ic_launcher_settings.png index 86f3be8..d2ecee9 100644 --- a/res/mipmap-mdpi/ic_launcher_settings.png +++ b/res/mipmap-mdpi/ic_launcher_settings.png Binary files differ
diff --git a/res/mipmap-xhdpi/ic_launcher_settings.png b/res/mipmap-xhdpi/ic_launcher_settings.png index 360aa69..fa8c813 100644 --- a/res/mipmap-xhdpi/ic_launcher_settings.png +++ b/res/mipmap-xhdpi/ic_launcher_settings.png Binary files differ
diff --git a/res/mipmap-xxhdpi/ic_launcher_settings.png b/res/mipmap-xxhdpi/ic_launcher_settings.png index 7cb67a9..3fa69e9 100644 --- a/res/mipmap-xxhdpi/ic_launcher_settings.png +++ b/res/mipmap-xxhdpi/ic_launcher_settings.png Binary files differ
diff --git a/res/mipmap-xxxhdpi/ic_launcher_settings.png b/res/mipmap-xxxhdpi/ic_launcher_settings.png index 3fec9c4..72946b7 100644 --- a/res/mipmap-xxxhdpi/ic_launcher_settings.png +++ b/res/mipmap-xxxhdpi/ic_launcher_settings.png Binary files differ
