OSDN Git Service

Merge "Only add icons to settings items with icons" into oc-dev am: ec00573139
authorMatthew Fritze <mfritze@google.com>
Thu, 11 May 2017 00:54:01 +0000 (00:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 11 May 2017 00:54:01 +0000 (00:54 +0000)
commita20e068d2c9e08e4cfbc99887f210d68b59df0ac
treee57301856d8cd9235940c4384d5d32a4fde8605c
parent74dd8bd3fb45f99147ccdad7bbee17649f0c28c9
parentab13b378c91265c535fc87180c5797e701cf710e
Merge "Only add icons to settings items with icons" into oc-dev am: ec00573139
am: ab13b378c9

Change-Id: I7194c8f3a1e17cc7b44548f97b0eabb51d4f6616
src/com/android/settings/search2/DatabaseIndexingManager.java
src/com/android/settings/search2/SearchViewHolder.java
tests/robotests/src/com/android/settings/search2/DatabaseIndexingManagerTest.java
tests/robotests/src/com/android/settings/search2/IntentSearchViewHolderTest.java