PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update Search UX for OC" into oc-dev am: 0cdade8a78

Browse Source 
am: 61255c0c93

Change-Id: I87d9dc74413d8ba34f7ab72dc047f1b29485e74a
This commit is contained in:
Matthew Fritze
2017-04-25 01:02:03 +00:00
committed by android-build-merger
parent a705701cdc 61255c0c93
commit 10ad029318
6 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/layout/search_breadcrumb_view.xml
View File

@@ -20,7 +20,7 @@
android:id="@+id/breadcrumb" android:id="@+id/breadcrumb"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="8dp" android:paddingTop="5dp"
android:textAppearance="?android:attr/textAppearanceListItemSecondary" android:textAppearance="?android:attr/textAppearanceListItemSecondary"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:ellipsize="marquee"/> android:ellipsize="marquee"/>

5
res/layout/search_inline_switch_item.xml
View File

@@ -46,9 +46,8 @@
android:id="@android:id/summary" android:id="@android:id/summary"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceListItemSecondary" android:singleLine="true"
android:textColor="?android:attr/textColorSecondary" android:textAppearance="?android:attr/textAppearanceListItemSecondary"/>
android:maxLines="10"/>
<include layout="@layout/search_breadcrumb_view"/> <include layout="@layout/search_breadcrumb_view"/>
</LinearLayout> </LinearLayout>

3
res/layout/search_intent_item.xml
View File

@@ -46,9 +46,8 @@
android:id="@android:id/summary" android:id="@android:id/summary"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceListItemSecondary" android:textAppearance="?android:attr/textAppearanceListItemSecondary"
android:textColor="?android:attr/textColorSecondary"
android:maxLines="3"
android:ellipsize="marquee"/> android:ellipsize="marquee"/>
<include layout="@layout/search_breadcrumb_view"/> <include layout="@layout/search_breadcrumb_view"/>

1
src/com/android/settings/search2/DatabaseIndexingManager.java
View File

@@ -751,7 +751,6 @@ public class DatabaseIndexingManager {
.setEntries(null) .setEntries(null)
.setClassName(fragmentName) .setClassName(fragmentName)
.setScreenTitle(screenTitle) .setScreenTitle(screenTitle)
.setIconResId(iconResId)
.setRank(rank) .setRank(rank)
.setIntentAction(intentAction) .setIntentAction(intentAction)
.setIntentTargetPackage(intentTargetPackage) .setIntentTargetPackage(intentTargetPackage)

2
src/com/android/settings/search2/SearchViewHolder.java
View File

@@ -69,9 +69,11 @@ public abstract class SearchViewHolder extends RecyclerView.ViewHolder {
iconView.setImageDrawable(appResult.info.loadIcon(pm)); iconView.setImageDrawable(appResult.info.loadIcon(pm));
} else if (result.icon != null) { } else if (result.icon != null) {
iconView.setImageDrawable(result.icon); iconView.setImageDrawable(result.icon);
// TODO set color of icon
} else { } else {
iconView.setBackgroundResource(R.drawable.empty_icon); iconView.setBackgroundResource(R.drawable.empty_icon);
} }
bindBreadcrumbView(result); bindBreadcrumbView(result);
} }

2
tests/robotests/src/com/android/settings/search2/DatabaseIndexingManagerTest.java
View File

@@ -306,7 +306,7 @@ public class DatabaseIndexingManagerTest {
// Class Name // Class Name
assertThat(cursor.getString(11)).isEqualTo(className); assertThat(cursor.getString(11)).isEqualTo(className);
// Icon // Icon
assertThat(cursor.getInt(12)).isEqualTo(iconResId); assertThat(cursor.getInt(12)).isEqualTo(0);
// Intent Action // Intent Action
assertThat(cursor.getString(13)).isEqualTo(action); assertThat(cursor.getString(13)).isEqualTo(action);
// Target Package // Target Package