Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4cff5d09 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[Expressive] disable scrolling in landscape mode" into main

parents ef3acbc1 d0cca496

packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/CollapsingToolbarDelegate.java

+3 −1
Original line number Diff line number Diff line
@@ -517,7 +517,9 @@ public class CollapsingToolbarDelegate { 
                    @Override

                    public boolean canDrag(@NonNull AppBarLayout appBarLayout) {

                        // Header can be scrolling while device in landscape mode and SDK > 33

                        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.TIRAMISU) {

                        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.TIRAMISU

                                || SettingsThemeHelper.isExpressiveTheme(

                                appBarLayout.getContext())) {

                            return false;

                        } else {

                            return appBarLayout.getResources().getConfiguration().orientation

packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/widget/CollapsingCoordinatorLayout.java

+3 −1
Original line number Diff line number Diff line
@@ -267,7 +267,9 @@ public class CollapsingCoordinatorLayout extends CoordinatorLayout { 
                    @Override

                    public boolean canDrag(@NonNull AppBarLayout appBarLayout) {

                        // Header can be scrolling while device in landscape mode and SDK > 33

                        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.TIRAMISU) {

                        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.TIRAMISU

                                || SettingsThemeHelper.isExpressiveTheme(

                                appBarLayout.getContext())) {

                            return false;

                        } else {

                            return appBarLayout.getResources().getConfiguration().orientation