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

Commit 61255c0c authored by Matthew Fritze's avatar Matthew Fritze Committed by android-build-merger
Browse files

Merge "Update Search UX for OC" into oc-dev 

am: 0cdade8a

Change-Id: Id21676b0e0fe9cb67474fa977f58e6c647db4fa8
parents 8465bd3a 0cdade8a

res/layout/search_breadcrumb_view.xml

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    android:id="@+id/breadcrumb"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:paddingTop="8dp"

    android:paddingTop="5dp"

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

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

    android:ellipsize="marquee"/>

res/layout/search_inline_switch_item.xml

+2 −3
Original line number Diff line number Diff line
@@ -46,9 +46,8 @@ 
            android:id="@android:id/summary"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

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

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

            android:maxLines="10"/>

            android:singleLine="true"

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



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

    </LinearLayout>

res/layout/search_intent_item.xml

+1 −2
Original line number Diff line number Diff line
@@ -46,9 +46,8 @@ 
            android:id="@android:id/summary"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:singleLine="true"

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

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

            android:maxLines="3"

            android:ellipsize="marquee"/>



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

src/com/android/settings/search2/DatabaseIndexingManager.java

+0 −1
Original line number Diff line number Diff line
@@ -749,7 +749,6 @@ public class DatabaseIndexingManager { 
                    .setEntries(null)

                    .setClassName(fragmentName)

                    .setScreenTitle(screenTitle)

                    .setIconResId(iconResId)

                    .setRank(rank)

                    .setIntentAction(intentAction)

                    .setIntentTargetPackage(intentTargetPackage)

src/com/android/settings/search2/SearchViewHolder.java

+2 −0
Original line number Diff line number Diff line
@@ -66,9 +66,11 @@ public abstract class SearchViewHolder extends RecyclerView.ViewHolder { 
            iconView.setImageDrawable(appResult.info.loadIcon(pm));

        } else if (result.icon != null) {

            iconView.setImageDrawable(result.icon);

            // TODO set color of icon

        } else {

            iconView.setBackgroundResource(R.drawable.empty_icon);

        }



        bindBreadcrumbView(result);

    }