commit 70d9e7eadb1069b5e7a1909c671b9348b740cca1
author Justin Luth <jluth@mail.com> Tue Sep 20 20:25:37 2022 -0400
committer Justin Luth <jluth@mail.com> Tue Dec 20 00:15:43 2022 +0000
tree 15eeb438f71393d007b82b528c612115b7e958f5
parent ee767c14530ad1fb8b7660e9352199f185fe61dc

tdf#85592 android: .uno:BackColor deprecated, use .uno:CharBackColor

Follow-up. I didn't want to include it in the main deprecation patch.
No good reason - android is just too different and untestable by me.

Change-Id: I661211aea619af256e38dc685fdd0662e5aa7272
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140284
Reviewed-by: Justin Luth <jluth@mail.com>
Tested-by: Jenkins

android/source/src/java/org/libreoffice/FontController.java

diff --git a/android/source/src/java/org/libreoffice/FontController.java b/android/source/src/java/org/libreoffice/FontController.java
index e016107..72f35d8 100644
--- a/android/source/src/java/org/libreoffice/FontController.java
+++ b/android/source/src/java/org/libreoffice/FontController.java
@@ -171,12 +171,9 @@ public class FontController implements AdapterView.OnItemSelectedListener {
            if(mActivity.getTileProvider().isSpreadsheet()){
                json.put("BackgroundColor", valueJson);
                LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:BackgroundColor", json.toString()));
            }else if(mActivity.getTileProvider().isPresentation()){
            }else {
                json.put("CharBackColor", valueJson);
                LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:CharBackColor", json.toString()));
            }else {
                json.put("BackColor", valueJson);
                LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:BackColor", json.toString()));
            }

            changeFontBackColorBoxColor(color);

android/source/src/java/org/libreoffice/InvalidationHandler.java

diff --git a/android/source/src/java/org/libreoffice/InvalidationHandler.java b/android/source/src/java/org/libreoffice/InvalidationHandler.java
index 0f3f1dd..c48127c 100644
--- a/android/source/src/java/org/libreoffice/InvalidationHandler.java
+++ b/android/source/src/java/org/libreoffice/InvalidationHandler.java
@@ -342,7 +342,7 @@ public class InvalidationHandler implements Document.MessageCallback, Office.Mes
            mContext.getFormattingController().onToggleStateChanged(Document.NUMBERED_LIST, pressed);
        } else if (parts[0].equals(".uno:Color")) {
            mContext.getFontController().colorPaletteListener.updateColorPickerPosition(Integer.parseInt(value));
        } else if (mContext.getTileProvider().isTextDocument() && parts[0].equals(".uno:BackColor")) {
        } else if (mContext.getTileProvider().isTextDocument() && (parts[0].equals(".uno:BackColor") || parts[0].equals(".uno:CharBackColor"))) {
            mContext.getFontController().backColorPaletteListener.updateColorPickerPosition(Integer.parseInt(value));
        } else if (mContext.getTileProvider().isPresentation() && parts[0].equals(".uno:CharBackColor")) {
            mContext.getFontController().backColorPaletteListener.updateColorPickerPosition(Integer.parseInt(value));