Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 304b54b2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use new interface for setAppEntity"

parents abd732a3 3bb14398

res/xml/location_settings.xml

+1 −0
Original line number Diff line number Diff line
@@ -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

src/com/android/settings/location/RecentLocationAccessPreferenceController.java

+7 −1
Original line number Diff line number Diff line
@@ -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);