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

Commit 81d1295b authored by Liran Binyamin's avatar Liran Binyamin Committed by Android (Google) Code Review
Browse files

Merge "Create container view for bubble bar" into main

parents 71fb897f c25aa0c2

quickstep/res/layout/customizable_taskbar.xml

+20 −14
Original line number Diff line number Diff line
@@ -51,6 +51,12 @@ 
        android:layout_width="match_parent"

        android:layout_height="match_parent"/>



    <FrameLayout

        android:id="@+id/taskbar_bubbles_container"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:clipChildren="false">



        <com.android.launcher3.taskbar.bubbles.BubbleBarView

            android:id="@+id/taskbar_bubbles"

            android:layout_width="wrap_content"
@@ -63,8 +69,8 @@ 
            android:visibility="gone"

            android:gravity="center"

            android:clipChildren="false"

        android:elevation="@dimen/bubblebar_elevation"

        />

            android:elevation="@dimen/bubblebar_elevation" />

    </FrameLayout>



    <com.android.launcher3.taskbar.navbutton.NearestTouchFrame

        android:id="@+id/navbuttons_view"

quickstep/res/layout/taskbar.xml

+18 −11
Original line number Diff line number Diff line
@@ -35,6 +35,12 @@ 
        android:layout_width="match_parent"

        android:layout_height="match_parent"/>



    <FrameLayout

        android:id="@+id/taskbar_bubbles_container"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:clipChildren="false">



        <com.android.launcher3.taskbar.bubbles.BubbleBarView

            android:id="@+id/taskbar_bubbles"

            android:layout_width="wrap_content"
@@ -46,6 +52,7 @@ 
            android:layout_gravity="bottom"

            android:clipChildren="false"

            android:elevation="@dimen/bubblebar_elevation" />

    </FrameLayout>



    <com.android.launcher3.taskbar.navbutton.NearestTouchFrame

        android:id="@+id/navbuttons_view"

quickstep/res/layout/transient_taskbar.xml

+18 −12
Original line number Diff line number Diff line
@@ -38,6 +38,12 @@ 
        android:layout_width="match_parent"

        android:layout_height="match_parent"/>



    <FrameLayout

        android:id="@+id/taskbar_bubbles_container"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:clipChildren="false">



        <com.android.launcher3.taskbar.bubbles.BubbleBarView

            android:id="@+id/taskbar_bubbles"

            android:layout_width="wrap_content"
@@ -48,8 +54,8 @@ 
            android:visibility="gone"

            android:gravity="center"

            android:clipChildren="false"

        android:elevation="@dimen/bubblebar_elevation"

        />

            android:elevation="@dimen/bubblebar_elevation" />

    </FrameLayout>



    <com.android.launcher3.taskbar.navbutton.NearestTouchFrame

        android:id="@+id/navbuttons_view"

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

+4 −1
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ import android.view.Surface; 
import android.view.View;

import android.view.WindowInsets;

import android.view.WindowManager;

import android.widget.FrameLayout;

import android.widget.Toast;

import android.window.RemoteTransition;
@@ -268,8 +269,10 @@ public class TaskbarActivityContext extends BaseTaskbarContext { 
        NearestTouchFrame navButtonsView = mDragLayer.findViewById(R.id.navbuttons_view);

        StashedHandleView stashedHandleView = mDragLayer.findViewById(R.id.stashed_handle);

        BubbleBarView bubbleBarView = null;

        FrameLayout bubbleBarContainer = null;

        if (isTransientTaskbar || Flags.enableBubbleBarInPersistentTaskBar()) {

            bubbleBarView = mDragLayer.findViewById(R.id.taskbar_bubbles);

            bubbleBarContainer = mDragLayer.findViewById(R.id.taskbar_bubbles_container);

        }

        StashedHandleView bubbleHandleView = mDragLayer.findViewById(R.id.stashed_bubble_handle);
@@ -296,7 +299,7 @@ public class TaskbarActivityContext extends BaseTaskbarContext { 
                    : new PersistentBubbleStashController(dimensionsProvider);

            bubbleControllersOptional = Optional.of(new BubbleControllers(

                    new BubbleBarController(this, bubbleBarView),

                    new BubbleBarViewController(this, bubbleBarView),

                    new BubbleBarViewController(this, bubbleBarView, bubbleBarContainer),

                    bubbleStashController,

                    bubbleHandleController,

                    new BubbleDragController(this),

quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewController.java

+3 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.util.Log; 
import android.util.TypedValue;

import android.view.MotionEvent;

import android.view.View;

import android.widget.FrameLayout;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;
@@ -122,7 +123,8 @@ public class BubbleBarViewController { 
    @Nullable

    private BubbleBarBoundsChangeListener mBoundsChangeListener;



    public BubbleBarViewController(TaskbarActivityContext activity, BubbleBarView barView) {

    public BubbleBarViewController(TaskbarActivityContext activity, BubbleBarView barView,

            FrameLayout bubbleBarContainer) {

        mActivity = activity;

        mBarView = barView;

        mSystemUiProxy = SystemUiProxy.INSTANCE.get(mActivity);