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

Commit a2d9c175 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Apply theme color and fade-in transition effect at the top of... 

Merge "Apply theme color and fade-in transition effect at the top of One-handed mode" into sc-dev am: a08d1cb0 am: eddf948d

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

Change-Id: I34ff608a91ff6da54ed46bd9c0f26001d7d5bc8d
parents 407b327f eddf948d

libs/WindowManager/Shell/res/color/one_handed_tutorial_background_color.xml

0 → 100644
+21 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2021 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->



<selector xmlns:android="http://schemas.android.com/apk/res/android"

          xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">

    <item android:color="?androidprv:attr/colorSurfaceVariant"/>

</selector>

libs/WindowManager/Shell/res/drawable-hdpi/one_handed_tutorial.png

deleted100644 → 0
−1.72 KiB
Loading image diff...

libs/WindowManager/Shell/res/drawable/one_handed_tutorial_icon.xml

0 → 100644
+14 −0
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="32dp"

    android:height="60dp"

    android:viewportWidth="32"

    android:viewportHeight="60">

  <path

      android:pathData="M1.9703,30.5041C1.9703,28.295 3.7612,26.5042 5.9703,26.5042H25.5551C27.7642,26.5042 29.5551,28.295 29.5551,30.5042V54.0296C29.5551,56.2387 27.7642,58.0296 25.5551,58.0296H5.9703C3.7612,58.0296 1.9703,56.2387 1.9703,54.0296V30.5041Z"

      android:fillColor="#000000"

      android:fillAlpha="0.16"/>

  <path

      android:pathData="M25.5254,2H6C3.7909,2 2,3.7909 2,6V54C2,56.2091 3.7909,58 6,58H25.5254C27.7346,58 29.5254,56.2091 29.5254,54V6C29.5254,3.7909 27.7346,2 25.5254,2ZM6,0C2.6863,0 0,2.6863 0,6V54C0,57.3137 2.6863,60 6,60H25.5254C28.8391,60 31.5254,57.3137 31.5254,54V6C31.5254,2.6863 28.8391,0 25.5254,0H6ZM12.2034,47.2336L12.8307,47.861L15.3178,45.3783V52.1277H16.2076V45.3783L18.6903,47.8654L19.322,47.2336L15.7627,43.6743L12.2034,47.2336ZM19.7034,55.0742H11.822V56.552H19.7034V55.0742Z"

      android:fillColor="#000000"

      android:fillType="evenOdd"/>

</vector>

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

+3 −4
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
        android:layout_marginTop="6dp"

        android:layout_marginBottom="0dp"

        android:gravity="center_horizontal"

        android:src="@drawable/one_handed_tutorial"

        android:src="@drawable/one_handed_tutorial_icon"

        android:scaleType="centerInside" />



    <TextView
@@ -45,7 +45,6 @@ 
        android:fontFamily="google-sans-medium"

        android:text="@string/one_handed_tutorial_title"

        android:textSize="16sp"

        android:textStyle="bold"

        android:textColor="@android:color/white"/>



    <TextView
@@ -54,8 +53,8 @@ 
        android:layout_height="wrap_content"

        android:layout_marginTop="6dp"

        android:layout_marginBottom="0dp"

        android:layout_marginStart="46dp"

        android:layout_marginEnd="46dp"

        android:layout_marginStart="60dp"

        android:layout_marginEnd="60dp"

        android:gravity="center_horizontal"

        android:fontFamily="roboto-regular"

        android:text="@string/one_handed_tutorial_description"

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

+30 −7
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import android.content.Context; 
import android.graphics.Color;

import android.graphics.PixelFormat;

import android.graphics.Rect;

import android.util.Log;

import android.view.SurfaceControl;

import android.view.SurfaceSession;

import android.window.DisplayAreaAppearedInfo;
@@ -30,7 +29,6 @@ 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;
@@ -48,14 +46,17 @@ import java.util.concurrent.Executor; 
public class OneHandedBackgroundPanelOrganizer extends DisplayAreaOrganizer

        implements OneHandedTransitionCallback {

    private static final String TAG = "OneHandedBackgroundPanelOrganizer";

    private static final int THEME_COLOR_OFFSET = 10;



    private final Context mContext;

    private final Object mLock = new Object();

    private final SurfaceSession mSurfaceSession = new SurfaceSession();

    private final float[] mDefaultColor;

    private final Executor mMainExecutor;

    private final OneHandedSurfaceTransactionHelper.SurfaceControlTransactionFactory

            mSurfaceControlTransactionFactory;



    private float[] mDefaultColor;



    /**

     * The background to distinguish the boundary of translated windows and empty region when

     * one handed mode triggered.
@@ -88,15 +89,14 @@ public class OneHandedBackgroundPanelOrganizer extends DisplayAreaOrganizer 
    public OneHandedBackgroundPanelOrganizer(Context context, DisplayLayout displayLayout,

            Executor executor) {

        super(executor);

        mContext = context;

        // 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};

        updateThemeColors();

        mMainExecutor = executor;

        mSurfaceControlTransactionFactory = SurfaceControl.Transaction::new;

    }
@@ -170,7 +170,6 @@ public class OneHandedBackgroundPanelOrganizer extends DisplayAreaOrganizer 
            }



            if (getBackgroundSurface() == null) {

                Log.w(TAG, "mBackgroundSurface is null !");

                return;

            }
@@ -201,6 +200,30 @@ public class OneHandedBackgroundPanelOrganizer extends DisplayAreaOrganizer 
        }

    }



    /**

     * onConfigurationChanged events for updating tutorial text.

     */

    public void onConfigurationChanged() {

        synchronized (mLock) {

            if (mBackgroundSurface == null) {

                getBackgroundSurface();

            } else {

                removeBackgroundPanelLayer();

            }

            updateThemeColors();

            showBackgroundPanelLayer();

        }

    }



    private void updateThemeColors() {

        synchronized (mLock) {

            final int themeColor = mContext.getColor(R.color.one_handed_tutorial_background_color);

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

                    (Color.green(themeColor) - THEME_COLOR_OFFSET) / 255.0f,

                    (Color.blue(themeColor) - THEME_COLOR_OFFSET) / 255.0f};

        }

    }



    void dump(@NonNull PrintWriter pw) {

        final String innerPrefix = "  ";

        pw.println(TAG);