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

Commit c15df4e3 authored by Jason Chang's avatar Jason Chang
Browse files

Apply "Dominant Palette A - 800" color to the background of 

One-Handed mode

Change the One-Handed mode background color to
Dominant Palette A - 800. (#3C4043)

Bug: 177314967

Test: manual
Test: atest WMShellUnitTests
Change-Id: I68852d362f6f425832d36f3e60c2a41b9e505216
parent deb450ac

libs/WindowManager/Shell/res/values/config.xml

+0 −6
Original line number Diff line number Diff line
@@ -43,12 +43,6 @@ 
     when the PIP menu is shown in center. -->

    <string translatable="false" name="pip_menu_bounds">"596 280 1324 690"</string>



    <!-- one handed background panel default color RGB -->

    <item name="config_one_handed_background_rgb" format="float" type="dimen">0.5</item>



    <!-- one handed background panel default alpha -->

    <item name="config_one_handed_background_alpha" format="float" type="dimen">0.5</item>



    <!-- maximum animation duration for the icon when entering the starting window -->

    <integer name="max_starting_window_intro_icon_anim_duration">1000</integer>

libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedBackgroundPanelOrganizer.java

+11 −11
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
package com.android.wm.shell.onehanded;



import android.content.Context;

import android.content.res.Resources;

import android.graphics.Color;

import android.graphics.PixelFormat;

import android.graphics.Rect;

import android.util.Log;
@@ -30,6 +30,7 @@ import android.window.DisplayAreaOrganizer; 
import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import androidx.annotation.VisibleForTesting;

import androidx.core.content.ContextCompat;



import com.android.internal.annotations.GuardedBy;

import com.android.wm.shell.R;
@@ -50,8 +51,7 @@ public class OneHandedBackgroundPanelOrganizer extends DisplayAreaOrganizer 


    private final Object mLock = new Object();

    private final SurfaceSession mSurfaceSession = new SurfaceSession();

    private final float[] mColor;

    private final float mAlpha;

    private final float[] mDefaultColor;

    private final Executor mMainExecutor;

    private final OneHandedSurfaceTransactionHelper.SurfaceControlTransactionFactory

            mSurfaceControlTransactionFactory;
@@ -88,16 +88,15 @@ public class OneHandedBackgroundPanelOrganizer extends DisplayAreaOrganizer 
    public OneHandedBackgroundPanelOrganizer(Context context, DisplayLayout displayLayout,

            Executor executor) {

        super(executor);

        final Resources res = context.getResources();

        final float defaultRGB = res.getFloat(R.dimen.config_one_handed_background_rgb);

        mColor = new float[]{defaultRGB, defaultRGB, defaultRGB};

        mAlpha = res.getFloat(R.dimen.config_one_handed_background_alpha);

        // Ensure the mBkgBounds is portrait, due to OHM only support on portrait

        if (displayLayout.height() > displayLayout.width()) {

            mBkgBounds = new Rect(0, 0, displayLayout.width(), displayLayout.height());

        } else {

            mBkgBounds = new Rect(0, 0, displayLayout.height(), displayLayout.width());

        }

        final int defaultColor = ContextCompat.getColor(context, R.color.GM2_grey_800);

        mDefaultColor = new float[]{Color.red(defaultColor) / 255.0f,

                Color.green(defaultColor) / 255.0f, Color.blue(defaultColor) / 255.0f};

        mMainExecutor = executor;

        mSurfaceControlTransactionFactory = SurfaceControl.Transaction::new;

    }
@@ -153,8 +152,8 @@ public class OneHandedBackgroundPanelOrganizer extends DisplayAreaOrganizer 
                        .setParent(mParentLeash)

                        .setBufferSize(mBkgBounds.width(), mBkgBounds.height())

                        .setColorLayer()

                        .setFormat(PixelFormat.RGBA_8888)

                        .setOpaque(false)

                        .setFormat(PixelFormat.RGB_888)

                        .setOpaque(true)

                        .setName("one-handed-background-panel")

                        .setCallsite("OneHandedBackgroundPanelOrganizer")

                        .build();
@@ -178,8 +177,7 @@ public class OneHandedBackgroundPanelOrganizer extends DisplayAreaOrganizer 
            SurfaceControl.Transaction transaction =

                    mSurfaceControlTransactionFactory.getTransaction();

            transaction.setLayer(mBackgroundSurface, -1 /* at bottom-most layer */)

                    .setColor(mBackgroundSurface, mColor)

                    .setAlpha(mBackgroundSurface, mAlpha)

                    .setColor(mBackgroundSurface, mDefaultColor)

                    .show(mBackgroundSurface)

                    .apply();

            transaction.close();
@@ -210,5 +208,7 @@ public class OneHandedBackgroundPanelOrganizer extends DisplayAreaOrganizer 
        pw.println(mIsShowing);

        pw.print(innerPrefix + "mBkgBounds=");

        pw.println(mBkgBounds);

        pw.print(innerPrefix + "mDefaultColor=");

        pw.println(mDefaultColor);

    }

}