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

Merge "Set the correct size to the container of icon view" into tm-dev am: 6efe0b12b5

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

Change-Id: I1d1858aef49a9326e0efa1cbb2b633f59f964546
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chilun Huang
2022-04-28 02:55:00 +00:00
committed by Automerger Merge Worker
parent 63d5a39c10 6efe0b12b5
commit 86371a0a2b
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/WindowManager/Shell/res/layout/split_decor.xml
View File

@@ -20,8 +20,8 @@
android:layout_width="match_parent"> android:layout_width="match_parent">
<ImageView android:id="@+id/split_resizing_icon" <ImageView android:id="@+id/split_resizing_icon"
android:layout_height="@*android:dimen/starting_surface_icon_size" android:layout_height="@dimen/split_icon_size"
android:layout_width="@*android:dimen/starting_surface_icon_size" android:layout_width="@dimen/split_icon_size"
android:layout_gravity="center" android:layout_gravity="center"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:padding="0dp" android:padding="0dp"

2
libs/WindowManager/Shell/res/values/dimen.xml
View File

@@ -87,6 +87,8 @@
<!-- How high we lift the divider when touching --> <!-- How high we lift the divider when touching -->
<dimen name="docked_stack_divider_lift_elevation">4dp</dimen> <dimen name="docked_stack_divider_lift_elevation">4dp</dimen>
<!-- Icon size for split screen -->
<dimen name="split_icon_size">72dp</dimen>
<!-- Divider handle size for legacy split screen --> <!-- Divider handle size for legacy split screen -->
<dimen name="docked_divider_handle_width">16dp</dimen> <dimen name="docked_divider_handle_width">16dp</dimen>
<dimen name="docked_divider_handle_height">2dp</dimen> <dimen name="docked_divider_handle_height">2dp</dimen>

11
libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitDecorManager.java
View File

@@ -73,6 +73,8 @@ public class SplitDecorManager extends WindowlessWindowManager {
private Rect mBounds = new Rect(); private Rect mBounds = new Rect();
private ValueAnimator mFadeAnimator; private ValueAnimator mFadeAnimator;
private int mIconSize;
public SplitDecorManager(Configuration configuration, IconProvider iconProvider, public SplitDecorManager(Configuration configuration, IconProvider iconProvider,
SurfaceSession surfaceSession) { SurfaceSession surfaceSession) {
super(configuration, null /* rootSurface */, null /* hostInputToken */); super(configuration, null /* rootSurface */, null /* hostInputToken */);
@@ -104,6 +106,7 @@ public class SplitDecorManager extends WindowlessWindowManager {
mHostLeash = rootLeash; mHostLeash = rootLeash;
mViewHost = new SurfaceControlViewHost(context, context.getDisplay(), this); mViewHost = new SurfaceControlViewHost(context, context.getDisplay(), this);
mIconSize = context.getResources().getDimensionPixelSize(R.dimen.split_icon_size);
final FrameLayout rootLayout = (FrameLayout) LayoutInflater.from(context) final FrameLayout rootLayout = (FrameLayout) LayoutInflater.from(context)
.inflate(R.layout.split_decor, null); .inflate(R.layout.split_decor, null);
mResizingIconView = rootLayout.findViewById(R.id.split_resizing_icon); mResizingIconView = rootLayout.findViewById(R.id.split_resizing_icon);
@@ -171,14 +174,14 @@ public class SplitDecorManager extends WindowlessWindowManager {
WindowManager.LayoutParams lp = WindowManager.LayoutParams lp =
(WindowManager.LayoutParams) mViewHost.getView().getLayoutParams(); (WindowManager.LayoutParams) mViewHost.getView().getLayoutParams();
lp.width = mIcon.getIntrinsicWidth(); lp.width = mIconSize;
lp.height = mIcon.getIntrinsicHeight(); lp.height = mIconSize;
mViewHost.relayout(lp); mViewHost.relayout(lp);
t.setLayer(mIconLeash, Integer.MAX_VALUE); t.setLayer(mIconLeash, Integer.MAX_VALUE);
} }
t.setPosition(mIconLeash, t.setPosition(mIconLeash,
newBounds.width() / 2 - mIcon.getIntrinsicWidth() / 2, newBounds.width() / 2 - mIconSize / 2,
newBounds.height() / 2 - mIcon.getIntrinsicWidth() / 2); newBounds.height() / 2 - mIconSize / 2);
boolean show = newBounds.width() > mBounds.width() || newBounds.height() > mBounds.height(); boolean show = newBounds.width() > mBounds.width() || newBounds.height() > mBounds.height();
if (show != mShown) { if (show != mShown) {

3
libs/WindowManager/Shell/src/com/android/wm/shell/draganddrop/DropZoneView.java
View File

@@ -111,8 +111,7 @@ public class DropZoneView extends FrameLayout {
mColorDrawable = new ColorDrawable(); mColorDrawable = new ColorDrawable();
setBackgroundDrawable(mColorDrawable); setBackgroundDrawable(mColorDrawable);
final int iconSize = context.getResources().getDimensionPixelSize( final int iconSize = context.getResources().getDimensionPixelSize(R.dimen.split_icon_size);
com.android.internal.R.dimen.starting_surface_icon_size);
mSplashScreenView = new ImageView(context); mSplashScreenView = new ImageView(context);
mSplashScreenView.setScaleType(ImageView.ScaleType.FIT_CENTER); mSplashScreenView.setScaleType(ImageView.ScaleType.FIT_CENTER);
addView(mSplashScreenView, addView(mSplashScreenView,