PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix crash in setting time zone

Browse Source 
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: Abhishek Gadewar <abhishekgadewar@meta.com>
This commit is contained in:
Abhishek Gadewar
2024-05-09 22:54:00 -07:00
parent 9a492ca3cb
commit 772b19f6ca
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/datetime/timezone/BaseTimeZonePicker.java
View File

@@ -164,7 +164,9 @@ public abstract class BaseTimeZonePicker extends InstrumentedFragment
@Override @Override
public boolean onMenuItemActionExpand(MenuItem item) { public boolean onMenuItemActionExpand(MenuItem item) {
// To prevent a large space on tool bar. // To prevent a large space on tool bar.
mAppBarLayout.setExpanded(false /*expanded*/, false /*animate*/); if (mAppBarLayout != null) {
mAppBarLayout.setExpanded(false /*expanded*/, false /*animate*/);
}
// To prevent user can expand the collapsing tool bar view. // To prevent user can expand the collapsing tool bar view.
ViewCompat.setNestedScrollingEnabled(mRecyclerView, false); ViewCompat.setNestedScrollingEnabled(mRecyclerView, false);
return true; return true;
@@ -173,7 +175,9 @@ public abstract class BaseTimeZonePicker extends InstrumentedFragment
@Override @Override
public boolean onMenuItemActionCollapse(MenuItem item) { public boolean onMenuItemActionCollapse(MenuItem item) {
// We keep the collapsed status after user cancel the search function. // We keep the collapsed status after user cancel the search function.
mAppBarLayout.setExpanded(false /*expanded*/, false /*animate*/); if (mAppBarLayout != null) {
mAppBarLayout.setExpanded(false /*expanded*/, false /*animate*/);
}
ViewCompat.setNestedScrollingEnabled(mRecyclerView, true); ViewCompat.setNestedScrollingEnabled(mRecyclerView, true);
return true; return true;
} }
@@ -196,6 +200,10 @@ public abstract class BaseTimeZonePicker extends InstrumentedFragment
} }
private void autoSetCollapsingToolbarLayoutScrolling() { private void autoSetCollapsingToolbarLayoutScrolling() {
if (mAppBarLayout == null) {
return;
}
CoordinatorLayout.LayoutParams params = CoordinatorLayout.LayoutParams params =
(CoordinatorLayout.LayoutParams) mAppBarLayout.getLayoutParams(); (CoordinatorLayout.LayoutParams) mAppBarLayout.getLayoutParams();
AppBarLayout.Behavior behavior = new AppBarLayout.Behavior(); AppBarLayout.Behavior behavior = new AppBarLayout.Behavior();