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

Use new interface for setAppEntity

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

Test: visual, robotest
Change-Id: I89644c4a7d6aac9cb9a8784b1f91656c8d7d6d26
Bug: 121271387
This commit is contained in:
tmfang
2019-01-13 17:23:08 +08:00
parent 7109b9a68b
commit 3bb1439894
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/xml/location_settings.xml
View File

@@ -23,6 +23,7 @@
<com.android.settingslib.widget.LayoutPreference <com.android.settingslib.widget.LayoutPreference
android:key="apps_dashboard" android:key="apps_dashboard"
android:layout="@layout/app_entities_header" android:layout="@layout/app_entities_header"
android:selectable="false"
settings:allowDividerBelow="true" /> settings:allowDividerBelow="true" />
<PreferenceCategory <PreferenceCategory

8
src/com/android/settings/location/RecentLocationAccessPreferenceController.java
View File

@@ -27,6 +27,7 @@ import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.location.RecentLocationAccesses; import com.android.settingslib.location.RecentLocationAccesses;
import com.android.settingslib.widget.AppEntitiesHeaderController; import com.android.settingslib.widget.AppEntitiesHeaderController;
import com.android.settingslib.widget.AppEntityInfo;
import com.android.settingslib.widget.LayoutPreference; import com.android.settingslib.widget.LayoutPreference;
import java.util.List; import java.util.List;
@@ -90,7 +91,12 @@ public class RecentLocationAccessPreferenceController extends AbstractPreference
int i = 0; int i = 0;
for (; i < Math.min(recentLocationAccesses.size(), MAXIMUM_APP_COUNT); i++) { for (; i < Math.min(recentLocationAccesses.size(), MAXIMUM_APP_COUNT); i++) {
final RecentLocationAccesses.Access access = recentLocationAccesses.get(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++) { for (; i < MAXIMUM_APP_COUNT; i++) {
mController.removeAppEntity(i); mController.removeAppEntity(i);