diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2023-11-17 09:04:09 +0100 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2023-11-18 08:52:31 +0100 |
| commit | 15fcde2490c21ef23d1c001c0fbfafc9cd939475 (patch) | |
| tree | 97db1fbae2efc2dcdaaa42889c3d1bfdeaf0ac3f /android | |
| parent | a3b6d954bb76a48adc7009b09681ea9008a92213 (diff) | |
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/+/159571
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'android')
| -rw-r--r-- | android/source/res/drawable-hdpi/lo_icon.png | bin | 1950 -> 0 bytes | |||
| -rw-r--r-- | android/source/res/drawable-mdpi/lo_icon.png | bin | 1180 -> 0 bytes | |||
| -rw-r--r-- | android/source/src/java/org/libreoffice/AboutDialogFragment.java | 2 | ||||
| -rw-r--r-- | android/source/src/java/org/libreoffice/ToolbarController.java | 2 | ||||
| -rw-r--r-- | android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java | 2 |
5 files changed, 3 insertions, 3 deletions
diff --git a/android/source/res/drawable-hdpi/lo_icon.png b/android/source/res/drawable-hdpi/lo_icon.png Binary files differdeleted file mode 100644 index d03373b9c2ee..000000000000 --- a/android/source/res/drawable-hdpi/lo_icon.png +++ /dev/null diff --git a/android/source/res/drawable-mdpi/lo_icon.png b/android/source/res/drawable-mdpi/lo_icon.png Binary files differdeleted file mode 100644 index 48e90bd1fdc5..000000000000 --- a/android/source/res/drawable-mdpi/lo_icon.png +++ /dev/null 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); |
