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

Commit fc862d5b 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:... 

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

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



Change-Id: I6c0a10f1206e282d7105cdb06c6e28093eaf8a97
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 68a985f2 c824ebd4

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

+3 −2
Original line number Original line Diff line number Diff line
@@ -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"/>

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

+6 −3
Original line number Original line Diff line number Diff line
@@ -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);