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

Commit bc505639 authored by Sreyas Rangaraju's avatar Sreyas Rangaraju Committed by Android (Google) Code Review
Browse files

Merge "OverviewActions: Creating parent view to house RecentsView and Overview... 

Merge "OverviewActions: Creating parent view to house RecentsView and Overview Actions." into ub-launcher3-master
parents 218f5276 a241df66

quickstep/recents_ui_overrides/res/layout/overview_panel.xml

+13 −8
Original line number Diff line number Diff line
@@ -14,8 +14,12 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<com.android.quickstep.views.LauncherRecentsView

<com.android.launcher3.InsettableFrameLayout

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

    android:layout_width="wrap_content"

    android:layout_height="wrap_content">

    <com.android.quickstep.views.LauncherRecentsView

        android:id="@+id/overview_panel_recents"

        android:theme="@style/HomeScreenElementTheme"

        android:layout_width="match_parent"

        android:layout_height="match_parent"
@@ -23,3 +27,4 @@ 
        android:clipToPadding="false"

        android:accessibilityPaneTitle="@string/accessibility_recent_apps"

        android:visibility="invisible" />

</com.android.launcher3.InsettableFrameLayout>

quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java

+1 −1
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ public abstract class BaseQuickstepLauncher extends Launcher 


        if (FeatureFlags.ENABLE_OVERVIEW_ACTIONS.get() && removeShelfFromOverview(this)) {

            // Overview is above all other launcher elements, including qsb, so move it to the top.

            getOverviewPanel().bringToFront();

            getOverviewPanelContainer().bringToFront();

        }

    }

res/layout/launcher.xml

+2 −3
Original line number Diff line number Diff line
@@ -44,9 +44,8 @@ 
            layout="@layout/hotseat" />



        <include

            android:id="@+id/overview_panel"

            layout="@layout/overview_panel"

            android:visibility="gone" />

            android:id="@+id/overview_panel_container"

            layout="@layout/overview_panel"/>



        <!-- Keep these behind the workspace so that they are not visible when

         we go into AllApps -->

res/layout/overview_panel.xml

+4 −2
Original line number Diff line number Diff line
@@ -14,7 +14,9 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<Space

<FrameLayout

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

      android:id="@+id/overview_panel_recents"

      android:layout_width="0dp"

      android:layout_height="0dp" />
 
 No newline at end of file
 
      android:layout_height="0dp"

      android:visibility="gone" />
 
 No newline at end of file

src/com/android/launcher3/Launcher.java

+8 −1
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ import android.view.View; 
import android.view.ViewGroup;

import android.view.accessibility.AccessibilityEvent;

import android.view.animation.OvershootInterpolator;

import android.widget.FrameLayout;

import android.widget.Toast;



import androidx.annotation.Nullable;
@@ -273,6 +274,7 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns, 


    // UI and state for the overview panel

    private View mOverviewPanel;

    private FrameLayout mOverviewPanelContainer;



    @Thunk

    boolean mWorkspaceLoading = true;
@@ -1143,7 +1145,8 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns, 
        mFocusHandler = mDragLayer.getFocusIndicatorHelper();

        mWorkspace = mDragLayer.findViewById(R.id.workspace);

        mWorkspace.initParentViews(mDragLayer);

        mOverviewPanel = findViewById(R.id.overview_panel);

        mOverviewPanel = findViewById(R.id.overview_panel_recents);

        mOverviewPanelContainer = findViewById(R.id.overview_panel_container);

        mHotseat = findViewById(R.id.hotseat);



        mLauncherView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
@@ -1386,6 +1389,10 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns, 
        return (T) mOverviewPanel;

    }



    public FrameLayout getOverviewPanelContainer() {

        return mOverviewPanelContainer;

    }



    public DropTargetBar getDropTargetBar() {

        return mDropTargetBar;

    }