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

Commit 8f81fadf authored by Tracy Zhou's avatar Tracy Zhou Committed by Automerger Merge Worker
Browse files

Merge "Update icon shapes for Sam and Victor" into rvc-d1-dev am: a7e8fd23 

Change-Id: If98c26ed1ddfbeaa7c27a7a98d0df3bf3f5662d1
parents ab45f1c0 a7e8fd23

packages/overlays/Android.mk

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

	IconPackRoundedSystemUIOverlay \

	IconPackRoundedThemePickerOverlay \

        IconShapeFlowerOverlay \

        IconShapeHexagonOverlay \

	IconShapeRoundedRectOverlay \

	IconShapeSquircleOverlay \

	IconShapeTaperedRectOverlay \

	IconShapeTeardropOverlay \

	IconShapeVesselOverlay \

	NavigationBarMode3ButtonOverlay \

	NavigationBarModeGesturalOverlay \

	NavigationBarModeGesturalOverlayNarrowBack \

packages/overlays/IconShapeHexagonOverlay/Android.mk→packages/overlays/IconShapeTaperedRectOverlay/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 := IconShapeHexagon

LOCAL_RRO_THEME := IconShapeTaperedRect



LOCAL_PRODUCT_MODULE := true



LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res



LOCAL_PACKAGE_NAME := IconShapeHexagonOverlay

LOCAL_PACKAGE_NAME := IconShapeTaperedRectOverlay

LOCAL_SDK_VERSION := current



include $(BUILD_RRO_PACKAGE)

packages/overlays/IconShapeHexagonOverlay/AndroidManifest.xml→packages/overlays/IconShapeTaperedRectOverlay/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
  -->



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

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

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

          android:versionCode="1"

          android:versionName="1.0">

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

        android:priority="1"/>



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

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

</manifest>

packages/overlays/IconShapeHexagonOverlay/res/values/config.xml→packages/overlays/IconShapeTaperedRectOverlay/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">"M12,0 88,0 100,50 88,100 12,100 0,50 12,0 Z"</string>

    <string name="config_icon_mask" translatable="false">"M20,0 80,0 100,20 100,80 80,100 20,100 0,80 0,20 20,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/IconShapeHexagonOverlay/res/values/strings.xml→packages/overlays/IconShapeTaperedRectOverlay/res/values/strings.xml

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

  -->

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

    <!-- Hexagon icon overlay -->

    <string name="icon_shape_hexagon_overlay" translatable="false">Hexagon</string>

    <!-- Tapered rect icon overlay -->

    <string name="icon_shape_tapered_rect_overlay" translatable="false">Tapered Rect</string>



</resources>