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

Commit 208ed75c authored by Winson Chung's avatar Winson Chung
Browse files

Pulling out predictions into another row view. 

Change-Id: Iba0d74457a1314cf0c00a88f9b07df049334e542
parent 11509ad6

res/layout/all_apps_button.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,5 +15,5 @@ 
-->



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

   style="@style/WorkspaceIcon"

   style="@style/Icon"

   android:focusable="true" />

res/layout/application.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,5 +15,5 @@ 
-->



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

   style="@style/WorkspaceIcon"

   style="@style/Icon"

   android:focusable="true" />

res/layout/apps_grid_row_icon_view.xml→res/layout/apps_grid_icon_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
<com.android.launcher3.BubbleTextView

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

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

    style="@style/WorkspaceIcon.AppsCustomize"

    style="@style/Icon.AllApps"

    android:id="@+id/icon"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

res/layout/apps_list_view.xml

+25 −18
Original line number Diff line number Diff line
@@ -13,20 +13,37 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<LinearLayout

<FrameLayout

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

    android:id="@+id/apps_list"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical"

    android:elevation="15dp"

    android:visibility="gone"

    android:focusableInTouchMode="true">

    <com.android.launcher3.AppsContainerRecyclerView

        android:id="@+id/apps_list_view"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_marginTop="@dimen/apps_search_bar_height"

        android:layout_gravity="center_horizontal|top"

        android:clipToPadding="false"

        android:focusable="true"

        android:descendantFocusability="afterDescendants" />

    <LinearLayout

        android:id="@+id/prediction_bar"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginTop="@dimen/apps_search_bar_height"

        android:orientation="horizontal"

        android:visibility="invisible">

    </LinearLayout>



    <!-- We always want the search bar on top, so it goes last. -->

    <FrameLayout

        android:id="@+id/header"

        android:layout_width="match_parent"

        android:layout_height="@dimen/apps_search_bar_height"

        android:orientation="horizontal"

        android:background="@drawable/apps_search_bg">

        <LinearLayout

            android:id="@+id/app_search_container"
@@ -40,8 +57,8 @@ 
                android:layout_height="wrap_content"

                android:layout_gravity="start|center_vertical"

                android:layout_marginStart="4dp"

                android:paddingTop="12dp"

                android:paddingBottom="12dp"

                android:paddingTop="13dp"

                android:paddingBottom="13dp"

                android:contentDescription="@string/all_apps_button_label"

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

            <com.android.launcher3.AppsContainerSearchEditTextView
@@ -69,19 +86,9 @@ 
            android:layout_height="wrap_content"

            android:layout_gravity="end|center_vertical"

            android:layout_marginEnd="6dp"

            android:paddingTop="12dp"

            android:paddingBottom="12dp"

            android:paddingTop="13dp"

            android:paddingBottom="13dp"

            android:contentDescription="@string/apps_view_search_bar_hint"

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

    </FrameLayout>

    <com.android.launcher3.AppsContainerRecyclerView

        android:id="@+id/apps_list_view"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_gravity="center"

        android:paddingTop="12dp"

        android:paddingBottom="12dp"

        android:clipToPadding="false"

        android:focusable="true"

        android:descendantFocusability="afterDescendants" />

</LinearLayout>
 
 No newline at end of file
 
</FrameLayout>
 
 No newline at end of file

res/layout/apps_prediction_bar_icon_view.xml

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

<!-- Copyright (C) 2015 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.BubbleTextView

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

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

    style="@style/Icon.AllApps"

    android:id="@+id/icon"

    android:layout_width="0dp"

    android:layout_height="match_parent"

    android:layout_gravity="center"

    android:layout_weight="1"

    android:focusable="true"

    android:background="@drawable/focusable_view_bg"

    launcher:deferShadowGeneration="true"

    launcher:iconDisplay="all_apps" />