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

Merge "resolve merge conflicts of 6091e48325 to rvc-d1-dev" into rvc-d1-dev am: 877bbc5ee9

Browse Source 
Change-Id: Ic27d006029d8c7055cbd568d89ecff669f09a69e
This commit is contained in:
Jay Aliomer
2020-04-20 00:04:43 +00:00
committed by Automerger Merge Worker
parent 68ed414780 877bbc5ee9
commit fef1ec04eb
3 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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