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

Commit 57031bdf authored by Jay Aliomer's avatar Jay Aliomer
Browse files

resolve merge conflicts of 6091e483 to rvc-d1-dev 

Change-Id: I2f10d3be544d57ae0d1fd82c411118127a1f0af4
Bug: 153578676
parents 4f681b14 6091e483

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"/>