Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Exception when applying the two new icon shapes" into rvc-d1-dev am: 81f0e1056e

Browse Source 
Change-Id: I75406d0b5b7f2835b529b741f13c9b53428b4015
This commit is contained in:
TreeHugger Robot
2020-04-16 18:25:05 +00:00
committed by Automerger Merge Worker
parent 4f480e9b33 81f0e1056e
commit 7590c80c1c
5 changed files with 55 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/overlays/Android.mk
View File

@@ -45,6 +45,8 @@ LOCAL_REQUIRED_MODULES := \
IconPackRoundedSettingsOverlay \ IconPackRoundedSettingsOverlay \
IconPackRoundedSystemUIOverlay \ IconPackRoundedSystemUIOverlay \
IconPackRoundedThemePickerOverlay \ IconPackRoundedThemePickerOverlay \
IconShapeFlowerOverlay \
IconShapeHexagonOverlay \
IconShapeRoundedRectOverlay \ IconShapeRoundedRectOverlay \
IconShapeSquircleOverlay \ IconShapeSquircleOverlay \
IconShapeTaperedRectOverlay \ IconShapeTaperedRectOverlay \

26
packages/overlays/IconShapeFlowerOverlay/AndroidManifest.xml Normal file
View File

@@ -0,0 +1,26 @@
<!--
~ Copyright (C) 2020 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.flower"
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/icon_shape_flower_overlay" android:hasCode="false"/>
</manifest>

1
packages/overlays/IconShapeHeartOverlay/AndroidManifest.xml
View File

@@ -21,7 +21,6 @@
android:versionName="1.0"> android:versionName="1.0">
<overlay <overlay
android:targetPackage="android" android:targetPackage="android"
android:targetName="IconShapeCustomization"
android:category="android.theme.customization.adaptive_icon_shape" android:category="android.theme.customization.adaptive_icon_shape"
android:priority="1"/> android:priority="1"/>

27
packages/overlays/IconShapeHexagonOverlay/AndroidManifest.xml Normal file
View File

@@ -0,0 +1,27 @@
<!--
~ Copyright (C) 2020 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.hexagon"
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/icon_shape_hexagon_overlay" android:hasCode="false"/>
</manifest>

1
packages/overlays/IconShapePebbleOverlay/AndroidManifest.xml
View File

@@ -21,7 +21,6 @@
android:versionName="1.0"> android:versionName="1.0">
<overlay <overlay
android:targetPackage="android" android:targetPackage="android"
android:targetName="IconShapeCustomization"
android:category="android.theme.customization.adaptive_icon_shape" android:category="android.theme.customization.adaptive_icon_shape"
android:priority="1"/> android:priority="1"/>