Merge pull request #1088 from owncloud/updated_docs_about_target_of_PRs

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / preview / PreviewImageActivity.java

diff --git a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
index 3d36f09..2b0d96c 100644 (file)
--- a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
+++ b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
@@ -31,6 +31,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Message;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Message;

+import android.support.v4.view.GravityCompat;

 import android.support.v4.view.ViewPager;
 import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBar;
 import android.support.v4.view.ViewPager;
 import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBar;


@@ -91,9 +92,10 @@ public class PreviewImageActivity extends FileActivity implements
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {

+        requestWindowFeature(Window.FEATURE_ACTION_BAR_OVERLAY);
+

         super.onCreate(savedInstanceState);
 
         super.onCreate(savedInstanceState);
 

-        //requestWindowFeature(Window.FEATURE_ACTION_BAR_OVERLAY);

         setContentView(R.layout.preview_image_activity);
 
         // Navigation Drawer
         setContentView(R.layout.preview_image_activity);
 
         // Navigation Drawer


@@ -324,7 +326,11 @@ public class PreviewImageActivity extends FileActivity implements
         
         switch(item.getItemId()){
         case android.R.id.home:
         
         switch(item.getItemId()){
         case android.R.id.home:

-            backToDisplayActivity();
+            if (mDrawerLayout.isDrawerOpen(GravityCompat.START)) {
+                mDrawerLayout.closeDrawer(GravityCompat.START);
+            } else {
+                backToDisplayActivity();
+            }

             returnValue = true;
             break;
         default:
             returnValue = true;
             break;
         default:


@@ -500,7 +506,6 @@ public class PreviewImageActivity extends FileActivity implements
 
             if (visible) {
                 hideSystemUI(mFullScreenAnchorView);
 
             if (visible) {
                 hideSystemUI(mFullScreenAnchorView);

-                mDrawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED);

                 // actionBar.hide(); // propagated through
                 // OnSystemUiVisibilityChangeListener()
             } else {
                 // actionBar.hide(); // propagated through
                 // OnSystemUiVisibilityChangeListener()
             } else {