Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fef1ec04 authored by Jay Aliomer's avatar Jay Aliomer Committed by Automerger Merge Worker
Browse files

Merge "resolve merge conflicts of 6091e483 to... 

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

Change-Id: Ic27d006029d8c7055cbd568d89ecff669f09a69e
parents 68ed4147 877bbc5e

packages/overlays/IconShapeHeartOverlay/AndroidManifest.xml

+0 −1
Original line number Diff line number Diff line
@@ -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"/>

packages/overlays/IconShapeHexagonOverlay/AndroidManifest.xml

0 → 100644
+0 −0

Empty file added.

packages/overlays/IconShapePebbleOverlay/AndroidManifest.xml

+0 −1
Original line number Diff line number Diff line
@@ -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"/>