From: Po Lu <luangruo@yahoo.com>
Date: Sun, 30 Jun 2024 15:11:19 +0000 (+0800)
Subject: Improve Android "adaptive icon"
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b8065e69d0017e6a550eb01cfcde912bc32bcc13;p=emacs.git

Improve Android "adaptive icon"

* java/res/drawable/emacs_background.xml:

* java/res/drawable/emacs_foreground.xml: Transform borders and
gradient colors to better align with the original.

(cherry picked from commit 64851d101a854e00c68f3e9259d70777e7b26cb2)
---

diff --git a/java/res/drawable/emacs_background.xml b/java/res/drawable/emacs_background.xml
index 448ca48d1cb..c6b6decc3b0 100644
--- a/java/res/drawable/emacs_background.xml
+++ b/java/res/drawable/emacs_background.xml
@@ -21,22 +21,26 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>. -->
 	xmlns:aapt="http://schemas.android.com/aapt"
 	android:width="108dp"
 	android:height="108dp"
-	android:viewportWidth="512"
-	android:viewportHeight="512">
-  <path
-      android:pathData="M-4.99,-5.79h521.12v526.76h-521.12z"
-      android:strokeWidth="10.6667">
+	android:viewportWidth="108"
+	android:viewportHeight="108">
+  <path android:pathData="M0,0h108v108h-108z"
+	android:strokeWidth="0"
+	android:strokeColor="#00000000">
     <aapt:attr name="android:fillColor">
-      <gradient
-          android:startX="0"
-          android:startY="0"
-          android:endX="512"
-          android:endY="512"
-          android:type="linear">
+      <gradient android:startX="28.44"
+		android:startY="22.95"
+		android:endX="75.57"
+		android:endY="86.47"
+		android:type="linear">
         <item android:offset="0" android:color="#FF8381C5"/>
-        <item android:offset="0.64" android:color="#FE806BBC"/>
+        <item android:offset="0.64" android:color="#FE7E55B3"/>
         <item android:offset="1" android:color="#FDA52ECB"/>
       </gradient>
     </aapt:attr>
   </path>
+  <path
+      android:pathData="m0,0v108h108v-108zM54,21a33,33 0,0 1,33 33,33 33,0 0,1 -33,33 33,33 0,0 1,-33 -33,33 33,0 0,1 33,-33z"
+      android:strokeWidth="0"
+      android:fillColor="#ffffff"
+      android:strokeColor="#ffffff"/>
 </vector>
diff --git a/java/res/drawable/emacs_foreground.xml b/java/res/drawable/emacs_foreground.xml
index d4d71f8e29a..06a03240e28 100644
--- a/java/res/drawable/emacs_foreground.xml
+++ b/java/res/drawable/emacs_foreground.xml
@@ -21,19 +21,13 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>. -->
 	xmlns:aapt="http://schemas.android.com/aapt"
 	android:width="108dp"
 	android:height="108dp"
-	android:viewportWidth="512"
-	android:viewportHeight="512">
-  <group android:scaleX="0.6"
-	 android:scaleY="0.6"
-	 android:translateX="102.4"
-	 android:translateY="102.4">
-    <path
-        android:pathData="m174.83,422.11c0,0 19.74,1.4 45.13,-0.84 10.28,-0.91 49.33,-4.74 78.52,-11.14 0,0 35.59,-7.62 54.63,-14.63 19.92,-7.34 30.76,-13.57 35.64,-22.4 -0.21,-1.81 1.5,-8.22 -7.68,-12.08 -23.49,-9.85 -50.73,-8.07 -104.63,-9.21 -59.78,-2.05 -79.66,-12.06 -90.26,-20.12 -10.16,-8.18 -5.05,-30.79 38.47,-50.71 21.92,-10.61 107.87,-30.19 107.87,-30.19 -28.95,-14.31 -82.92,-39.46 -94.01,-44.89 -9.73,-4.76 -25.3,-11.94 -28.68,-20.61 -3.83,-8.33 9.04,-15.51 16.22,-17.56 23.14,-6.68 55.82,-10.83 85.55,-11.29 14.95,-0.23 17.37,-1.2 17.37,-1.2 20.62,-3.42 34.2,-17.53 28.54,-39.88 -5.08,-22.81 -31.86,-36.21 -57.31,-31.57 -23.97,4.37 -81.74,21.15 -81.74,21.15 71.41,-0.62 83.36,0.57 88.7,8.04 3.15,4.41 -1.43,10.45 -20.48,13.56 -20.73,3.39 -63.83,7.46 -63.83,7.46 -41.34,2.46 -70.47,2.62 -79.2,21.11 -5.71,12.08 6.09,22.76 11.25,29.45 21.84,24.29 53.39,37.39 73.69,47.04 7.64,3.63 30.06,10.48 30.06,10.48 -65.88,-3.62 -113.4,16.61 -141.28,39.9 -31.53,29.16 -17.58,63.92 47.01,85.33 38.15,12.64 57.07,18.59 113.98,13.46 33.52,-1.81 38.8,-0.73 39.14,2.02 0.47,3.87 -37.23,13.49 -47.52,16.46 -26.19,7.55 -94.83,22.8 -95.17,22.88z"
-        android:strokeLineJoin="miter"
-        android:strokeWidth="0"
-        android:fillColor="#ffffff"
-        android:strokeColor="#a0000000"
-        android:fillType="evenOdd"
-        android:strokeLineCap="butt"/>
-  </group>
+	android:viewportWidth="108"
+	android:viewportHeight="108">
+  <path android:pathData="m44.28,77.94c0,0 2.74,0.2 6.25,-0.12 1.42,-0.13 6.84,-0.67 10.88,-1.57 0,0 4.93,-1.08 7.57,-2.07 2.76,-1.04 4.26,-1.92 4.94,-3.17 -0.03,-0.26 0.21,-1.16 -1.06,-1.71C69.6,67.91 65.83,68.17 58.36,68 50.07,67.71 47.32,66.3 45.85,65.16 44.44,64.01 45.15,60.81 51.18,57.99 54.22,56.5 66.13,53.73 66.13,53.73 62.12,51.71 54.64,48.15 53.1,47.39 51.75,46.71 49.6,45.7 49.13,44.47c-0.53,-1.18 1.25,-2.19 2.25,-2.48 3.21,-0.94 7.73,-1.53 11.86,-1.6 2.07,-0.03 2.41,-0.17 2.41,-0.17 2.86,-0.48 4.74,-2.48 3.96,-5.64 -0.7,-3.22 -4.42,-5.12 -7.94,-4.46 -3.32,0.62 -11.33,2.99 -11.33,2.99 9.89,-0.09 11.55,0.08 12.29,1.14 0.44,0.62 -0.2,1.48 -2.84,1.92 -2.87,0.48 -8.85,1.05 -8.85,1.05 -5.73,0.35 -9.76,0.37 -10.98,2.98 -0.79,1.71 0.84,3.22 1.56,4.16 3.03,3.43 7.4,5.28 10.21,6.65 1.06,0.51 4.17,1.48 4.17,1.48 -9.13,-0.51 -15.71,2.35 -19.58,5.64 -4.37,4.12 -2.44,9.03 6.51,12.06 5.29,1.79 7.91,2.63 15.79,1.9 4.64,-0.26 5.38,-0.1 5.42,0.29 0.07,0.55 -5.16,1.91 -6.59,2.33 -3.63,1.07 -13.14,3.22 -13.19,3.23z"
+	android:strokeLineJoin="miter"
+	android:strokeWidth="0"
+	android:fillColor="#ffffff"
+	android:strokeColor="#00000000"
+	android:fillType="evenOdd"
+	android:strokeLineCap="butt"/>
 </vector>