Merge "Correctly position the landscape / rtl FloatingIconView's background drawable when swiping back to home." into tm-qpr-dev am: beccfe5928
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19583216 Change-Id: Icde59a3e2bf80a7004ae7f14f031740c03b1e874 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -15,6 +15,8 @@
|
||||
*/
|
||||
package com.android.launcher3.views;
|
||||
|
||||
import static android.view.Gravity.LEFT;
|
||||
|
||||
import static com.android.launcher3.Utilities.getBadge;
|
||||
import static com.android.launcher3.Utilities.getFullDrawable;
|
||||
import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
|
||||
@@ -181,8 +183,10 @@ public class FloatingIconView extends FrameLayout implements
|
||||
updatePosition(positionOut, lp);
|
||||
setLayoutParams(lp);
|
||||
|
||||
mClipIconView.setLayoutParams(new FrameLayout.LayoutParams(lp.width, lp.height));
|
||||
mBtvDrawable.setLayoutParams(new FrameLayout.LayoutParams(lp.width, lp.height));
|
||||
// For code simplicity, we always layout the child views using Gravity.LEFT
|
||||
// and manually handle RTL for FloatingIconView when positioning it on the screen.
|
||||
mClipIconView.setLayoutParams(new FrameLayout.LayoutParams(lp.width, lp.height, LEFT));
|
||||
mBtvDrawable.setLayoutParams(new FrameLayout.LayoutParams(lp.width, lp.height, LEFT));
|
||||
}
|
||||
|
||||
private void updatePosition(RectF pos, InsettableFrameLayout.LayoutParams lp) {
|
||||
|
||||
Reference in New Issue
Block a user