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

Commit 795c0fe1 authored by Jay Aliomer's avatar Jay Aliomer
Browse files

Revert "Exception when applying the two new icon shapes" 

This reverts commit bc420190.

Reason for revert: Different code
Bug: 152816801
Change-Id: Ib050979672f2b1e539193132f1bef89e22483e8c
parent bc420190

packages/overlays/Android.mk

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

	IconPackRoundedSystemUIOverlay \

	IconPackRoundedThemePickerOverlay \

        IconShapeFlowerOverlay \

        IconShapeHexagonOverlay \

	IconShapeRoundedRectOverlay \

	IconShapeSquircleOverlay \

	IconShapeTaperedRectOverlay \

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