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

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

Simplifying all-apps search box 

> Giving the search box a solid background so that it work fine with scrolling
> bottom shadow logic for search box

Bug: 73085356
Change-Id: Ie4dc4922be39ffd8e2d562becedbd4c6f820e6c9
parent dd535466

res/drawable/all_apps_search_divider.xml→res/drawable/bg_all_apps_searchbox.xml

+4 −5
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2016 The Android Open Source Project

<!-- Copyright (C) 2018 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.
@@ -13,8 +13,7 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

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

       android:shape="rectangle">

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

    <size android:height="1dp" />

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

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

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

</shape>
 
 No newline at end of file

res/layout/all_apps.xml

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
     platform bug, which prevents using custom attributes in <include> tag -->

    <include

        android:id="@id/search_container_all_apps"

        layout="?android:attr/keyboardLayout"/>

        layout="@layout/search_container_all_apps"/>



    <View

        android:id="@+id/nav_bar_bg"

res/layout/search_container_all_apps.xml

+20 −50
Original line number Diff line number Diff line
@@ -17,53 +17,23 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@id/search_container_all_apps"

    android:layout_width="match_parent"

    android:layout_height="@dimen/all_apps_search_bar_height"

    android:layout_gravity="center|top"

    android:layout_marginBottom="-8dp"

    android:gravity="center|bottom"

    android:paddingLeft="@dimen/dynamic_grid_edge_margin"

    android:paddingRight="@dimen/dynamic_grid_edge_margin"

    android:saveEnabled="false" >



    <!--

      Note: The following relation should always be true so that the shadows are aligned properly

      search_box_input.layout_marginBottom

            == search_divider.layout_marginBottom

            == - (search_container.layout_marginBottom)

            >= 5dp

    -->

    <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:layout_gravity="bottom"

        android:layout_marginBottom="8dp"

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

    android:layout_centerHorizontal="true"

    android:layout_gravity="top|center_horizontal"

    android:layout_marginTop="8dp"

    android:background="@drawable/bg_all_apps_searchbox"

    android:elevation="1dp"

    android:focusableInTouchMode="true"

    android:gravity="center"

    android:hint="@string/all_apps_search_bar_hint"

    android:imeOptions="actionSearch|flagNoExtractUi"

    android:inputType="text|textNoSuggestions|textCapWords"

    android:maxLines="1"

    android:padding="8dp"

    android:saveEnabled="false"

    android:scrollHorizontally="true"

    android:singleLine="true"

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

    android:textColorHint="@drawable/all_apps_search_hint"

        android:textSize="16sp" />



    <!-- This needs to be a container with a view, to simulate a scrolling effect for the header.

         We translate the header down, and its content up by the same amount, so that it gets

         clipped by the parent, making it look like the divider was scrolled out of the view. -->

    <FrameLayout

        android:id="@+id/search_divider"

        android:layout_width="match_parent"

        android:layout_height="1dp"

        android:layout_gravity="bottom"

        android:layout_marginBottom="8dp" >

        <View

            android:layout_width="match_parent"

            android:layout_height="1dp"

            android:background="@drawable/all_apps_search_divider"/>

    </FrameLayout>

</com.android.launcher3.allapps.search.AppsSearchContainerLayout>
 
 No newline at end of file
 
    android:textSize="16sp"

    android:translationY="24dp" />
 
 No newline at end of file

res/values-sw720dp/styles.xml

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
        <item name="android:windowNoTitle">true</item>

        <item name="android:windowActionModeOverlay">true</item>

        <item name="android:colorEdgeEffect">?android:attr/textColorSecondary</item>

        <item name="android:keyboardLayout">@layout/search_container_all_apps</item>

    </style>



    <!-- Workspace -->

res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ 
    <!-- All Apps -->

    <dimen name="all_apps_button_scale_down">0dp</dimen>

    <dimen name="all_apps_search_bar_field_height">48dp</dimen>

    <dimen name="all_apps_search_bar_height">60dp</dimen>

    <dimen name="all_apps_search_bar_bottom_padding">30dp</dimen>

    <dimen name="all_apps_empty_search_message_top_offset">40dp</dimen>

    <dimen name="all_apps_empty_search_bg_top_offset">144dp</dimen>

    <dimen name="all_apps_background_canvas_width">700dp</dimen>