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

Commit d0cca496 authored by Mill Chen's avatar Mill Chen
Browse files

[Expressive] disable scrolling in landscape mode 

In the new UI, the collapsing toolbar will be collapsed by default. To
maintain a consistent user experience, especially when multiple
fragments are sharing the same activity, we need to disable the
scrolling functionality of the collapsing toolbar when the device is in
landscape mode. This will prevent inconsistent behavior and ensure the
toolbar's state remains predictable.

Bug: 424864280
Test: visual verify
Flag: EXEMPT bugfix
Change-Id: I0a03cc3c3284a91eaf958446ec56de349688a42a
parent a666e955

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

+3 −1
Original line number Diff line number Diff line
@@ -519,7 +519,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