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

Commit e3dea345 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Adds ENABLE_FLOATING_SEARCH_BOX flag for All Apps."

parents b607781d cf462e87

res/layout/all_apps.xml

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
        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:paddingTop="@dimen/all_apps_header_top_padding"

        android:paddingBottom="@dimen/all_apps_header_bottom_padding"

res/layout/all_apps_content_layout.xml

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

<!--

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

  -->

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

    android:id="@+id/apps_list_view_override"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_below="@id/search_container_all_apps"

    android:clipToPadding="false"

    android:descendantFocusability="afterDescendants"

    android:focusable="true"

    android:layout_marginTop="@dimen/all_apps_header_top_padding"

    android:orientation="vertical">

</LinearLayout>

res/layout/all_apps_fast_scroller.xml

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
        android:id="@+id/fast_scroller_popup"

        style="@style/FastScrollerPopup"

        android:layout_alignParentEnd="true"

        android:layout_below="@+id/search_container_all_apps"

        android:layout_alignTop="@+id/all_apps_header"

        android:layout_marginEnd="@dimen/fastscroll_popup_margin" />



    <com.android.launcher3.views.RecyclerViewFastScroller
@@ -30,7 +30,7 @@ 
        android:layout_height="wrap_content"

        android:layout_alignParentBottom="true"

        android:layout_alignParentEnd="true"

        android:layout_below="@+id/search_container_all_apps"

        android:layout_alignTop="@+id/all_apps_header"

        android:layout_marginEnd="@dimen/fastscroll_end_margin"

        launcher:canThumbDetach="true" />

res/layout/all_apps_rv_layout.xml

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
    android:id="@+id/apps_list_view"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_below="@id/search_container_all_apps"

    android:clipToPadding="false"

    android:descendantFocusability="afterDescendants"

    android:focusable="true" />

res/layout/all_apps_tabs.xml

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
    android:id="@+id/all_apps_tabs_view_pager"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_below="@id/search_container_all_apps"

    android:layout_gravity="center_horizontal|top"

    android:layout_marginTop="@dimen/all_apps_header_pill_height"

    android:clipChildren="true"