android/source/res/layout/activity_document_browser.xml | 2 +-
android/source/res/layout/toolbar_bottom.xml | 12 ++++++------
android/source/res/layout/toolbar_color_picker.xml | 2 +-
android/source/res/menu/main.xml | 8 ++++----
4 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 59093ecb1cdf0ba8c946dfdbe0ec7ee0e89cd6f6
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Tue Nov 28 14:54:49 2023 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu Nov 30 12:16:51 2023 +0100
tdf#124480 android: Rename icons no longer using hard-coded color
As already mentioned in
Change-Id I2061878067d21dcd743ad6ca8d1018db323755d6
Author: Michael Weghorn <m.wegh...@posteo.de>
Date: Tue Nov 28 14:22:54 2023 +0100
tdf#124480 android: Use themed color for more icons
, do this:
> Given the icons are no longer hard-coded to be black,
> the files with a "_black" suffix will be renamed in
> a follow-up commit. (Separate commit to keep the
> diff clearer.)
Change-Id: Ie2d3433934569dc97530a35d88bda01802af96b6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160074
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/android/source/res/drawable/ic_add_black_24dp.xml
b/android/source/res/drawable/ic_add_24dp.xml
similarity index 100%
rename from android/source/res/drawable/ic_add_black_24dp.xml
rename to android/source/res/drawable/ic_add_24dp.xml
diff --git a/android/source/res/drawable/ic_arrow_back_black_24dp.xml
b/android/source/res/drawable/ic_arrow_back_24dp.xml
similarity index 100%
rename from android/source/res/drawable/ic_arrow_back_black_24dp.xml
rename to android/source/res/drawable/ic_arrow_back_24dp.xml
diff --git a/android/source/res/drawable/ic_content_copy_black_24dp.xml
b/android/source/res/drawable/ic_content_copy_24dp.xml
similarity index 100%
rename from android/source/res/drawable/ic_content_copy_black_24dp.xml
rename to android/source/res/drawable/ic_content_copy_24dp.xml
diff --git a/android/source/res/drawable/ic_content_cut_black_24dp.xml
b/android/source/res/drawable/ic_content_cut_24dp.xml
similarity index 100%
rename from android/source/res/drawable/ic_content_cut_black_24dp.xml
rename to android/source/res/drawable/ic_content_cut_24dp.xml
diff --git a/android/source/res/drawable/ic_content_paste_black_24dp.xml
b/android/source/res/drawable/ic_content_paste_24dp.xml
similarity index 100%
rename from android/source/res/drawable/ic_content_paste_black_24dp.xml
rename to android/source/res/drawable/ic_content_paste_24dp.xml
diff --git a/android/source/res/drawable/ic_filter_list_black_24dp.xml
b/android/source/res/drawable/ic_filter_list_24dp.xml
similarity index 100%
rename from android/source/res/drawable/ic_filter_list_black_24dp.xml
rename to android/source/res/drawable/ic_filter_list_24dp.xml
diff --git a/android/source/res/drawable/ic_folder_black_24dp.xml
b/android/source/res/drawable/ic_folder_24dp.xml
similarity index 100%
rename from android/source/res/drawable/ic_folder_black_24dp.xml
rename to android/source/res/drawable/ic_folder_24dp.xml
diff --git a/android/source/res/drawable/ic_format_clear_black_24dp.xml
b/android/source/res/drawable/ic_format_clear_24dp.xml
similarity index 100%
rename from android/source/res/drawable/ic_format_clear_black_24dp.xml
rename to android/source/res/drawable/ic_format_clear_24dp.xml
diff --git a/android/source/res/drawable/ic_grid_off_black_24dp.xml
b/android/source/res/drawable/ic_grid_off_24dp.xml
similarity index 100%
rename from android/source/res/drawable/ic_grid_off_black_24dp.xml
rename to android/source/res/drawable/ic_grid_off_24dp.xml
diff --git a/android/source/res/drawable/ic_grid_on_black_24dp.xml
b/android/source/res/drawable/ic_grid_on_24dp.xml
similarity index 100%
rename from android/source/res/drawable/ic_grid_on_black_24dp.xml
rename to android/source/res/drawable/ic_grid_on_24dp.xml
diff --git a/android/source/res/drawable/ic_settings_black_24dp.xml
b/android/source/res/drawable/ic_settings_24dp.xml
similarity index 100%
rename from android/source/res/drawable/ic_settings_black_24dp.xml
rename to android/source/res/drawable/ic_settings_24dp.xml
diff --git a/android/source/res/drawable/ic_sort_black_24dp.xml
b/android/source/res/drawable/ic_sort_24dp.xml
similarity index 100%
rename from android/source/res/drawable/ic_sort_black_24dp.xml
rename to android/source/res/drawable/ic_sort_24dp.xml
diff --git a/android/source/res/layout/activity_document_browser.xml
b/android/source/res/layout/activity_document_browser.xml
index b8c00cf973d0..5f03d4bc0c28 100644
--- a/android/source/res/layout/activity_document_browser.xml
+++ b/android/source/res/layout/activity_document_browser.xml
@@ -123,7 +123,7 @@
app:fabSize="normal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
- app:srcCompat="@drawable/ic_add_black_24dp"
+ app:srcCompat="@drawable/ic_add_24dp"
app:useCompatPadding="true" />
<LinearLayout
diff --git a/android/source/res/layout/toolbar_bottom.xml
b/android/source/res/layout/toolbar_bottom.xml
index ca9e0cf6e454..7efb5c0fc7fe 100644
--- a/android/source/res/layout/toolbar_bottom.xml
+++ b/android/source/res/layout/toolbar_bottom.xml
@@ -115,7 +115,7 @@
android:background="@drawable/image_button_background"
android:paddingBottom="12dp"
android:paddingTop="12dp"
-
app:srcCompat="@drawable/ic_format_clear_black_24dp" />
+
app:srcCompat="@drawable/ic_format_clear_24dp" />
</LinearLayout>
@@ -340,7 +340,7 @@
android:background="@drawable/image_button_background"
android:paddingBottom="12dp"
android:paddingTop="12dp"
-
app:srcCompat="@drawable/ic_folder_black_24dp" />
+ app:srcCompat="@drawable/ic_folder_24dp" />
<ImageButton
android:id="@+id/button_insert_table"
@@ -350,7 +350,7 @@
android:background="@drawable/image_button_background"
android:paddingBottom="12dp"
android:paddingTop="12dp"
-
app:srcCompat="@drawable/ic_grid_on_black_24dp" />
+ app:srcCompat="@drawable/ic_grid_on_24dp"
/>
<ImageButton
android:id="@+id/button_delete_table"
@@ -360,7 +360,7 @@
android:background="@drawable/image_button_background"
android:paddingBottom="12dp"
android:paddingTop="12dp"
-
app:srcCompat="@drawable/ic_grid_off_black_24dp" />
+ app:srcCompat="@drawable/ic_grid_off_24dp"
/>
</LinearLayout>
</ScrollView>
</LinearLayout>
@@ -515,7 +515,7 @@
android:layout_height="wrap_content"
android:background="@drawable/image_button_background"
android:padding="10dp"
- app:srcCompat="@drawable/ic_filter_list_black_24dp" />
+ app:srcCompat="@drawable/ic_filter_list_24dp" />
<ImageButton
android:id="@+id/button_send_UNO_commands_clear"
@@ -567,7 +567,7 @@
android:layout_height="wrap_content"
android:background="@drawable/image_button_background"
android:padding="10dp"
- app:srcCompat="@drawable/ic_add_black_24dp" />
+ app:srcCompat="@drawable/ic_add_24dp" />
</LinearLayout>
diff --git a/android/source/res/layout/toolbar_color_picker.xml
b/android/source/res/layout/toolbar_color_picker.xml
index 351542b1d2d0..0969d0e52e3d 100644
--- a/android/source/res/layout/toolbar_color_picker.xml
+++ b/android/source/res/layout/toolbar_color_picker.xml
@@ -33,7 +33,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:background="@drawable/image_button_background"
- app:srcCompat="@drawable/ic_arrow_back_black_24dp" />
+ app:srcCompat="@drawable/ic_arrow_back_24dp" />
<Button
android:id="@+id/button_auto_color"
diff --git a/android/source/res/menu/main.xml b/android/source/res/menu/main.xml
index b0358a7cc360..cbca33aa4a81 100644
--- a/android/source/res/menu/main.xml
+++ b/android/source/res/menu/main.xml
@@ -110,25 +110,25 @@
<item android:id="@+id/action_back"
android:title="@string/action_back"
app:showAsAction="always"
- android:icon="@drawable/ic_arrow_back_black_24dp"
+ android:icon="@drawable/ic_arrow_back_24dp"
android:orderInCategory="1"/>
<item android:id="@+id/action_copy"
android:title="@string/action_copy"
app:showAsAction="always"
- android:icon="@drawable/ic_content_copy_black_24dp"
+ android:icon="@drawable/ic_content_copy_24dp"
android:orderInCategory="2"/>
<item android:id="@+id/action_cut"
android:title="@string/action_cut"
app:showAsAction="always"
- android:icon="@drawable/ic_content_cut_black_24dp"
+ android:icon="@drawable/ic_content_cut_24dp"
android:orderInCategory="3"/>
<item android:id="@+id/action_paste"
android:title="@string/action_paste"
app:showAsAction="always"
- android:icon="@drawable/ic_content_paste_black_24dp"
+ android:icon="@drawable/ic_content_paste_24dp"
android:orderInCategory="4"/>
</group>
