From 9832f8f463a7d5448af2294bce05eac85f4dbef0 Mon Sep 17 00:00:00 2001 From: Winson Date: Tue, 26 Apr 2016 11:30:59 -0700 Subject: [PATCH] Fixing issue with docking being disallowed for secondary user. - When a task is docked, the context is not correct for the given user. Bug: 28195260 Change-Id: I59f73caf818d294c146d215c2bd31dbe1d4c7c5a --- core/java/com/android/internal/policy/DividerSnapAlgorithm.java | 2 +- .../android/systemui/recents/views/RecentsViewTouchHandler.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/java/com/android/internal/policy/DividerSnapAlgorithm.java b/core/java/com/android/internal/policy/DividerSnapAlgorithm.java index b8bc1618b3a3e..d6172db3d3697 100644 --- a/core/java/com/android/internal/policy/DividerSnapAlgorithm.java +++ b/core/java/com/android/internal/policy/DividerSnapAlgorithm.java @@ -86,7 +86,7 @@ public class DividerSnapAlgorithm { return new DividerSnapAlgorithm(ctx.getResources(), displayInfo.logicalWidth, displayInfo.logicalHeight, dividerWindowWidth - 2 * dividerInsets, - ctx.getResources().getConfiguration().orientation + ctx.getApplicationContext().getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT, insets); } diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java index 0e5ebc9173bb5..c692a16ba2a58 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java @@ -193,7 +193,7 @@ public class RecentsViewTouchHandler { } public final void onBusEvent(ConfigurationChangedEvent event) { - if (event.fromDisplayDensityChange) { + if (event.fromDisplayDensityChange || event.fromDeviceOrientationChange) { updateSnapAlgorithm(); } }