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

Commit 772b19f6 authored by Abhishek Gadewar's avatar Abhishek Gadewar
Browse files

fix crash in setting time zone 



Summary: Fix a NPE when trying to set the time zone.

Test: Set the time zone. See it update without crashing.

Change-Id: I01c394f1a682844babc8119c86348b140eeb18ec
Signed-off-by: default avatarAbhishek Gadewar <abhishekgadewar@meta.com>
parent 9a492ca3

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();