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

Commit 248d95c6 authored by Fan Zhang's avatar Fan Zhang
Browse files

Add basic breadcrumb on search result. 

- Some line formatting
- Some UI tweak to make it more polished
- Updated the way we generate docid
- Use screen title as leaf level breadcrumb and display on UI (TBD how
  to get parent level titles)
- Hardcode breadcrumb for installed app results

Bug: 32936784
Test: make RunSettingsRoboTests
Change-Id: I18e0780f91b1123bbf25cd99adf2e2a5f684a83c
parent 48717f5c

res/layout/search_breadcrumb_view.xml

0 → 100644
+26 −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.

  -->



<TextView

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

    android:id="@+id/breadcrumb"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:paddingTop="8dp"

    android:textAppearance="?android:attr/textAppearanceListItemSecondary"

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

    android:ellipsize="marquee"/>
 
 No newline at end of file

res/layout/search_icon_view.xml

0 → 100644
+33 −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.

  -->

<LinearLayout

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

    android:id="@+id/icon_container"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:minWidth="60dp"

    android:gravity="center_horizontal|top"

    android:orientation="horizontal"

    android:paddingEnd="12dp"

    android:paddingTop="4dp"

    android:paddingBottom="4dp">

    <com.android.internal.widget.PreferenceImageView

        android:id="@android:id/icon"

        android:layout_width="36dp"

        android:layout_height="36dp"

        android:scaleType="fitCenter"/>

</LinearLayout>
 
 No newline at end of file

res/layout/search_inline_switch_item.xml

+35 −53
Original line number Diff line number Diff line
@@ -19,36 +19,20 @@ 
    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:minHeight="?android:attr/listPreferredItemHeight"

        android:gravity="center_vertical"

    android:paddingTop="16dp"

    android:paddingBottom="16dp"

    android:paddingStart="?android:attr/listPreferredItemPaddingStart"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

    android:background="?android:attr/selectableItemBackground"

    android:clipToPadding="false">



    <LinearLayout

            android:id="@+id/icon_container"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:minWidth="60dp"

            android:gravity="start|center_vertical"

            android:orientation="horizontal"

            android:paddingEnd="12dp"

            android:paddingTop="4dp"

            android:paddingBottom="4dp">

        <com.android.internal.widget.PreferenceImageView

                android:id="@android:id/icon"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:maxWidth="48dp"

                android:maxHeight="48dp"/>

    </LinearLayout>

    <include layout="@layout/search_icon_view"/>



    <RelativeLayout

            android:layout_width="wrap_content"

    <LinearLayout

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_weight="1"

            android:paddingTop="16dp"

            android:paddingBottom="16dp">

        android:orientation="vertical">



        <TextView

            android:id="@android:id/title"
@@ -62,20 +46,18 @@ 
            android:id="@android:id/summary"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

                android:layout_below="@android:id/title"

                android:layout_alignStart="@android:id/title"

            android:textAppearance="?android:attr/textAppearanceListItemSecondary"

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

            android:maxLength="60"

            android:maxLines="10"/>



    </RelativeLayout>

        <include layout="@layout/search_breadcrumb_view"/>

    </LinearLayout>



    <Switch

        android:id="@+id/switchView"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

            android:gravity="end|center_vertical"

            android:paddingStart="16dp"

            android:orientation="vertical"/>

        android:gravity="top"

        android:paddingStart="16dp"/>

</LinearLayout>
 
 No newline at end of file

res/layout/search_intent_item.xml

+30 −46
Original line number Diff line number Diff line
@@ -19,36 +19,20 @@ 
    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:minHeight="?android:attr/listPreferredItemHeight"

        android:gravity="center_vertical"

    android:paddingTop="16dp"

    android:paddingBottom="16dp"

    android:paddingStart="?android:attr/listPreferredItemPaddingStart"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

    android:background="?android:attr/selectableItemBackground"

    android:clipToPadding="false">



    <LinearLayout

            android:id="@+id/icon_container"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:minWidth="60dp"

            android:gravity="start|center_vertical"

            android:orientation="horizontal"

            android:paddingEnd="12dp"

            android:paddingTop="4dp"

            android:paddingBottom="4dp">

        <com.android.internal.widget.PreferenceImageView

                android:id="@android:id/icon"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:maxWidth="48dp"

                android:maxHeight="48dp"/>

    </LinearLayout>

    <include layout="@layout/search_icon_view"/>



    <RelativeLayout

    <LinearLayout

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_weight="1"

            android:paddingTop="16dp"

            android:paddingBottom="16dp">

        android:orientation="vertical">



        <TextView

            android:id="@android:id/title"
@@ -62,11 +46,11 @@ 
            android:id="@android:id/summary"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

                android:layout_below="@android:id/title"

                android:layout_alignStart="@android:id/title"

            android:textAppearance="?android:attr/textAppearanceListItemSecondary"

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

                android:maxLines="10"/>

            android:maxLines="3"

            android:ellipsize="marquee"/>



    </RelativeLayout>

        <include layout="@layout/search_breadcrumb_view"/>

    </LinearLayout>

</LinearLayout>

res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -5947,6 +5947,10 @@ 
    <string name="search_menu">Search settings</string>

    <!-- Text used as a search hint into the search box -->

    <string name="query_hint_text">Search settings</string>

    <!-- Search breadcrumb connector symbol -->

    <string name="search_breadcrumb_connector" translatable="false">

        <xliff:g name="first_item">%1$s</xliff:g> > <xliff:g name="second_item">%2$s</xliff:g>

    </string>









    <!-- Text used to identify the search query suggestions / recent searches -->









    <string name="search_recents_queries_label">Recent searches</string>