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

Merge "Fix crash when switching Display size"

Browse Source
This commit is contained in:
Arc Wang
2023-02-15 11:08:15 +00:00
committed by Android (Google) Code Review
parent 6e6a7acbd2 ff8c5e0079
commit 319cac993c
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/homepage/TopLevelSettings.java
View File

@@ -155,8 +155,10 @@ public class TopLevelSettings extends DashboardFragment implements SplitLayoutLi
boolean activityEmbedded = isActivityEmbedded(); boolean activityEmbedded = isActivityEmbedded();
if (icicle != null) { if (icicle != null) {
mHighlightMixin = icicle.getParcelable(SAVED_HIGHLIGHT_MIXIN); mHighlightMixin = icicle.getParcelable(SAVED_HIGHLIGHT_MIXIN);
mScrollNeeded = !mHighlightMixin.isActivityEmbedded() && activityEmbedded; if (mHighlightMixin != null) {
mHighlightMixin.setActivityEmbedded(activityEmbedded); mScrollNeeded = !mHighlightMixin.isActivityEmbedded() && activityEmbedded;
mHighlightMixin.setActivityEmbedded(activityEmbedded);
}
} }
if (mHighlightMixin == null) { if (mHighlightMixin == null) {
mHighlightMixin = new TopLevelHighlightMixin(activityEmbedded); mHighlightMixin = new TopLevelHighlightMixin(activityEmbedded);