Forráskód Böngészése

Merge pull request #6283 from nextcloud/fixPhotoviewTitle

Show "photos" in title
Tobias Kaminsky 4 éve
szülő
commit
cc06c8b613

+ 1 - 0
src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java

@@ -437,6 +437,7 @@ public abstract class DrawerActivity extends ToolbarActivity
 
     private void startPhotoSearch(MenuItem menuItem) {
         SearchEvent searchEvent = new SearchEvent("image/%", SearchRemoteOperation.SearchType.PHOTO_SEARCH);
+        MainApp.showOnlyFilesOnDevice(false);
 
         Intent intent = new Intent(getApplicationContext(), FileDisplayActivity.class);
         intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);

+ 4 - 0
src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -1205,6 +1205,10 @@ public class FileDisplayActivity extends FileActivity
             setDrawerMenuItemChecked(menuItemId);
         }
 
+        if (getListOfFilesFragment() instanceof PhotoFragment) {
+            updateActionBarTitleAndHomeButtonByString(getString(R.string.drawer_item_photos));
+        }
+
         Log_OC.v(TAG, "onResume() end");
     }