From 8a460c90cd76ac44456c30a1dc7e01a1d49174e1 Mon Sep 17 00:00:00 2001
From: Michael Weghorn <m.weghorn@posteo.de>
Date: Fri, 17 Nov 2023 09:04:09 +0100
Subject: [PATCH] android: Reuse launcher icon in activities

Instead of duplicating the icon as drawable,
just use the one from the mipmap folder that's
used for the app launcher.

Change-Id: Idd6691c4639fb570357280cec63636d07fe06b20
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159553
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
(cherry picked from commit 2905d0f31c3e12463c68d5a805ee61dc7af0e5e9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159572
Tested-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
---
 android/source/res/drawable-hdpi/lo_icon.png             | Bin 1950 -> 0 bytes
 android/source/res/drawable-mdpi/lo_icon.png             | Bin 1180 -> 0 bytes
 .../src/java/org/libreoffice/AboutDialogFragment.java    |   2 +-
 .../src/java/org/libreoffice/ToolbarController.java      |   2 +-
 .../java/org/libreoffice/ui/LibreOfficeUIActivity.java   |   2 +-
 5 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 android/source/res/drawable-hdpi/lo_icon.png
 delete mode 100644 android/source/res/drawable-mdpi/lo_icon.png

diff --git a/android/source/res/drawable-hdpi/lo_icon.png b/android/source/res/drawable-hdpi/lo_icon.png
deleted file mode 100644
index d03373b9c2ee1d105ba69cceaa72b30a02dd3cd1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcwPel00001

literal 1950
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
H3D5j5k$I-=

diff --git a/android/source/res/drawable-mdpi/lo_icon.png b/android/source/res/drawable-mdpi/lo_icon.png
deleted file mode 100644
index 48e90bd1fdc56495da27be31e9ce1f6825f92538..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcwPel00001

literal 1180
zcwPaV1Y`S&P)<h;3K|Lk000e1NJLTq001xm001xu0{{R3VB86{00004XF*Lt006O%
z3;baP0004!P)t-s00020s;XvYW>r;HfPjE;adD20j(ufYd}CaYg@TH6Z-s@0ePmsJ
zW?g<~Uwvm@e`sKZg@uWUiG5^Ug@uKNhK7cQhK`PohlhuXii(Jch=_=Yhlht^O-6@@
zhlz=aii(Phi;Hx0baiH9jg5_sjg3D)KR`f0K|w)6LPA4BLqtSGMMXtPNl8vlPESuy
zP*6}&QBhJ-Qd3h?RaI41R#sP6S6NwET3T9LR8d=7TVhN_VogP3Ohsc&MPp4yV@^h6
zPDf-;Mr2M$WKKwAPe^1?NMvMWWlu+CPf2A^NoG+>X;VyWY;0|9ZEkLEZ*OmKaBy*P
zadK&9a&mHWYG-qEb97u&bZTdGYiM+IbaiNBb!%yLb#-=jc6fMrdU|?$VOV@)T6}zb
zeSLj?etv&{e}RF4g@uKSi;IkmjE#+rj*gCxkB{2g+S}XP+}zyV-QDBk<K^Y$=H}+-
z=jZ6?=;`U{>gww3?CkFD?(p#N@$vEU^78ZZ^Yrxe_4W1k_V)Mp_xSku`T6<!`uhHd
z-(Ua$048)&PE!B_1qKKS34@T8pR2O6w6(RkxVpN!yu7`=zQ4f1!otMG{QUj?O~w$~
z0007mNkl<ZNXN~RXG7CK9L7^X+~VGQ72LFdyC9>0+N3EVO4U;LZc`Cwa(4;(y}gxO
za(DGLPYSR8zh|U1jCHF6pNT#(eIz=!yWcQ2pZ)Nj>5v4xa)}(*p{mttw%t6{Z)|y5
zrLwGs1i0>Bu0LGA-Zf5c$n9i=Wm*alMbTOmGNBM5^z-er6PQ@Cu)k%RDzFwsA*Lb<
z5aP!hLJTZne^Uogg%J;+#OwO;zTA$-rlkc!n!r0@L4>})tRKb1q9(y{LPp>R@ezb*
z){pe%wlC@c+CCDS2?61^X8mw)Zrg$`fhY=-2@nzh6YfDwJUOGO6x;L3ECQ}J-Tl3}
zO&j$IsaFJf23TEo_Vp;gB>{-VkO{0TyL%O)=EUZ_4T}H-04oh=SC0lj$ybmG!1~&7
zw#q;a#mAWe_?{qNW>0GXdYx$$Cjf9`RtD_YoSvrpfB-+Ew<N%}5fa{{5MqltQ@q{<
z;N>$3B%?T{0Nj@apv<)%;J*dYUo5~XXcCex?0vEq3OS=BRI4y;50bBd1*i!a$O>d8
zbOC_473U<v4+^9D1dz0ciG8<9)E9!Ze|+u-z9xa5iar4)_~gJZ%79hn=1F^ApZJpv
zV+sI(s2;Zwz_5~FiA(Oy0(|o4s~Zx4w@<z?IvI~1kpVO1oNT4;B)}h*0n=pnAjSBc
z!1}Fhz(5ecc45!1$^UC=LXf>?cL6J;trVnu#avbhSNbmy2k?8kK?W+7PRAo3{CHlc
z?RjmlP1M4lR=ago1{NwKS1w<=$aMj0XlRfrpC3G*FWi)XJujX=dibDRF5fRt&&<zH
u&)gfInwu+4PL?Jn?vzTm?;bPOt^NVDrevHUq}mSv0000<MNUMnLSTZXSt!2%

diff --git a/android/source/src/java/org/libreoffice/AboutDialogFragment.java b/android/source/src/java/org/libreoffice/AboutDialogFragment.java
index 9695d1e9d650..6bac113cc59e 100644
--- a/android/source/src/java/org/libreoffice/AboutDialogFragment.java
+++ b/android/source/src/java/org/libreoffice/AboutDialogFragment.java
@@ -70,7 +70,7 @@ public class AboutDialogFragment extends DialogFragment {
         }
 
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-        builder .setIcon(R.drawable.lo_icon)
+        builder .setIcon(R.mipmap.ic_launcher)
                 .setTitle(R.string.app_name)
                 .setView(messageView)
                 .setNegativeButton(R.string.about_license, new DialogInterface.OnClickListener() {
diff --git a/android/source/src/java/org/libreoffice/ToolbarController.java b/android/source/src/java/org/libreoffice/ToolbarController.java
index 5d2f9823ad1f..603d2258167e 100644
--- a/android/source/src/java/org/libreoffice/ToolbarController.java
+++ b/android/source/src/java/org/libreoffice/ToolbarController.java
@@ -146,7 +146,7 @@ public class ToolbarController implements Toolbar.OnMenuItemClickListener {
             @Override
             public void run() {
                 mMainMenu.setGroupVisible(R.id.group_edit_actions, false);
-                mToolbarTop.setNavigationIcon(R.drawable.lo_icon);
+                mToolbarTop.setNavigationIcon(R.mipmap.ic_launcher);
                 mToolbarTop.setLogo(null);
                 setEditModeOn(false);
                 mContext.hideBottomToolbar();
diff --git a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
index 0539a920b307..eba618095045 100644
--- a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
+++ b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
@@ -175,7 +175,7 @@ public class LibreOfficeUIActivity extends AppCompatActivity implements Settings
         ActionBar actionBar = getSupportActionBar();
 
         if (actionBar != null) {
-            actionBar.setIcon(R.drawable.lo_icon);
+            actionBar.setIcon(R.mipmap.ic_launcher);
         }
 
         editFAB = findViewById(R.id.editFAB);
-- 
2.11.4.GIT