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

Commit 0602525c authored by Tracy Zhou's avatar Tracy Zhou Committed by Automerger Merge Worker
Browse files

Merge "Update icon shape for Sam" into rvc-dev am: 1bad4630 

Change-Id: I0b0ad731d0c5f0cfc496846a3622b42bc0a11e4e
parents eb284a2b 1bad4630

packages/overlays/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ LOCAL_REQUIRED_MODULES := \ 
	IconShapeRoundedRectOverlay \

	IconShapeSquircleOverlay \

	IconShapeTeardropOverlay \

	IconShapeVesselOverlay \

	NavigationBarMode3ButtonOverlay \

	NavigationBarModeGesturalOverlay \

	NavigationBarModeGesturalOverlayNarrowBack \

packages/overlays/IconShapeFlowerOverlay/Android.mk→packages/overlays/IconShapeVesselOverlay/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -17,13 +17,13 @@ 
LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)



LOCAL_RRO_THEME := IconShapeFlower

LOCAL_RRO_THEME := IconShapeVessel



LOCAL_PRODUCT_MODULE := true



LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res



LOCAL_PACKAGE_NAME := IconShapeFlowerOverlay

LOCAL_PACKAGE_NAME := IconShapeVesselOverlay

LOCAL_SDK_VERSION := current



include $(BUILD_RRO_PACKAGE)

packages/overlays/IconShapeFlowerOverlay/AndroidManifest.xml→packages/overlays/IconShapeVesselOverlay/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
  ~ limitations under the License.

  -->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

          package="com.android.theme.icon.flower"

          package="com.android.theme.icon.vessel"

          android:versionCode="1"

          android:versionName="1.0">

    <overlay
@@ -22,5 +22,5 @@ 
        android:category="android.theme.customization.adaptive_icon_shape"

        android:priority="1"/>



    <application android:label="@string/icon_shape_flower_overlay" android:hasCode="false"/>

    <application android:label="@string/icon_shape_vessel_overlay" android:hasCode="false"/>

</manifest>

packages/overlays/IconShapeFlowerOverlay/res/values/config.xml→packages/overlays/IconShapeVesselOverlay/res/values/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
  -->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <!-- Specifies the path that is used by AdaptiveIconDrawable class to crop launcher icons. -->

    <string name="config_icon_mask" translatable="false">"M50,0 C60.6,0 69.9,5.3 75.6,13.5 78.5,17.8 82.3,21.5 86.6,24.5 94.7,30.1 100,39.4 100,50 100,60.6 94.7,69.9 86.5,75.6 82.2,78.5 78.5,82.3 75.5,86.6 69.9,94.7 60.6,100 50,100 39.4,100 30.1,94.7 24.4,86.5 21.5,82.2 17.7,78.5 13.4,75.5 5.3,69.9 0,60.6 0,50 0,39.4 5.3,30.1 13.5,24.4 17.8,21.5 21.5,17.7 24.5,13.4 30.1,5.3 39.4,0 50,0 Z"</string>

    <string name="config_icon_mask" translatable="false">"M12.97,0 C8.41,0 4.14,2.55 2.21,6.68 -1.03,13.61 -0.71,21.78 3.16,28.46 4.89,31.46 4.89,35.2 3.16,38.2 -1.05,45.48 -1.05,54.52 3.16,61.8 4.89,64.8 4.89,68.54 3.16,71.54 -0.71,78.22 -1.03,86.39 2.21,93.32 4.14,97.45 8.41,100 12.97,100 21.38,100 78.62,100 87.03,100 91.59,100 95.85,97.45 97.79,93.32 101.02,86.39 100.71,78.22 96.84,71.54 95.1,68.54 95.1,64.8 96.84,61.8 101.05,54.52 101.05,45.48 96.84,38.2 95.1,35.2 95.1,31.46 96.84,28.46 100.71,21.78 101.02,13.61 97.79,6.68 95.85,2.55 91.59,0 87.03,0 78.62,0 21.38,0 12.97,0 Z"</string>

    <!-- Flag indicating whether round icons should be parsed from the application manifest. -->

    <bool name="config_useRoundIcon">false</bool>

    <!-- Corner radius of system dialogs -->

packages/overlays/IconShapeFlowerOverlay/res/values/strings.xml→packages/overlays/IconShapeVesselOverlay/res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
  ~ limitations under the License.

  -->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <!-- Flower icon overlay -->

    <string name="icon_shape_flower_overlay" translatable="false">Flower</string>

    <!-- Vessel icon overlay -->

    <string name="icon_shape_vessel_overlay" translatable="false">Vessel</string>



</resources>