Merge "fix crash in setting time zone" into main (15f88ddc) · Commits · e / os / android_packages_apps_Settings

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