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

Commit 49fb8efb authored by Andy Wickham's avatar Andy Wickham
Browse files

[conflict] Merge "Moves Search results into a separate RV (take 2)." into... 

[conflict] Merge "Moves Search results into a separate RV (take 2)." into tm-dev am: 4ca247a6 am: 15dc59f8 am: 9fe363f1

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18420827



Change-Id: Idda9dad08cb939a8e4ada7dc46b4af2ce103fdd7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 31311d30 9fe363f1

quickstep/res/layout/taskbar_all_apps.xml

+4 −0
Original line number Diff line number Diff line
@@ -33,6 +33,10 @@ 
            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" />

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

+3 −2
Original line number Diff line number Diff line
@@ -44,9 +44,10 @@ public class TaskbarAllAppsContainerView extends 
    }



    @Override

    protected BaseAllAppsAdapter getAdapter(AlphabeticalAppsList<TaskbarAllAppsContext> mAppsList,

    protected BaseAllAppsAdapter<TaskbarAllAppsContext> createAdapter(

            AlphabeticalAppsList<TaskbarAllAppsContext> appsList,

            BaseAdapterProvider[] adapterProviders) {

        return new AllAppsGridAdapter<>(mActivityContext, getLayoutInflater(), mAppsList,

        return new AllAppsGridAdapter<>(mActivityContext, getLayoutInflater(), appsList,

                adapterProviders);

    }

}

res/layout/all_apps.xml

+4 −0
Original line number Diff line number Diff line
@@ -29,6 +29,10 @@ 
        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" />

res/layout/search_results_rv_layout.xml

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

<!--

  ~ Copyright (C) 2022 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.

  -->

<com.android.launcher3.allapps.SearchRecyclerView

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

    android:id="@+id/search_results_list_view"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:clipToPadding="false"

    android:descendantFocusability="afterDescendants"

    android:focusable="true" />

res/layout/secondary_launcher.xml

+4 −0
Original line number Diff line number Diff line
@@ -59,6 +59,10 @@ 
            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" />