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

Commit fa693be1 authored by Anushree Ganjam's avatar Anushree Ganjam Committed by Android (Google) Code Review
Browse files

Merge "Revert "Refactors Search results into separate RV for Toast."" into tm-dev

parents f3924d62 5cc7ff09

quickstep/res/layout/taskbar_all_apps.xml

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

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



    @Override

    protected BaseAllAppsAdapter<TaskbarAllAppsContext> createAdapter(

            AlphabeticalAppsList<TaskbarAllAppsContext> appsList,

    protected BaseAllAppsAdapter getAdapter(AlphabeticalAppsList<TaskbarAllAppsContext> mAppsList,

            BaseAdapterProvider[] adapterProviders) {

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

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

                adapterProviders);

    }

}

res/layout/all_apps.xml

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

deleted100644 → 0
+0 −24
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

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