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

Commit d54bbafd authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Revert "Exception when applying the two new icon shapes"" into... 

Merge "Merge "Revert "Exception when applying the two new icon shapes"" into rvc-d1-dev am: 4f681b14" into rvc-d1-dev-plus-aosp am: 1d78e4d9 am: 5e0a579c

Change-Id: Ie0a0f8f92c800bddc5623d7cc14ba30add0dfd2a
parents 817d5b21 5e0a579c

packages/overlays/IconShapeFlowerOverlay/AndroidManifest.xml

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
<!--

  ~ 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>

packages/overlays/IconShapeHeartOverlay/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
    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

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
<!--

  ~ 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>

packages/overlays/IconShapePebbleOverlay/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
    android:versionName="1.0">

<overlay

        android:targetPackage="android"

        android:targetName="IconShapeCustomization"

        android:category="android.theme.customization.adaptive_icon_shape"

        android:priority="1"/>