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

Commit 161f96bc authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Moving apps search related logic into a custom layout file 

This will allow derivative projects to easily change the search behavior
by simply overriding the xml file

Bug: 37616877
Change-Id: Ib8d6a2dab06819a52611e9a3d97c70c5a49bbf97
parent b73fa5d7

res/layout/all_apps.xml

+3 −27
Original line number Diff line number Diff line
@@ -64,33 +64,9 @@ 
            android:layout_alignParentEnd="true"

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



        <FrameLayout

            android:id="@+id/search_container"

            android:layout_width="match_parent"

            android:layout_height="@dimen/all_apps_search_bar_height"

            android:layout_gravity="center|top"

            android:gravity="center|bottom"

            android:orientation="horizontal"

            android:saveEnabled="false">



            <com.android.launcher3.ExtendedEditText

                android:id="@+id/search_box_input"

                android:layout_width="match_parent"

                android:layout_height="@dimen/all_apps_search_bar_field_height"

                android:background="@android:color/transparent"

                android:layout_gravity="bottom"

                android:focusableInTouchMode="true"

                android:gravity="center"

                android:imeOptions="actionSearch|flagNoExtractUi"

                android:inputType="text|textNoSuggestions|textCapWords"

                android:maxLines="1"

                android:scrollHorizontally="true"

                android:singleLine="true"

                android:textColor="?android:attr/textColorSecondary"

                android:hint="@string/all_apps_search_bar_hint"

                android:textColorHint="@drawable/all_apps_search_hint"

                android:textSize="16sp" />

        </FrameLayout>

        <include

            layout="@layout/all_apps_search_container"

            android:id="@+id/search_container" />



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

    <View

res/layout/all_apps_search_container.xml

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

<!-- Copyright (C) 2017 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.search.AppsSearchContainerLayout

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

    android:layout_width="match_parent"

    android:layout_height="@dimen/all_apps_search_bar_height"

    android:layout_gravity="center|top"

    android:gravity="center|bottom"

    android:id="@+id/search_container"

    android:saveEnabled="false">



    <com.android.launcher3.ExtendedEditText

        android:id="@+id/search_box_input"

        android:layout_width="match_parent"

        android:layout_height="@dimen/all_apps_search_bar_field_height"

        android:background="@android:color/transparent"

        android:layout_gravity="bottom"

        android:focusableInTouchMode="true"

        android:gravity="center"

        android:imeOptions="actionSearch|flagNoExtractUi"

        android:inputType="text|textNoSuggestions|textCapWords"

        android:maxLines="1"

        android:scrollHorizontally="true"

        android:singleLine="true"

        android:textColor="?android:attr/textColorSecondary"

        android:hint="@string/all_apps_search_bar_hint"

        android:textColorHint="@drawable/all_apps_search_hint"

        android:textSize="16sp" />

</com.android.launcher3.allapps.search.AppsSearchContainerLayout>
 
 No newline at end of file

res/layout/widgets_view.xml

+0 −1
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ 
        <!-- Fast scroller popup -->

        <TextView

            style="@style/FastScrollerPopup"

            android:layout_below="@+id/search_container"

            android:id="@+id/fast_scroller_popup"

            android:layout_gravity="top|end"

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

res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -13,6 +13,10 @@ 
     easily override the app name without providing all translations -->

    <string name="derived_app_name" translatable="false">@string/app_name</string>



    <!-- String representing the intent for search on the apps market. To specify a query, add

    q=<query> to the data to the intent -->

    <string name="market_search_intent" translatable="false">market://search?c=apps</string>



    <!-- Values for icon shape overrides. These should correspond to entries defined

     in icon_shape_override_paths_names -->

    <string-array name="icon_shape_override_paths_values">

src/com/android/launcher3/BaseRecyclerView.java

+0 −4
Original line number Diff line number Diff line
@@ -82,10 +82,6 @@ public abstract class BaseRecyclerView extends RecyclerView 
        }

    }



    public void reset() {

        mScrollbar.reattachThumbToScroll();

    }



    @Override

    protected void onFinishInflate() {

        super.onFinishInflate();