mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-26 07:05:49 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #7339 from nextcloud/mediaOverlaps

Browse source 
Fix overlapping seek bar and softkeys
This commit is contained in:
Andy Scherzinger 2020-11-18 17:27:55 +01:00 committed by GitHub
commit f87bd9b03b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
View file

@ -133,6 +133,7 @@ import javax.inject.Inject;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.widget.SearchView; import androidx.appcompat.widget.SearchView;
import androidx.coordinatorlayout.widget.CoordinatorLayout;
import androidx.core.view.MenuItemCompat; import androidx.core.view.MenuItemCompat;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentManager;
@ -646,6 +647,9 @@ public class FileDisplayActivity extends FileActivity
} }
updateFragmentsVisibility(false); updateFragmentsVisibility(false);
updateActionBarTitleAndHomeButton(null); updateActionBarTitleAndHomeButton(null);
CoordinatorLayout.LayoutParams params = (CoordinatorLayout.LayoutParams) findViewById(R.id.root_layout).getLayoutParams();
params.setBehavior(new AppBarLayout.ScrollingViewBehavior());
} }
public void updateListOfFilesFragment(boolean fromSearch) { public void updateListOfFilesFragment(boolean fromSearch) {
@ -2174,6 +2178,9 @@ public class FileDisplayActivity extends FileActivity
} }
if (showPreview && file.isDown() && !file.isDownloading() || streamMedia) { if (showPreview && file.isDown() && !file.isDownloading() || streamMedia) {
showSortListGroup(false); showSortListGroup(false);
CoordinatorLayout.LayoutParams params = (CoordinatorLayout.LayoutParams) findViewById(R.id.root_layout).getLayoutParams();
params.setBehavior(null);
Fragment mediaFragment = PreviewMediaFragment.newInstance(file, user.get(), startPlaybackPosition, autoplay); Fragment mediaFragment = PreviewMediaFragment.newInstance(file, user.get(), startPlaybackPosition, autoplay);
setSecondFragment(mediaFragment); setSecondFragment(mediaFragment);
updateFragmentsVisibility(true); updateFragmentsVisibility(true);