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

Commit 594fdf76 authored by Lifu Tang's avatar Lifu Tang
Browse files

Use ZeroStatePreference when there's no recent location accesses 

Screenshot:
*   Before: http://screen/BYnseWCffV7wZ4M.png
*   After: http://screen/9qEemTgK37QRHqa.png
*   Flag off: http://screen/876oBsuKiySghqk.png

Bug: 407138301
Flag: com.android.settingslib.widget.theme.flags.is_expressive_design_enabled
Change-Id: I1e36975d06e961a6ba211bb95571d133c66ccdea
parent df06b6e5

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

+27 −15
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ import com.android.settingslib.applications.RecentAppOpsAccess; 
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;

import com.android.settingslib.widget.AppPreference;



import com.android.settingslib.widget.SettingsThemeHelper;

import com.android.settingslib.widget.ZeroStatePreference;

import java.util.ArrayList;

import java.util.List;
@@ -50,10 +52,17 @@ public class RecentLocationAccessSeeAllPreferenceController 


    public RecentLocationAccessSeeAllPreferenceController(Context context, String key) {

        super(context, key);

        mShowSystem = DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_PRIVACY,

            SystemUiDeviceConfigFlags.PROPERTY_LOCATION_INDICATORS_SMALL_ENABLED, false)

            ? Settings.Secure.getInt(mContext.getContentResolver(),

            Settings.Secure.LOCATION_SHOW_SYSTEM_OPS, 0) == 1

        mShowSystem =

                DeviceConfig.getBoolean(

                                DeviceConfig.NAMESPACE_PRIVACY,

                                SystemUiDeviceConfigFlags

                                        .PROPERTY_LOCATION_INDICATORS_SMALL_ENABLED,

                                false)

                        ? Settings.Secure.getInt(

                                        mContext.getContentResolver(),

                                        Settings.Secure.LOCATION_SHOW_SYSTEM_OPS,

                                        0)

                                == 1

                        : false;



        mRecentLocationAccesses = RecentAppOpsAccess.createForLocation(context);
@@ -79,8 +88,8 @@ public class RecentLocationAccessSeeAllPreferenceController 
        final UserManager userManager = UserManager.get(mContext);



        final List<RecentAppOpsAccess.Access> recentLocationAccesses = new ArrayList<>();

        for (RecentAppOpsAccess.Access access : mRecentLocationAccesses.getAppListSorted(

                mShowSystem)) {

        for (RecentAppOpsAccess.Access access :

                mRecentLocationAccesses.getAppListSorted(mShowSystem)) {

            if (isRequestMatchesProfileType(

                    userManager, access, ProfileSelectFragment.ProfileType.ALL)) {

                recentLocationAccesses.add(access);
@@ -89,23 +98,26 @@ public class RecentLocationAccessSeeAllPreferenceController 


        if (recentLocationAccesses.isEmpty()) {

            // If there's no item to display, add a "No recent apps" item.

            final Preference banner = new AppPreference(mContext);

            banner.setTitle(R.string.location_no_recent_apps);

            Preference banner = null;

            if (SettingsThemeHelper.isExpressiveTheme(mContext)) {

                banner = new ZeroStatePreference(mContext);

                banner.setIcon(R.drawable.ic_settings_location_filled);

            } else {

                banner = new AppPreference(mContext);

            }

            banner.setTitle(R.string.location_no_recent_accesses);

            banner.setSelectable(false);

            mCategoryAllRecentLocationAccess.addPreference(banner);

        } else {

            for (RecentAppOpsAccess.Access request : recentLocationAccesses) {

                final Preference appPreference = createAppPreference(

                        preference.getContext(),

                        request, mFragment);

                final Preference appPreference =

                        createAppPreference(preference.getContext(), request, mFragment);

                mCategoryAllRecentLocationAccess.addPreference(appPreference);

            }

        }

    }



    /**

     * Set the value of {@link #mShowSystem}.

     */

    /** Set the value of {@link #mShowSystem}. */

    public void setShowSystem(boolean showSystem) {

        mShowSystem = showSystem;

        if (mPreference != null) {