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

Commit 1c9c6d0e authored by Jagrut Desai's avatar Jagrut Desai
Browse files

Design review updates for Taskbar Pinning 

Changes:

- icon allignment animation for taskbar diviver view
- taskbar divider background color according to spec.

Test: Manual
Bug: 265170176
Flag: ENABLE_TASKBAR_PINNING
Change-Id: Ief45e48f4fc9f9b4cc30124c4c93cd3c5a880a33
parent 71d05f96

res/drawable/taskbar_divider_bg.xml→quickstep/res/drawable/taskbar_divider_bg.xml

+1 −2
Original line number Diff line number Diff line
@@ -14,8 +14,7 @@ 
     limitations under the License.

-->

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

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

    android:shape="rectangle" >

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

    <solid android:color="@color/taskbar_divider_background"/>

    <corners android:radius="1dp" />

</shape>

quickstep/src/com/android/launcher3/taskbar/TaskbarView.java

+8 −0
Original line number Diff line number Diff line
@@ -514,6 +514,14 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar 
        return mAllAppsButton;

    }



    /**

     * Returns the taskbar divider in the taskbar.

     */

    @Nullable

    public View getTaskbarDividerView() {

        return mTaskbarDivider;

    }



    /**

     * Returns the QSB in the taskbar.

     */

quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java

+3 −1
Original line number Diff line number Diff line
@@ -459,12 +459,14 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar 
        for (int i = 0; i < mTaskbarView.getChildCount(); i++) {

            View child = mTaskbarView.getChildAt(i);

            boolean isAllAppsButton = child == mTaskbarView.getAllAppsButtonView();

            boolean isTaskbarDividerView = child == mTaskbarView.getTaskbarDividerView();

            if (!mIsHotseatIconOnTopWhenAligned) {

                // When going to home, the EMPHASIZED interpolator in TaskbarLauncherStateController

                // plays iconAlignment to 1 really fast, therefore moving the fading towards the end

                // to avoid icons disappearing rather than fading out visually.

                setter.setViewAlpha(child, 0, Interpolators.clampToProgress(LINEAR, 0.8f, 1f));

            } else if ((isAllAppsButton && !FeatureFlags.ENABLE_ALL_APPS_BUTTON_IN_HOTSEAT.get())) {

            } else if ((isAllAppsButton && !FeatureFlags.ENABLE_ALL_APPS_BUTTON_IN_HOTSEAT.get())

                    || (isTaskbarDividerView && FeatureFlags.ENABLE_TASKBAR_PINNING.get())) {

                if (!isToHome

                        && mIsHotseatIconOnTopWhenAligned

                        && mControllers.taskbarStashController.isStashed()) {

res/color-night-v31/taskbar_divider_background.xml

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

<!-- Copyright (C) 2023 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">

  <item android:color="#797869" android:lStar="60" />

</selector>

res/color-v31/taskbar_divider_background.xml

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

<!-- Copyright (C) 2023 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">

  <item android:color="#797869" android:lStar="50" />

</selector>