mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-27 09:39:25 +03:00
Code Issues Projects Releases Packages Wiki Activity

fixes after cherry pick

Browse source
This commit is contained in:
AndyScherzinger 2016-10-17 14:40:24 +02:00
parent 3a8d29d79b
commit 928a1b8630
No known key found for this signature in database
GPG key ID: 6CADC7E3523C308B
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
View file

@ -63,7 +63,6 @@ import com.owncloud.android.ui.dialog.CreateFolderDialogFragment;
import com.owncloud.android.ui.dialog.RemoveFilesDialogFragment; import com.owncloud.android.ui.dialog.RemoveFilesDialogFragment;
import com.owncloud.android.ui.dialog.RenameFileDialogFragment; import com.owncloud.android.ui.dialog.RenameFileDialogFragment;
import com.owncloud.android.ui.helpers.SparseBooleanArrayParcelable; import com.owncloud.android.ui.helpers.SparseBooleanArrayParcelable;
import com.owncloud.android.ui.preview.PreviewAudioFragment;
import com.owncloud.android.ui.preview.PreviewImageFragment; import com.owncloud.android.ui.preview.PreviewImageFragment;
import com.owncloud.android.ui.preview.PreviewMediaFragment; import com.owncloud.android.ui.preview.PreviewMediaFragment;
import com.owncloud.android.ui.preview.PreviewTextFragment; import com.owncloud.android.ui.preview.PreviewTextFragment;
@ -443,11 +442,8 @@ public class OCFileListFragment extends ExtendedListFragment {
mode.invalidate(); mode.invalidate();
//set gray color //set gray color
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { DisplayUtils.colorStatusBar(getActivity(), mSystemBarActionModeColor);
Window w = getActivity().getWindow(); DisplayUtils.colorToolbarProgressBar(getActivity(), mProgressBarActionModeColor);
mStatusBarColor = w.getStatusBarColor();
w.setStatusBarColor(mStatusBarColorActionMode);
}
// hide FAB in multi selection mode // hide FAB in multi selection mode
setFabEnabled(false); setFabEnabled(false);
@ -494,9 +490,8 @@ public class OCFileListFragment extends ExtendedListFragment {
mActiveActionMode = null; mActiveActionMode = null;
// reset to previous color // reset to previous color
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { DisplayUtils.colorStatusBar(getActivity(), mSystemBarColor);
getActivity().getWindow().setStatusBarColor(mStatusBarColor); DisplayUtils.colorToolbarProgressBar(getActivity(), mProgressBarColor);
}
// show FAB on multi selection mode exit // show FAB on multi selection mode exit
if(!mHideFab) { if(!mHideFab) {