summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/search
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2018-08-17 19:15:23 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-08-17 19:15:23 +0000
commit3df19f92b089bd2758276eb9d910fae6c3397f39 (patch)
tree783221fac4d113a2351cf95bacc8fd4843f4a066 /src/com/android/settings/search
parent0fdc9ad6dabf879a45364e50eb952b956a9ced7c (diff)
parentef724a9f8763a72b95c786be8fbbf2592812de16 (diff)
downloadpackages_apps_Settings-3df19f92b089bd2758276eb9d910fae6c3397f39.tar.gz
packages_apps_Settings-3df19f92b089bd2758276eb9d910fae6c3397f39.tar.bz2
packages_apps_Settings-3df19f92b089bd2758276eb9d910fae6c3397f39.zip
Merge "Fix indexing after slices api changes"
Diffstat (limited to 'src/com/android/settings/search')
-rw-r--r--src/com/android/settings/search/DeviceIndexUpdateJobService.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/com/android/settings/search/DeviceIndexUpdateJobService.java b/src/com/android/settings/search/DeviceIndexUpdateJobService.java
index b8f35a6baa..3a85867f2d 100644
--- a/src/com/android/settings/search/DeviceIndexUpdateJobService.java
+++ b/src/com/android/settings/search/DeviceIndexUpdateJobService.java
@@ -43,6 +43,7 @@ import androidx.slice.SliceViewManager;
import androidx.slice.SliceViewManager.SliceCallback;
import androidx.slice.core.SliceQuery;
import androidx.slice.widget.ListContent;
+import androidx.slice.widget.SliceContent;
public class DeviceIndexUpdateJobService extends JobService {
@@ -134,7 +135,7 @@ public class DeviceIndexUpdateJobService extends JobService {
protected CharSequence findTitle(Slice loadedSlice, SliceMetadata metaData) {
ListContent content = new ListContent(null, loadedSlice);
- SliceItem headerItem = content.getHeaderItem();
+ SliceContent headerItem = content.getHeader();
if (headerItem == null) {
if (content.getRowItems().size() != 0) {
headerItem = content.getRowItems().get(0);
@@ -143,15 +144,15 @@ public class DeviceIndexUpdateJobService extends JobService {
}
}
// Look for a title, then large text, then any text at all.
- SliceItem title = SliceQuery.find(headerItem, FORMAT_TEXT, HINT_TITLE, null);
+ SliceItem title = SliceQuery.find(headerItem.getSliceItem(), FORMAT_TEXT, HINT_TITLE, null);
if (title != null) {
return title.getText();
}
- title = SliceQuery.find(headerItem, FORMAT_TEXT, HINT_LARGE, null);
+ title = SliceQuery.find(headerItem.getSliceItem(), FORMAT_TEXT, HINT_LARGE, null);
if (title != null) {
return title.getText();
}
- title = SliceQuery.find(headerItem, FORMAT_TEXT);
+ title = SliceQuery.find(headerItem.getSliceItem(), FORMAT_TEXT);
if (title != null) {
return title.getText();
}