From: David A. Velasco <dvelasco@solidgear.es>
Date: Wed, 3 Jun 2015 09:09:19 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/navigationDrawer_basic' into navigationDrawer_basic
X-Git-Tag: oc-android-1.7.2~1^2~23^2~15
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/4d7b5a1e502852ba66820812c557afc96218e715?ds=inline;hp=-c

Merge remote-tracking branch 'origin/navigationDrawer_basic' into navigationDrawer_basic
---

4d7b5a1e502852ba66820812c557afc96218e715
diff --combined src/com/owncloud/android/ui/preview/PreviewImageActivity.java
index 6ddaf97e,c5977a86..12ba1662
--- a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
+++ b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
@@@ -8,7 -8,7 +8,7 @@@
   *   it under the terms of the GNU General Public License version 2,
   *   as published by the Free Software Foundation.
   *
 - *   This program is distributed in the hope that it will be useful,
 + *   This program is distributed in the hd that it will be useful,
   *   but WITHOUT ANY WARRANTY; without even the implied warranty of
   *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   *   GNU General Public License for more details.
@@@ -32,7 -32,6 +32,7 @@@ import android.os.Handler
  import android.os.IBinder;
  import android.os.Message;
  import android.support.v4.view.ViewPager;
 +import android.support.v4.widget.DrawerLayout;
  import android.support.v7.app.ActionBar;
  import android.view.MenuItem;
  import android.view.View;
@@@ -93,7 -92,7 +93,7 @@@ public class PreviewImageActivity exten
      protected void onCreate(Bundle savedInstanceState) {
          super.onCreate(savedInstanceState);
  
-         requestWindowFeature(Window.FEATURE_ACTION_BAR_OVERLAY);
+         //requestWindowFeature(Window.FEATURE_ACTION_BAR_OVERLAY);
          setContentView(R.layout.preview_image_activity);
  
          // Navigation Drawer
@@@ -105,6 -104,8 +105,8 @@@
          actionBar.setDisplayHomeAsUpEnabled(true);
          actionBar.hide();
  
+         updateActionBarTitleAndHomeButton();
+ 
          // Make sure we're running on Honeycomb or higher to use FullScreen and
          // Immersive Mode
          if (isHoneycombOrHigher()) {
@@@ -121,10 -122,8 +123,10 @@@
                      ActionBar actionBar = getSupportActionBar();
                      if (visible) {
                          actionBar.show();
 +                        mDrawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED);
                      } else {
                          actionBar.hide();
 +                        mDrawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED);
                      }
                  }
              });
@@@ -499,7 -498,6 +501,7 @@@
  
              if (visible) {
                  hideSystemUI(mFullScreenAnchorView);
 +                mDrawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED);
                  // actionBar.hide(); // propagated through
                  // OnSystemUiVisibilityChangeListener()
              } else {
@@@ -513,11 -511,9 +515,11 @@@
              ActionBar actionBar = getSupportActionBar();
              if (!actionBar.isShowing()) {
                  actionBar.show();
 +                mDrawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED);
  
              } else {
                  actionBar.hide();
 +                mDrawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED);
  
              }