Merge "Fix crash when switching Display size"
This commit is contained in:
@@ -155,8 +155,10 @@ public class TopLevelSettings extends DashboardFragment implements SplitLayoutLi
|
||||
boolean activityEmbedded = isActivityEmbedded();
|
||||
if (icicle != null) {
|
||||
mHighlightMixin = icicle.getParcelable(SAVED_HIGHLIGHT_MIXIN);
|
||||
mScrollNeeded = !mHighlightMixin.isActivityEmbedded() && activityEmbedded;
|
||||
mHighlightMixin.setActivityEmbedded(activityEmbedded);
|
||||
if (mHighlightMixin != null) {
|
||||
mScrollNeeded = !mHighlightMixin.isActivityEmbedded() && activityEmbedded;
|
||||
mHighlightMixin.setActivityEmbedded(activityEmbedded);
|
||||
}
|
||||
}
|
||||
if (mHighlightMixin == null) {
|
||||
mHighlightMixin = new TopLevelHighlightMixin(activityEmbedded);
|
||||
|
Reference in New Issue
Block a user