From 3bb1439894fa0225850ccd0aab07c2b31500b18e Mon Sep 17 00:00:00 2001
From: tmfang <tmfang@google.com>
Date: Sun, 13 Jan 2019 17:23:08 +0800
Subject: [PATCH] Use new interface for setAppEntity

The interface was changed in SettingsLib,
so we also need to update the usage for setAppEntity.

Test: visual, robotest
Change-Id: I89644c4a7d6aac9cb9a8784b1f91656c8d7d6d26
Bug: 121271387
---
 res/xml/location_settings.xml                             | 1 +
 .../RecentLocationAccessPreferenceController.java         | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml
index f1c13cf6ecd..72ea3122eb7 100644
--- a/res/xml/location_settings.xml
+++ b/res/xml/location_settings.xml
@@ -23,6 +23,7 @@
         <com.android.settingslib.widget.LayoutPreference
             android:key="apps_dashboard"
             android:layout="@layout/app_entities_header"
+            android:selectable="false"
             settings:allowDividerBelow="true" />
 
         <PreferenceCategory
diff --git a/src/com/android/settings/location/RecentLocationAccessPreferenceController.java b/src/com/android/settings/location/RecentLocationAccessPreferenceController.java
index 0d5cca50f99..2d84e21e18f 100644
--- a/src/com/android/settings/location/RecentLocationAccessPreferenceController.java
+++ b/src/com/android/settings/location/RecentLocationAccessPreferenceController.java
@@ -27,6 +27,7 @@ import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.location.RecentLocationAccesses;
 import com.android.settingslib.widget.AppEntitiesHeaderController;
+import com.android.settingslib.widget.AppEntityInfo;
 import com.android.settingslib.widget.LayoutPreference;
 
 import java.util.List;
@@ -90,7 +91,12 @@ public class RecentLocationAccessPreferenceController extends AbstractPreference
             int i = 0;
             for (; i < Math.min(recentLocationAccesses.size(), MAXIMUM_APP_COUNT); i++) {
                 final RecentLocationAccesses.Access access = recentLocationAccesses.get(i);
-                mController.setAppEntity(i, access.icon, access.label, access.contentDescription);
+                final AppEntityInfo appEntityInfo = new AppEntityInfo.Builder()
+                        .setIcon(access.icon)
+                        .setTitle(access.label)
+                        .setSummary(access.contentDescription)
+                        .build();
+                mController.setAppEntity(i, appEntityInfo);
             }
             for (; i < MAXIMUM_APP_COUNT; i++) {
                 mController.removeAppEntity(i);