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

Commit adb364a1 authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Unifying multiple all-apps implementations 

> Using a single layout for the all-apps content
> Removing some unnecessary themes
> Fixing search chashes in SecondaryDisplayLauncher

Bug: 259733681
Test: Existing TAPL tests verify that Launcher/AllApps work properly
Change-Id: Icd5310316499cd421bc039cdbd4d398b813cd477
parent 80872f32

quickstep/res/layout/taskbar_all_apps.xml

+1 −36
Original line number Diff line number Diff line
@@ -27,40 +27,5 @@ 
        android:clipChildren="true"

        android:clipToPadding="false"

        android:focusable="false"

        android:saveEnabled="false"

        android:theme="?attr/allAppsTheme">



        <include

            layout="@layout/all_apps_bottom_sheet_background"

            android:visibility="gone" />



        <include

            layout="@layout/search_results_rv_layout"

            android:visibility="gone" />



        <include

            layout="@layout/all_apps_rv_layout"

            android:visibility="gone" />



        <com.android.launcher3.allapps.FloatingHeaderView

            android:id="@+id/all_apps_header"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_below="@id/search_container_all_apps"

            android:clipToPadding="false"

            android:orientation="vertical">



            <include layout="@layout/floating_header_content" />



            <include layout="@layout/all_apps_personal_work_tabs" />

        </com.android.launcher3.allapps.FloatingHeaderView>



        <com.android.launcher3.taskbar.allapps.TaskbarAllAppsFallbackSearchContainer

            android:id="@+id/search_container_all_apps"

            android:layout_width="0dp"

            android:layout_height="0dp"

            android:visibility="gone" />



        <include layout="@layout/all_apps_fast_scroller" />

    </com.android.launcher3.taskbar.allapps.TaskbarAllAppsContainerView>

        android:saveEnabled="false" />

</com.android.launcher3.taskbar.allapps.TaskbarAllAppsSlideInView>

quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsContainerView.java

+20 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ package com.android.launcher3.taskbar.allapps; 


import android.content.Context;

import android.util.AttributeSet;

import android.view.View;

import android.view.WindowInsets;



import com.android.launcher3.DeviceProfile;
@@ -42,6 +43,19 @@ public class TaskbarAllAppsContainerView extends 
        return super.onApplyWindowInsets(insets);

    }



    @Override

    protected View inflateSearchBox() {

        // Remove top padding of header, since we do not have any search

        mHeader.setPadding(mHeader.getPaddingLeft(), 0,

                mHeader.getPaddingRight(), mHeader.getPaddingBottom());



        TaskbarAllAppsFallbackSearchContainer searchView =

                new TaskbarAllAppsFallbackSearchContainer(getContext(), null);

        searchView.setId(R.id.search_container_all_apps);

        searchView.setVisibility(GONE);

        return searchView;

    }



    @Override

    protected boolean isSearchSupported() {

        return false;
@@ -53,4 +67,10 @@ public class TaskbarAllAppsContainerView extends 
        // TODO(b/240670050): Remove this and add header protection for the taskbar entrypoint.

        mBottomSheetBackground.setBackgroundResource(R.drawable.bg_rounded_corner_bottom_sheet);

    }



    @Override

    public boolean isInAllApps() {

        // All apps is always open

        return true;

    }

}

quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayContext.java

+0 −9
Original line number Diff line number Diff line
@@ -21,9 +21,6 @@ import android.view.View; 
import com.android.launcher3.DeviceProfile;

import com.android.launcher3.LauncherPrefs;

import com.android.launcher3.R;

import com.android.launcher3.allapps.ActivityAllAppsContainerView;

import com.android.launcher3.allapps.search.DefaultSearchAdapterProvider;

import com.android.launcher3.allapps.search.SearchAdapterProvider;

import com.android.launcher3.dot.DotInfo;

import com.android.launcher3.model.data.ItemInfo;

import com.android.launcher3.popup.PopupDataProvider;
@@ -137,10 +134,4 @@ public class TaskbarOverlayContext extends BaseTaskbarContext { 


    @Override

    public void onPopupVisibilityChanged(boolean isVisible) {}



    @Override

    public SearchAdapterProvider<?> createSearchAdapterProvider(

            ActivityAllAppsContainerView<?> appsView) {

        return new DefaultSearchAdapterProvider(this);

    }

}

res/drawable/bg_all_apps_searchbox.xml

+2 −1
Original line number Diff line number Diff line
@@ -15,5 +15,6 @@ 
-->

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

    <solid android:color="?attr/popupColorPrimary" />

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

    <corners android:radius="@dimen/rounded_button_radius" />

    <stroke android:color="?attr/allappsHeaderProtectionColor" android:width=".5dp" />

</shape>
 
 No newline at end of file

res/layout/all_apps.xml

+1 −5
Original line number Diff line number Diff line
@@ -17,13 +17,9 @@ 
     will bake the left/right padding into that view's background itself. -->

<com.android.launcher3.allapps.LauncherAllAppsContainerView xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/apps_view"

    android:theme="?attr/allAppsTheme"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:clipChildren="true"

    android:clipToPadding="false"

    android:focusable="false"

    android:saveEnabled="false">



    <include layout="@layout/all_apps_content" />

</com.android.launcher3.allapps.LauncherAllAppsContainerView>
 
 No newline at end of file
 
    android:saveEnabled="false" />
 
 No newline at end of file