From 79dd7b118e9878d8a4172ec6ebb6ee08693e83cc Mon Sep 17 00:00:00 2001
From: Siqi Liu <me@siqi.fr>
Date: Thu, 23 Apr 2015 15:16:24 +0200
Subject: Set correct title for sort mode after changes.

Change-Id: I4f75f5ee68de6ed6f3b07d93b3681aa2307cb2dc
---
 .../experimental/LOAndroid3/res/values/strings.xml  |  6 ++++++
 .../org/libreoffice/ui/LibreOfficeUIActivity.java   | 21 +++++++++++++--------
 2 files changed, 19 insertions(+), 8 deletions(-)

(limited to 'android')

diff --git a/android/experimental/LOAndroid3/res/values/strings.xml b/android/experimental/LOAndroid3/res/values/strings.xml
index d7a430e5674f..b697c471eb72 100644
--- a/android/experimental/LOAndroid3/res/values/strings.xml
+++ b/android/experimental/LOAndroid3/res/values/strings.xml
@@ -18,6 +18,12 @@
     <string name="menu_search">Search</string>
     <string name="list_view">List</string>
     <string name="grid_view">Grid</string>
+    <string name="sort_smallest">Smallest first</string>
+    <string name="sort_largest">Largest first</string>
+    <string name="sort_az">A-Z</string>
+    <string name="sort_za">Z-A</string>
+    <string name="sort_oldest">Oldest first</string>
+    <string name="sort_newest">Newest first</string>
     <string name="menu_sort_size">Sort By Size</string>
     <string name="menu_sort_az">Sort A-Z</string>
     <string name="menu_sort_modified">Sort by Date</string>
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
index e41846b4b612..79ef341f94a4 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
@@ -437,28 +437,33 @@ public class LibreOfficeUIActivity extends ActionBarActivity implements ActionBa
         return true;
     }
 
-    @SuppressWarnings("unused")//see android:onClick properties in view_menu.xml
     public void sortFiles(MenuItem item){
-        switch ( item.getItemId() ) {
+        switch (item.getItemId()) {
             case R.id.menu_sort_az:
-                if( sortMode == FileUtilities.SORT_AZ ){
+                if (sortMode == FileUtilities.SORT_AZ){
                     sortMode = FileUtilities.SORT_ZA;
-                }else{
+                    item.setTitle(R.string.sort_az);
+                } else {
                     sortMode = FileUtilities.SORT_AZ;
+                    item.setTitle(R.string.sort_za);
                 }
                 break;
             case R.id.menu_sort_modified:
-                if( sortMode == FileUtilities.SORT_NEWEST ){
+                if (sortMode == FileUtilities.SORT_NEWEST){
                     sortMode = FileUtilities.SORT_OLDEST;
-                }else{
+                    item.setTitle(R.string.sort_newest);
+                } else {
                     sortMode = FileUtilities.SORT_NEWEST;
+                    item.setTitle(R.string.sort_oldest);
                 }
                 break;
             case R.id.menu_sort_size:
-                if( sortMode == FileUtilities.SORT_LARGEST ){
+                if (sortMode == FileUtilities.SORT_LARGEST){
                     sortMode = FileUtilities.SORT_SMALLEST;
-                }else{
+                    item.setTitle(R.string.sort_largest);
+                } else {
                     sortMode = FileUtilities.SORT_LARGEST;
+                    item.setTitle(R.string.sort_smallest);
                 }
                 break;
             default:
-- 
cgit v1.2.3