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

Commit bc420190 authored by Jay Aliomer's avatar Jay Aliomer
Browse files

Exception when applying the two new icon shapes 

Removed android:targeName from manifest

Fixes: 152816801
Test: manual
Change-Id: I5457269e98b27b875c96d45ab3d5b858e8908715
parent 8f18999a

packages/overlays/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ LOCAL_REQUIRED_MODULES := \ 
	IconPackRoundedSettingsOverlay \

	IconPackRoundedSystemUIOverlay \

	IconPackRoundedThemePickerOverlay \

        IconShapeFlowerOverlay \

        IconShapeHexagonOverlay \

	IconShapeRoundedRectOverlay \

	IconShapeSquircleOverlay \

	IconShapeTaperedRectOverlay \

packages/overlays/IconShapeFlowerOverlay/AndroidManifest.xml

0 → 100644
+26 −0
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

+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
+27 −0
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

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