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

Commit 310a9889 authored by Peter Schiller's avatar Peter Schiller
Browse files

Updating all apps to match spec 

Change-Id: Ie351fdea2e3b05ca911e6533f0c5d00c17e0847c
parent b1e9e8d6

res/drawable/all_apps_search_bg.xml

+1 −9
Original line number Diff line number Diff line
@@ -15,14 +15,6 @@ 
     limitations under the License.

-->

<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <item>

        <shape android:shape="rectangle">

            <solid android:color="@color/quantum_panel_bg_color" />

            <corners

                android:topLeftRadius="2dp"

                android:topRightRadius="2dp" />

        </shape>

    </item>

    <item

        android:top="@dimen/all_apps_search_bar_bg_overflow"

        android:left="@dimen/all_apps_search_bar_bg_overflow"
@@ -33,7 +25,7 @@ 
            <solid android:color="@android:color/transparent" />

            <stroke

                android:width="@dimen/all_apps_search_bar_divider_width"

                android:color="#1E000000"/>

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

        </shape>

    </item>

</layer-list>
 
 No newline at end of file

res/drawable/all_apps_search_hint.xml

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

<!--

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

-->

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

    <item android:color="@android:color/transparent" android:state_focused="true" />

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

</selector>
 
 No newline at end of file

res/drawable/ic_allapps_search.xml

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

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

-->

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

    android:width="24dp"

    android:height="24dp"

    android:viewportHeight="24.0"

    android:viewportWidth="24.0">

    <path

        android:fillColor="?android:attr/colorAccent"

        android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z" />

</vector>

res/layout/all_apps.xml

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

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

<!-- Copyright (C) 2016 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.
@@ -16,15 +16,14 @@ 
<!-- The top and bottom paddings are defined in this container, but since we want

     the list view to span the full width (for touch interception purposes), we

     will bake the left/right padding into that view's background itself. -->

<com.android.launcher3.allapps.AllAppsContainerView

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

<com.android.launcher3.allapps.AllAppsContainerView xmlns:android="http://schemas.android.com/apk/res/android"

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

    android:id="@+id/apps_view"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:paddingTop="@dimen/container_bounds_inset"

    android:paddingBottom="@dimen/container_bounds_inset"

    android:orientation="vertical"

    android:paddingBottom="@dimen/container_bounds_inset"

    android:paddingTop="@dimen/container_bounds_inset"

    launcher:revealBackground="@drawable/quantum_panel_shape">



    <View
@@ -32,60 +31,70 @@ 
        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_gravity="center"

        android:focusable="false"

        android:elevation="2dp"

        android:focusable="false"

        android:visibility="invisible" />





    <com.android.launcher3.allapps.AllAppsRecyclerViewContainerView

        android:id="@+id/main_content"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:id="@+id/main_content"

        android:saveEnabled="false"

        android:visibility="gone"

        android:layout_gravity="center"

        android:elevation="15dp"

        android:focusable="true"

        android:focusableInTouchMode="true"

        android:elevation="15dp" >

        android:saveEnabled="false"

        android:visibility="gone">



        <!-- DO NOT CHANGE THE ID -->

        <com.android.launcher3.allapps.AllAppsRecyclerView

            android:id="@+id/apps_list_view"

            android:theme="@style/CustomOverscroll.Light"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:layout_gravity="center_horizontal|top"

            android:layout_marginTop="@dimen/all_apps_search_bar_height"

            android:clipToPadding="false"

            android:descendantFocusability="afterDescendants"

            android:focusable="true"

            android:layout_marginTop="@dimen/all_apps_search_bar_height"

            android:descendantFocusability="afterDescendants" />

            android:theme="@style/CustomOverscroll.Light" />



        <LinearLayout

            android:id="@+id/search_container"

            android:layout_width="match_parent"

            android:saveEnabled="false"

            android:layout_height="@dimen/all_apps_search_bar_height"

            android:layout_gravity="start|top"

            android:layout_gravity="center|top"

            android:paddingLeft="@dimen/container_fastscroll_thumb_max_width"

            android:paddingRight="@dimen/container_fastscroll_thumb_max_width"

            android:background="@drawable/all_apps_search_bg"

            android:gravity="center|bottom"

            android:orientation="horizontal"

            android:background="@drawable/all_apps_search_bg" >

            android:saveEnabled="false">



            <ImageView

                android:id="@+id/search_icon"

                android:layout_width="wrap_content"

                android:layout_height="match_parent"

                android:scaleType="fitCenter"

                android:layout_marginTop="@dimen/all_apps_search_bar_icon_margin_top"

                android:paddingEnd="@dimen/all_apps_search_bar_icon_margin_right"

                android:src="@drawable/ic_allapps_search" />



            <com.android.launcher3.ExtendedEditText

                android:id="@+id/search_box_input"

                android:layout_width="match_parent"

                android:layout_width="wrap_content"

                android:layout_height="match_parent"

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

                android:focusableInTouchMode="true"

                android:gravity="fill_horizontal|center_vertical"

                android:gravity="start|center_vertical"

                android:hint="@string/all_apps_search_bar_hint"

                android:inputType="text|textNoSuggestions|textCapWords"

                android:imeOptions="actionSearch|flagNoExtractUi"

                android:inputType="text|textNoSuggestions|textCapWords"

                android:maxLines="1"

                android:scrollHorizontally="true"

                android:layout_marginLeft="@dimen/container_fastscroll_thumb_max_width"

                android:layout_marginRight="@dimen/container_fastscroll_thumb_max_width"

                android:singleLine="true"

                android:textColor="#4c4c4c"

                android:textColorHint="#9c9c9c"

                android:textColorHint="@drawable/all_apps_search_hint"

                android:textSize="16sp" />

        </LinearLayout>

res/values/dimens.xml

+3 −1
Original line number Diff line number Diff line
@@ -64,6 +64,8 @@ 
    <dimen name="all_apps_grid_section_y_offset">8dp</dimen>

    <dimen name="all_apps_grid_section_text_size">24sp</dimen>

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

    <dimen name="all_apps_search_bar_icon_margin_right">4dp</dimen>

    <dimen name="all_apps_search_bar_icon_margin_top">1dp</dimen>

    <dimen name="all_apps_icon_top_bottom_padding">8dp</dimen>

    <dimen name="all_apps_icon_width_gap">24dp</dimen>

    <!-- The top padding should account for the existing all_apps_list_top_bottom_padding -->
@@ -76,7 +78,7 @@ 
    <dimen name="all_apps_background_canvas_height">475dp</dimen>



    <!-- Search bar in All Apps -->

    <dimen name="all_apps_header_max_elevation">4dp</dimen>

    <dimen name="all_apps_header_max_elevation">3dp</dimen>

    <dimen name="all_apps_header_scroll_to_elevation">16dp</dimen>

    <dimen name="all_apps_header_shadow_height">6dp</dimen>