Make AdaptiveIconDrawable to read in config_icon_mask at non boot time (a6ceda2e) · Commits · e / os / android_frameworks_base

graphics/java/android/graphics/drawable/AdaptiveIconDrawable.java

+9 −5

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package android.graphics.drawable;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.TestApi;
		import android.app.ActivityThread;
		import android.content.pm.ActivityInfo.Config;
		import android.content.res.ColorStateList;
		import android.content.res.Resources;
		@@ -150,11 +151,14 @@ public class AdaptiveIconDrawable extends Drawable implements Drawable.Callback
		*/
		AdaptiveIconDrawable(@Nullable LayerState state, @Nullable Resources res) {
		mLayerState = createConstantState(state, res);

		if (sMask == null) {
		sMask = PathParser.createPathFromPathData(
		Resources.getSystem().getString(R.string.config_icon_mask));
		}
		// config_icon_mask from context bound resource may have been chaged using
		// OverlayManager. Read that one first.
		Resources r = ActivityThread.currentActivityThread() == null
		? Resources.getSystem()
		: ActivityThread.currentActivityThread().getApplication().getResources();
		// TODO: either make sMask update only when config_icon_mask changes OR
		// get rid of it all-together in layoutlib
		sMask = PathParser.createPathFromPathData(r.getString(R.string.config_icon_mask));
		mMask = new Path(sMask);
		mMaskScaleOnly = new Path(mMask);
		mMaskMatrix = new Matrix();

0 → 100644

+30 −0

Original line number	Diff line number	Diff line
		#
		# Copyright 2018, The Android Open Source Project
		#
		# Licensed under the Apache License, Version 2.0 (the "License");
		# you may not use this file except in compliance with the License.
		# You may obtain a copy of the License at
		#
		# http://www.apache.org/licenses/LICENSE-2.0
		#
		# Unless required by applicable law or agreed to in writing, software
		# distributed under the License is distributed on an "AS IS" BASIS,
		# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		# See the License for the specific language governing permissions and
		# limitations under the License.
		#

		LOCAL_PATH:= $(call my-dir)
		include $(CLEAR_VARS)

		LOCAL_RRO_THEME := SquareIcon
		LOCAL_CERTIFICATE := platform

		LOCAL_SRC_FILES := $(call all-subdir-java-files)

		LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res

		LOCAL_PACKAGE_NAME := SquareIconOverlay
		LOCAL_SDK_VERSION := current

		include $(BUILD_RRO_PACKAGE)

0 → 100644

+27 −0

Original line number	Diff line number	Diff line
		<!--
		/**
		* Copyright (c) 2018, The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		-->
		<manifest xmlns:android="http://schemas.android.com/apk/res/android"
		package="com.android.theme.icon.square"
		android:versionCode="1"
		android:versionName="1.0">
		<overlay android:targetPackage="android"
		android:category="android.theme.customization.adaptive_icon_shape"
		android:priority="1"/>

		<application android:label="@string/square_icon_overlay" android:hasCode="false"/>
		</manifest>

0 → 100644

+26 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		/*
		** Copyright 2018, The Android Open Source Project
		**
		** Licensed under the Apache License, Version 2.0 (the "License");
		** you may not use this file except in compliance with the License.
		** You may obtain a copy of the License at
		**
		** http://www.apache.org/licenses/LICENSE-2.0
		**
		** Unless required by applicable law or agreed to in writing, software
		** distributed under the License is distributed on an "AS IS" BASIS,
		** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		** See the License for the specific language governing permissions and
		** limitations under the License.
		*/
		-->
		<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
		<!-- Specifies the path that is used by AdaptiveIconDrawable class to crop launcher icons. -->
		<string name="config_icon_mask" translatable="false">"M50,0L100,0 100,100 0,100 0,0z"</string>
		<!-- Flag indicating whether round icons should be parsed from the application manifest. -->
		<bool name="config_useRoundIcon">false</bool>

		</resources>

0 → 100644

+23 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		/**
		* Copyright (c) 2018, The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		-->
		<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
		<!-- Square icon overlay [DO NOT TRANSLATE] -->
		<string name="square_icon_overlay">Square Icons</string>

		</resources>