PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Change MaskableIconDrawable to AdaptiveIconDrawable"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-02-18 01:04:55 +00:00
committed by Android (Google) Code Review
parent 76cf6f9a68 da6dac806b
commit 46f850191f
5 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/drawable/ic_launcher_settings.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?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"/> <background android:drawable="?android:attr/colorAccent"/>
<foreground android:drawable="@mipmap/ic_launcher_settings"/> <foreground android:drawable="@mipmap/ic_launcher_settings"/>
</maskable-icon> </adaptive-icon>

4
res/drawable/ic_shortcut_battery.xml
View File

@@ -14,7 +14,7 @@
~ See the License for the specific language governing permissions and ~ See the License for the specific language governing permissions and
~ limitations under the License ~ 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"/> <background android:drawable="@color/shortcut_background"/>
<foreground> <foreground>
<vector <vector
@@ -30,4 +30,4 @@
</group> </group>
</vector> </vector>
</foreground> </foreground>
</maskable-icon> </adaptive-icon>

4
res/drawable/ic_shortcut_data_usage.xml
View File

@@ -14,7 +14,7 @@
~ See the License for the specific language governing permissions and ~ See the License for the specific language governing permissions and
~ limitations under the License ~ 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"/> <background android:drawable="@color/shortcut_background"/>
<foreground> <foreground>
<vector <vector
@@ -31,4 +31,4 @@
</group> </group>
</vector> </vector>
</foreground> </foreground>
</maskable-icon> </adaptive-icon>

4
res/drawable/ic_shortcut_wireless.xml
View File

@@ -14,7 +14,7 @@
~ See the License for the specific language governing permissions and ~ See the License for the specific language governing permissions and
~ limitations under the License ~ 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"/> <background android:drawable="@color/shortcut_background"/>
<foreground> <foreground>
<vector <vector
@@ -29,4 +29,4 @@
</group> </group>
</vector> </vector>
</foreground> </foreground>
</maskable-icon> </adaptive-icon>

1
src/com/android/settings/CreateShortcut.java
View File

@@ -29,7 +29,6 @@ import android.graphics.Bitmap;
import android.graphics.Bitmap.Config; import android.graphics.Bitmap.Config;
import android.graphics.Canvas; import android.graphics.Canvas;
import android.graphics.drawable.Icon; import android.graphics.drawable.Icon;
import android.graphics.drawable.MaskableIconDrawable;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.support.annotation.VisibleForTesting; import android.support.annotation.VisibleForTesting;