diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-04-30 00:45:37 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-04-30 00:45:37 +0000 |
commit | 40689ca9ab919f5edc4e0f0f6fe39b11a5945d2a (patch) | |
tree | f61aa7c47f3a97d292775074a7b4fbe26f003a5a | |
parent | 67b6541d7e70c288844ecc370af9fd2505450c1b (diff) | |
parent | 27831e1b01834310f0a177b503c7d36a7beb8a66 (diff) | |
download | android_packages_apps_Trebuchet-40689ca9ab919f5edc4e0f0f6fe39b11a5945d2a.tar.gz android_packages_apps_Trebuchet-40689ca9ab919f5edc4e0f0f6fe39b11a5945d2a.tar.bz2 android_packages_apps_Trebuchet-40689ca9ab919f5edc4e0f0f6fe39b11a5945d2a.zip |
Merge "Fix thumbnail views not rotating w/ orientation" into ub-launcher3-qt-dev
-rw-r--r-- | go/quickstep/src/com/android/quickstep/views/TaskItemView.java | 3 | ||||
-rw-r--r-- | go/quickstep/src/com/android/quickstep/views/TaskThumbnailIconView.java | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/go/quickstep/src/com/android/quickstep/views/TaskItemView.java b/go/quickstep/src/com/android/quickstep/views/TaskItemView.java index 1b61a10ef..a5f572898 100644 --- a/go/quickstep/src/com/android/quickstep/views/TaskItemView.java +++ b/go/quickstep/src/com/android/quickstep/views/TaskItemView.java @@ -44,6 +44,7 @@ public final class TaskItemView extends LinearLayout { private final Drawable mDefaultThumbnail; private final TaskLayerDrawable mIconDrawable; private final TaskLayerDrawable mThumbnailDrawable; + private View mTaskIconThumbnailView; private TextView mLabelView; private ImageView mIconView; private ImageView mThumbnailView; @@ -79,6 +80,7 @@ public final class TaskItemView extends LinearLayout { protected void onFinishInflate() { super.onFinishInflate(); mLabelView = findViewById(R.id.task_label); + mTaskIconThumbnailView = findViewById(R.id.task_icon_and_thumbnail); mThumbnailView = findViewById(R.id.task_thumbnail); mIconView = findViewById(R.id.task_icon); @@ -186,5 +188,6 @@ public final class TaskItemView extends LinearLayout { ((ThumbnailDrawable) drawable).setRequestedOrientation(newConfig.orientation); } } + mTaskIconThumbnailView.forceLayout(); } } diff --git a/go/quickstep/src/com/android/quickstep/views/TaskThumbnailIconView.java b/go/quickstep/src/com/android/quickstep/views/TaskThumbnailIconView.java index 0bad77b60..eaefa2167 100644 --- a/go/quickstep/src/com/android/quickstep/views/TaskThumbnailIconView.java +++ b/go/quickstep/src/com/android/quickstep/views/TaskThumbnailIconView.java @@ -56,7 +56,6 @@ final class TaskThumbnailIconView extends ViewGroup { int width = height; setMeasuredDimension(width, height); - int subItemSize = (int) (SUBITEM_FRAME_RATIO * height); if (mThumbnailView.getVisibility() != GONE) { boolean isPortrait = |