Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8a3a198 authored by Chilun Huang's avatar Chilun Huang Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I0faa0eda566e3d4c06ab9639d1ec026ce688d650
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c4eb798f dc7c91de

libs/WindowManager/Shell/res/layout/split_decor.xml

+3 −2
Original line number Diff line number Diff line
@@ -20,9 +20,10 @@ 
    android:layout_width="match_parent">



    <ImageView android:id="@+id/split_resizing_icon"

               android:layout_height="wrap_content"

               android:layout_width="wrap_content"

               android:layout_height="@*android:dimen/starting_surface_icon_size"

               android:layout_width="@*android:dimen/starting_surface_icon_size"

               android:layout_gravity="center"

               android:scaleType="fitCenter"

               android:padding="0dp"

               android:visibility="gone"

               android:background="@null"/>

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

+6 −3
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.graphics.drawable.ColorDrawable; 
import android.graphics.drawable.Drawable;

import android.util.AttributeSet;

import android.util.FloatProperty;

import android.view.Gravity;

import android.view.View;

import android.view.ViewGroup;

import android.widget.FrameLayout;
@@ -110,10 +111,12 @@ public class DropZoneView extends FrameLayout { 
        mColorDrawable = new ColorDrawable();

        setBackgroundDrawable(mColorDrawable);



        final int iconSize = context.getResources().getDimensionPixelSize(

                com.android.internal.R.dimen.starting_surface_icon_size);

        mSplashScreenView = new ImageView(context);

        mSplashScreenView.setScaleType(ImageView.ScaleType.CENTER);

        addView(mSplashScreenView, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,

                ViewGroup.LayoutParams.MATCH_PARENT));

        mSplashScreenView.setScaleType(ImageView.ScaleType.FIT_CENTER);

        addView(mSplashScreenView,

                new FrameLayout.LayoutParams(iconSize, iconSize, Gravity.CENTER));

        mSplashScreenView.setAlpha(0f);



        mMarginView = new MarginView(context);