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

Commit f632d627 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "fix crash in setting time zone" into main am: 15f88ddc am: 059f600c 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3079352



Change-Id: I401e4197ddc6302133cfef4612e42eaa128dffa7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9da19811 059f600c

src/com/android/settings/datetime/timezone/BaseTimeZonePicker.java

+10 −2
Original line number Diff line number Diff line
@@ -164,7 +164,9 @@ public abstract class BaseTimeZonePicker extends InstrumentedFragment 
    @Override

    public boolean onMenuItemActionExpand(MenuItem item) {

        // To prevent a large space on tool bar.

        if (mAppBarLayout != null) {

            mAppBarLayout.setExpanded(false /*expanded*/, false /*animate*/);

        }

        // To prevent user can expand the collapsing tool bar view.

        ViewCompat.setNestedScrollingEnabled(mRecyclerView, false);

        return true;
@@ -173,7 +175,9 @@ public abstract class BaseTimeZonePicker extends InstrumentedFragment 
    @Override

    public boolean onMenuItemActionCollapse(MenuItem item) {

        // We keep the collapsed status after user cancel the search function.

        if (mAppBarLayout != null) {

            mAppBarLayout.setExpanded(false /*expanded*/, false /*animate*/);

        }

        ViewCompat.setNestedScrollingEnabled(mRecyclerView, true);

        return true;

    }
@@ -196,6 +200,10 @@ public abstract class BaseTimeZonePicker extends InstrumentedFragment 
    }



    private void autoSetCollapsingToolbarLayoutScrolling() {

        if (mAppBarLayout == null) {

            return;

        }



        CoordinatorLayout.LayoutParams params =

                (CoordinatorLayout.LayoutParams) mAppBarLayout.getLayoutParams();

        AppBarLayout.Behavior behavior = new AppBarLayout.Behavior();