[Libreoffice-commits] core.git: android/source

[Michael Weghorn (via logerrit)]

 android/source/src/java/org/libreoffice/AboutDialogFragment.java      |    2 +-
 android/source/src/java/org/libreoffice/ToolbarController.java        |    2 +-
 android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java |    2 +-
 dev/null                                                              |binary
 4 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 129c493adc3d572e2417e62bc96d7b2cfbe0d983
Author:     Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Fri Nov 17 09:04:09 2023 +0100
Commit:     Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Fri Nov 17 12:35:38 2023 +0100

    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.wegh...@posteo.de>

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 d03373b9c2ee..000000000000
Binary files a/android/source/res/drawable-hdpi/lo_icon.png and /dev/null differ
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 48e90bd1fdc5..000000000000
Binary files a/android/source/res/drawable-mdpi/lo_icon.png and /dev/null differ
diff --git a/android/source/src/java/org/libreoffice/AboutDialogFragment.java 
b/android/source/src/java/org/libreoffice/AboutDialogFragment.java
index 4abf9c14a35f..4ed351026778 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);