android/source/ic_launcher-web.png |binary
android/source/res/mipmap-hdpi/ic_launcher.png |binary
android/source/res/mipmap-mdpi/ic_launcher.png |binary
android/source/res/mipmap-xhdpi/ic_launcher.png |binary
android/source/res/mipmap-xxhdpi/ic_launcher.png |binary
android/source/res/mipmap-xxxhdpi/ic_launcher.png |binary
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
10 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit ea1ec1835b4f20c2de016dc06265a530df4e31b4
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Fri Nov 17 09:11:42 2023 +0100
Commit: Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Sat Nov 18 08:52:39 2023 +0100
android: Update app icon to new startcenter icon
Update the icon used for LibreOffice Viewer
with the new icon used since LibreOffice 7.5 [1].
Use the startcenter icon from `sysui/desktop/icons/hicolor/`
and export for the required resolutions where it doesn't exist
yet.
[1] https://wiki.documentfoundation.org/ReleaseNotes/7.5#Design
Change-Id: Ie9f59d42bbc9375e7ca433c6452223b7ba3033a8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159554
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
(cherry picked from commit 2105f638fa178f49210116bd914889599930b62a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159573
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
diff --git a/android/source/ic_launcher-web.png
b/android/source/ic_launcher-web.png
index e9dcfcacf844..82497c1ac299 100644
Binary files a/android/source/ic_launcher-web.png and
b/android/source/ic_launcher-web.png differ
diff --git a/android/source/res/mipmap-hdpi/ic_launcher.png
b/android/source/res/mipmap-hdpi/ic_launcher.png
index f8b74553e385..0765a1e0108e 100644
Binary files a/android/source/res/mipmap-hdpi/ic_launcher.png and
b/android/source/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/android/source/res/mipmap-mdpi/ic_launcher.png
b/android/source/res/mipmap-mdpi/ic_launcher.png
index fa68d30f003a..dcc03ff1fb2c 100644
Binary files a/android/source/res/mipmap-mdpi/ic_launcher.png and
b/android/source/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/android/source/res/mipmap-xhdpi/ic_launcher.png
b/android/source/res/mipmap-xhdpi/ic_launcher.png
index 12069c7e8ac5..d8fb1d912633 100644
Binary files a/android/source/res/mipmap-xhdpi/ic_launcher.png and
b/android/source/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/android/source/res/mipmap-xxhdpi/ic_launcher.png
b/android/source/res/mipmap-xxhdpi/ic_launcher.png
index a00a40dbe1de..7b9a8029aa40 100644
Binary files a/android/source/res/mipmap-xxhdpi/ic_launcher.png and
b/android/source/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/android/source/res/mipmap-xxxhdpi/ic_launcher.png
b/android/source/res/mipmap-xxxhdpi/ic_launcher.png
index ef7067cbd2a3..86d268ede8ef 100644
Binary files a/android/source/res/mipmap-xxxhdpi/ic_launcher.png and
b/android/source/res/mipmap-xxxhdpi/ic_launcher.png differ
commit 15fcde2490c21ef23d1c001c0fbfafc9cd939475
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Fri Nov 17 09:04:09 2023 +0100
Commit: Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Sat Nov 18 08:52:31 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>
(cherry picked from commit 2905d0f31c3e12463c68d5a805ee61dc7af0e5e9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159571
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
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 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);
