X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/7caf208c17398e202ac3b58adc2c5fa1ff787b6c..e901b609baa4dd5f681e2a5257c9e504997e3377:/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 5b34d0c1..c06f341f 100644 --- a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java +++ b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java @@ -49,6 +49,7 @@ import com.owncloud.android.lib.common.operations.OnRemoteOperationListener; import com.owncloud.android.lib.common.operations.RemoteOperation; import com.owncloud.android.lib.common.operations.RemoteOperationResult; import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode; +import com.owncloud.android.lib.common.utils.Log_OC; import com.owncloud.android.operations.CreateShareOperation; import com.owncloud.android.operations.RemoveFileOperation; import com.owncloud.android.operations.UnshareLinkOperation; @@ -57,7 +58,6 @@ import com.owncloud.android.ui.activity.FileDisplayActivity; import com.owncloud.android.ui.activity.PinCodeActivity; import com.owncloud.android.ui.fragment.FileFragment; import com.owncloud.android.utils.DisplayUtils; -import com.owncloud.android.utils.Log_OC; /** @@ -84,8 +84,6 @@ ViewPager.OnPageChangeListener, OnRemoteOperationListener { private boolean mRequestWaitingForBinder; private DownloadFinishReceiver mDownloadFinishReceiver; - - //private boolean mFullScreen; private View mFullScreenAnchorView; @@ -111,7 +109,6 @@ ViewPager.OnPageChangeListener, OnRemoteOperationListener { // Immersive Mode if (isHoneycombOrHigher()) { - // mFullScreen = true; mFullScreenAnchorView = getWindow().getDecorView(); // to keep our UI controls visibility in line with system bars // visibility @@ -126,7 +123,7 @@ ViewPager.OnPageChangeListener, OnRemoteOperationListener { } else { actionBar.hide(); } - } + } }); } @@ -193,11 +190,8 @@ ViewPager.OnPageChangeListener, OnRemoteOperationListener { super.onWindowFocusChanged(hasFocus); // When the window loses focus (e.g. the action overflow is shown), - // cancel any pending hide action. When the window gains focus, - // hide the system UI. - if (hasFocus) { - delayedHide(INITIAL_HIDE_DELAY); - } else { + // cancel any pending hide action. + if (!hasFocus) { mHideSystemUiHandler.removeMessages(0); } } @@ -326,7 +320,7 @@ ViewPager.OnPageChangeListener, OnRemoteOperationListener { @Override protected void onResume() { super.onResume(); - //Log.e(TAG, "ACTIVITY, ONRESUME"); + //Log_OC.e(TAG, "ACTIVITY, ONRESUME"); mDownloadFinishReceiver = new DownloadFinishReceiver(); IntentFilter filter = new IntentFilter(FileDownloader.getDownloadFinishMessage()); @@ -336,7 +330,7 @@ ViewPager.OnPageChangeListener, OnRemoteOperationListener { @Override protected void onPostResume() { - //Log.e(TAG, "ACTIVITY, ONPOSTRESUME"); + //Log_OC.e(TAG, "ACTIVITY, ONPOSTRESUME"); super.onPostResume(); } @@ -470,7 +464,8 @@ ViewPager.OnPageChangeListener, OnRemoteOperationListener { if (isHoneycombOrHigher()) { - boolean visible = (mFullScreenAnchorView.getSystemUiVisibility() & View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) == 0; + boolean visible = (mFullScreenAnchorView.getSystemUiVisibility() + & View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) == 0; if (visible) { hideSystemUI(mFullScreenAnchorView);