[Libreoffice-commits] online.git: 2 commits - android/app

[Jan Holesovsky (via logerrit)]

 android/app/src/main/res/drawable/ic_sort_black_24dp.xml          |   13 ----------
 android/app/src/main/res/drawable/ic_sort_by_alpha_black_24dp.xml |    9 ++++++
 android/app/src/main/res/menu/view_menu.xml                       |    2 -
 android/app/src/main/res/values/arrays.xml                        |    4 +--
 4 files changed, 12 insertions(+), 16 deletions(-)

New commits:
commit 3ecc73d37ff5d57050ccb6f29028a7a3c51a8fcc
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Fri Dec 6 16:06:38 2019 +0100
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Fri Dec 6 23:35:55 2019 +0100

    android: Set only English as the supported language for now.
    
    Change-Id: I55a66b8e8f83252267fb9959cf563bc584fe682d
    Reviewed-on: https://gerrit.libreoffice.org/84645
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/android/app/src/main/res/values/arrays.xml b/android/app/src/main/res/values/arrays.xml
index 116e7a4fc..7adfbd56d 100644
--- a/android/app/src/main/res/values/arrays.xml
+++ b/android/app/src/main/res/values/arrays.xml
@@ -10,7 +10,7 @@
     </string-array>
     <string-array name="SupportedLanguagesValues">
         <item >en</item>
-        <item >tr</item>
+        <!-- FIXME we need more languages item >tr</item-->
     </string-array>
     <string-array name="SortModeStringValues">
         <item >0</item>
@@ -38,7 +38,7 @@
     </string-array>
     <string-array name="SupportedLanguages">
         <item>English</item>
-        <item>Turkçe</item>
+        <!-- FIXME we need more languages item>Turkçe</item-->
     </string-array>
     <string-array name="SortModeNames">
         <item >@string/sort_az</item>
commit 4ca81d1b2c02b996f2a47aa8938875213a74f0f6
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Fri Dec 6 16:00:16 2019 +0100
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Fri Dec 6 23:35:49 2019 +0100

    android: Change the sort icon to distinguish it from the other.
    
    Recommended by Pedro - thank you!
    
    Change-Id: Ic4e0f42566a8d565d14c359cd479edf5ddc62525
    Reviewed-on: https://gerrit.libreoffice.org/84643
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/android/app/src/main/res/drawable/ic_sort_black_24dp.xml b/android/app/src/main/res/drawable/ic_sort_black_24dp.xml
deleted file mode 100644
index d582deea6..000000000
--- a/android/app/src/main/res/drawable/ic_sort_black_24dp.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<!--
- This file is part of the LibreOffice project.
-
- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/.
- -->
-
-<vector android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M3,18h6v-2L3,16v2zM3,6v2h18L21,6L3,6zM3,13h12v-2L3,11v2z"/>
-</vector>
diff --git a/android/app/src/main/res/drawable/ic_sort_by_alpha_black_24dp.xml b/android/app/src/main/res/drawable/ic_sort_by_alpha_black_24dp.xml
new file mode 100644
index 000000000..97bf945e8
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_sort_by_alpha_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M14.94,4.66h-4.72l2.36,-2.36zM10.25,19.37h4.66l-2.33,2.33zM6.1,6.27L1.6,17.73h1.84l0.92,-2.45h5.11l0.92,2.45h1.84L7.74,6.27L6.1,6.27zM4.97,13.64l1.94,-5.18 1.94,5.18L4.97,13.64zM15.73,16.14h6.12v1.59h-8.53v-1.29l5.92,-8.56h-5.88v-1.6h8.3v1.26l-5.93,8.6z"/>
+</vector>
diff --git a/android/app/src/main/res/menu/view_menu.xml b/android/app/src/main/res/menu/view_menu.xml
index 67f059647..f7dfa6521 100644
--- a/android/app/src/main/res/menu/view_menu.xml
+++ b/android/app/src/main/res/menu/view_menu.xml
@@ -32,7 +32,7 @@
     <item
         android:id="@+id/menu_sort"
         android:title="@string/sort"
-        android:icon="@drawable/ic_sort_black_24dp"
+        android:icon="@drawable/ic_sort_by_alpha_black_24dp"
         app:showAsAction="ifRoom">
         <menu>
             <group android:checkableBehavior="single">