Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[automerge] Use the orientation from the config object not resources 2p: b73f1acdab

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16763691

Bug: 216643100
Change-Id: If021132cd31b3213c66932b96056821661962afb
This commit is contained in:
Mady Mellor
2022-01-31 18:11:12 +00:00
committed by Presubmit Automerger Backend
parent 9a191546d1 b73f1acdab
commit 3b54e697be
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libs/WindowManager/Shell/src/com/android/wm/shell/draganddrop/DragLayout.java
View File

@@ -103,7 +103,7 @@ public class DragLayout extends LinearLayout {
MATCH_PARENT)); MATCH_PARENT));
((LayoutParams) mDropZoneView1.getLayoutParams()).weight = 1; ((LayoutParams) mDropZoneView1.getLayoutParams()).weight = 1;
((LayoutParams) mDropZoneView2.getLayoutParams()).weight = 1; ((LayoutParams) mDropZoneView2.getLayoutParams()).weight = 1;
updateContainerMargins(); updateContainerMargins(getResources().getConfiguration().orientation);
} }
@Override @Override
@@ -128,20 +128,18 @@ public class DragLayout extends LinearLayout {
} }
public void onConfigChanged(Configuration newConfig) { public void onConfigChanged(Configuration newConfig) {
final int orientation = getResources().getConfiguration().orientation; if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE
if (orientation == Configuration.ORIENTATION_LANDSCAPE
&& getOrientation() != HORIZONTAL) { && getOrientation() != HORIZONTAL) {
setOrientation(LinearLayout.HORIZONTAL); setOrientation(LinearLayout.HORIZONTAL);
updateContainerMargins(); updateContainerMargins(newConfig.orientation);
} else if (orientation == Configuration.ORIENTATION_PORTRAIT } else if (newConfig.orientation == Configuration.ORIENTATION_PORTRAIT
&& getOrientation() != VERTICAL) { && getOrientation() != VERTICAL) {
setOrientation(LinearLayout.VERTICAL); setOrientation(LinearLayout.VERTICAL);
updateContainerMargins(); updateContainerMargins(newConfig.orientation);
} }
} }
private void updateContainerMargins() { private void updateContainerMargins(int orientation) {
final int orientation = getResources().getConfiguration().orientation;
final float halfMargin = mDisplayMargin / 2f; final float halfMargin = mDisplayMargin / 2f;
if (orientation == Configuration.ORIENTATION_LANDSCAPE) { if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
mDropZoneView1.setContainerMargin( mDropZoneView1.setContainerMargin(