summaryrefslogtreecommitdiff
path: root/android/source/src/java/org
diff options
context:
space:
mode:
Diffstat (limited to 'android/source/src/java/org')
-rw-r--r--android/source/src/java/org/libreoffice/ColorPaletteAdapter.java5
-rw-r--r--android/source/src/java/org/libreoffice/ColorPickerAdapter.java2
2 files changed, 4 insertions, 3 deletions
diff --git a/android/source/src/java/org/libreoffice/ColorPaletteAdapter.java b/android/source/src/java/org/libreoffice/ColorPaletteAdapter.java
index a6d250f6380d..6ec6aa138f66 100644
--- a/android/source/src/java/org/libreoffice/ColorPaletteAdapter.java
+++ b/android/source/src/java/org/libreoffice/ColorPaletteAdapter.java
@@ -100,9 +100,10 @@ public class ColorPaletteAdapter extends RecyclerView.Adapter<ColorPaletteAdapte
}
- public void setColorPalette(int[][] color_palette, int position1, int position2) {
+ public void setColorPalette(int[][] color_palette) {
this.color_palette = color_palette;
- setPosition(position1, position2);
+ this.upperSelectedBox = 0;
+ this.selectedBox = 0;
}
private void updateAdapter(){
diff --git a/android/source/src/java/org/libreoffice/ColorPickerAdapter.java b/android/source/src/java/org/libreoffice/ColorPickerAdapter.java
index 092de46caec4..c93d5a01bbb4 100644
--- a/android/source/src/java/org/libreoffice/ColorPickerAdapter.java
+++ b/android/source/src/java/org/libreoffice/ColorPickerAdapter.java
@@ -115,7 +115,7 @@ public class ColorPickerAdapter extends RecyclerView.Adapter<ColorPickerAdapter.
for (int i = 0; i < 11; i++){
this.colorPalette[i][7] = (Color.rgb(255, 255, 255)); // last one is always white
}
- colorPaletteAdapter.setColorPalette(colorPalette, 0, 0);
+ colorPaletteAdapter.setColorPalette(colorPalette);
}
public void findSelectedTextColor(int color) {