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

Merge "Use the icon size of starting surface for split decor" into tm-dev

Browse Source
This commit is contained in:
Chilun Huang
2022-04-20 08:44:33 +00:00
committed by Android (Google) Code Review
parent b1eb715bca 2384beb3fa
commit dc7c91de99
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,9 +20,10 @@
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="wrap_content" android:layout_height="@*android:dimen/starting_surface_icon_size"
android:layout_width="wrap_content" android:layout_width="@*android:dimen/starting_surface_icon_size"
android:layout_gravity="center" android:layout_gravity="center"
android:scaleType="fitCenter"
android:padding="0dp" android:padding="0dp"
android:visibility="gone" android:visibility="gone"
android:background="@null"/> android:background="@null"/>

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

@@ -28,6 +28,7 @@ import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.FloatProperty; import android.util.FloatProperty;
import android.view.Gravity;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.FrameLayout; import android.widget.FrameLayout;
@@ -110,10 +111,12 @@ public class DropZoneView extends FrameLayout {
mColorDrawable = new ColorDrawable(); mColorDrawable = new ColorDrawable();
setBackgroundDrawable(mColorDrawable); setBackgroundDrawable(mColorDrawable);
final int iconSize = context.getResources().getDimensionPixelSize(
com.android.internal.R.dimen.starting_surface_icon_size);
mSplashScreenView = new ImageView(context); mSplashScreenView = new ImageView(context);
mSplashScreenView.setScaleType(ImageView.ScaleType.CENTER); mSplashScreenView.setScaleType(ImageView.ScaleType.FIT_CENTER);
addView(mSplashScreenView, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, addView(mSplashScreenView,
ViewGroup.LayoutParams.MATCH_PARENT)); new FrameLayout.LayoutParams(iconSize, iconSize, Gravity.CENTER));
mSplashScreenView.setAlpha(0f); mSplashScreenView.setAlpha(0f);
mMarginView = new MarginView(context); mMarginView = new MarginView(context);