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

Commit 4774b58b authored by Shahriyar Amini's avatar Shahriyar Amini
Browse files

Dynamically update injected security preferences. 

Bug: 31002801
Test: make RunSettingsRoboTests

onResume will dynamically update injected security preferences with data
from the associated tiles.

Change-Id: Ibf46abdfcff27bd1b00729fe815c3cf3ace64e26
parent 3a21de93

src/com/android/settings/SecuritySettings.java

+11 −0
Original line number Diff line number Diff line
@@ -62,10 +62,13 @@ import com.android.settings.search.BaseSearchIndexProvider; 
import com.android.settings.search.Index;

import com.android.settings.search.Indexable;

import com.android.settings.search.SearchIndexableRaw;

import com.android.settings.security.SecurityFeatureProvider;

import com.android.settingslib.RestrictedLockUtils;

import com.android.settingslib.RestrictedPreference;

import com.android.settingslib.RestrictedSwitchPreference;

import com.android.settingslib.drawer.CategoryKey;

import com.android.settingslib.drawer.DashboardCategory;

import com.android.settingslib.drawer.Tile;



import java.util.ArrayList;

import java.util.List;
@@ -130,6 +133,7 @@ public class SecuritySettings extends SettingsPreferenceFragment 


    private DashboardFeatureProvider mDashboardFeatureProvider;

    private DevicePolicyManager mDPM;

    private SecurityFeatureProvider mSecurityFeatureProvider;

    private SubscriptionManager mSubscriptionManager;

    private UserManager mUm;
@@ -183,6 +187,8 @@ public class SecuritySettings extends SettingsPreferenceFragment 
        mDashboardFeatureProvider = FeatureFactory.getFactory(activity)

                .getDashboardFeatureProvider(activity);



        mSecurityFeatureProvider = FeatureFactory.getFactory(activity).getSecurityFeatureProvider();



        if (savedInstanceState != null

                && savedInstanceState.containsKey(TRUST_AGENT_CLICK_INTENT)) {

            mTrustAgentClickIntent = savedInstanceState.getParcelable(TRUST_AGENT_CLICK_INTENT);
@@ -416,6 +422,11 @@ public class SecuritySettings extends SettingsPreferenceFragment 
            }

        }



        // Update preference data with tile data. Security feature provider only updates the data

        // if it actually needs to be changed.

        mSecurityFeatureProvider.updatePreferences(getActivity(), root,

                mDashboardFeatureProvider.getTilesForCategory(CategoryKey.CATEGORY_SECURITY));



        for (int i = 0; i < SWITCH_PREFERENCE_KEYS.length; i++) {

            final Preference pref = findPreference(SWITCH_PREFERENCE_KEYS[i]);

            if (pref != null) pref.setOnPreferenceChangeListener(this);

src/com/android/settings/overlay/FeatureFactory.java

+3 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import com.android.settings.dashboard.DashboardFeatureProvider; 
import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;

import com.android.settings.fuelgauge.PowerUsageFeatureProvider;

import com.android.settings.localepicker.LocaleFeatureProvider;

import com.android.settings.security.SecurityFeatureProvider;

import com.android.settings.search2.SearchFeatureProvider;



/**
@@ -85,6 +86,8 @@ public abstract class FeatureFactory { 


    public abstract SurveyFeatureProvider getSurveyFeatureProvider(Context context);



    public abstract SecurityFeatureProvider getSecurityFeatureProvider();



    public static final class FactoryNotFoundException extends RuntimeException {

        public FactoryNotFoundException(Throwable throwable) {

            super("Unable to create factory. Did you misconfigure Proguard?", throwable);

src/com/android/settings/overlay/FeatureFactoryImpl.java

+11 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ import com.android.settings.enterprise.EnterprisePrivacyFeatureProviderImpl; 
import com.android.settings.fuelgauge.PowerUsageFeatureProvider;

import com.android.settings.localepicker.LocaleFeatureProvider;

import com.android.settings.localepicker.LocaleFeatureProviderImpl;

import com.android.settings.security.SecurityFeatureProvider;

import com.android.settings.security.SecurityFeatureProviderImpl;

import com.android.settings.search2.SearchFeatureProvider;

import com.android.settings.search2.SearchFeatureProviderImpl;
@@ -48,6 +50,7 @@ public class FeatureFactoryImpl extends FeatureFactory { 
    private LocaleFeatureProvider mLocaleFeatureProvider;

    private EnterprisePrivacyFeatureProvider mEnterprisePrivacyFeatureProvider;

    private SearchFeatureProvider mSearchFeatureProvider;

    private SecurityFeatureProvider mSecurityFeatureProvider;



    @Override

    public SupportFeatureProvider getSupportFeatureProvider(Context context) {
@@ -115,4 +118,12 @@ public class FeatureFactoryImpl extends FeatureFactory { 
    public SurveyFeatureProvider getSurveyFeatureProvider(Context context) {

        return null;

    }



    @Override

    public SecurityFeatureProvider getSecurityFeatureProvider() {

        if (mSecurityFeatureProvider == null) {

            mSecurityFeatureProvider = new SecurityFeatureProviderImpl();

        }

        return mSecurityFeatureProvider;

    }

}

src/com/android/settings/security/SecurityFeatureProvider.java

0 → 100644
+31 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.settings.security;



import android.content.Context;

import android.support.v7.preference.PreferenceScreen;



import com.android.settingslib.drawer.DashboardCategory;





/** FeatureProvider for security. */

public interface SecurityFeatureProvider {



    /** Update preferences with data from associated tiles. */

    void updatePreferences(Context context, PreferenceScreen preferenceScreen,

            DashboardCategory dashboardCategory);

}

src/com/android/settings/security/SecurityFeatureProviderImpl.java

0 → 100644
+117 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.settings.security;



import android.content.Context;

import android.content.Intent;

import android.content.IContentProvider;

import android.content.pm.PackageManager;

import android.content.res.Resources;

import android.graphics.drawable.Drawable;

import com.android.settingslib.drawer.DashboardCategory;

import android.support.v4.content.ContextCompat;

import android.support.v7.preference.Preference;

import android.support.v7.preference.PreferenceScreen;

import android.text.TextUtils;

import android.util.ArrayMap;



import com.android.settingslib.drawer.Tile;

import com.android.settingslib.drawer.TileUtils;



import java.util.Map;



/** Implementation for {@code SecurityFeatureProvider}. */

public class SecurityFeatureProviderImpl implements SecurityFeatureProvider {



    /** Update preferences with data from associated tiles. */

    public void updatePreferences(Context context, PreferenceScreen preferenceScreen,

            DashboardCategory dashboardCategory) {

        if (preferenceScreen == null) {

            return;

        }

        int tilesCount = (dashboardCategory != null) ? dashboardCategory.getTilesCount() : 0;

        if (tilesCount == 0) {

            return;

        }

        Map<String, IContentProvider> providerMap = new ArrayMap<>();

        for (int i = 0; i < tilesCount; i++) {

            Tile tile = dashboardCategory.getTile(i);

            // If the tile does not have a key or appropriate meta data, skip it.

            if (TextUtils.isEmpty(tile.key) || (tile.metaData == null)) {

                continue;

            }

            Preference matchingPref = preferenceScreen.findPreference(tile.key);

            // If the tile does not have a matching preference, skip it.

            if (matchingPref == null) {

                continue;

            }

            // Check if the tile has content providers for dynamically updatable content.

            String iconUri = tile.metaData.getString(TileUtils.META_DATA_PREFERENCE_ICON_URI, null);

            String summaryUri =

                    tile.metaData.getString(TileUtils.META_DATA_PREFERENCE_SUMMARY_URI, null);

            if (!TextUtils.isEmpty(iconUri)) {

                int icon = TileUtils.getIconFromUri(context, iconUri, providerMap);

                boolean updateIcon = true;

                String packageName = null;

                // Dynamic icon has to come from the same package that the preference launches.

                if (tile.intent != null) {

                        Intent intent = tile.intent;

                        if (!TextUtils.isEmpty(intent.getPackage())) {

                            packageName = intent.getPackage();

                        } else if (intent.getComponent() != null) {

                            packageName = intent.getComponent().getPackageName();

                        }

                }

                if (TextUtils.isEmpty(packageName)) {

                    updateIcon = false;

                } else {

                    if (tile.icon == null) {

                        // If the tile does not have an icon already, only update if the suggested

                        // icon is non-zero.

                        updateIcon = (icon != 0);

                    } else {

                        // If the existing icon has the same resource package and resource id, the

                        // icon does not need to be updated.

                        updateIcon = !(packageName.equals(tile.icon.getResPackage())

                                && (icon == tile.icon.getResId()));

                    }

                }

                if (updateIcon) {

                    try {

                        matchingPref.setIcon(context.getPackageManager()

                                .getResourcesForApplication(packageName)

                                        .getDrawable(icon, context.getTheme()));

                    } catch (PackageManager.NameNotFoundException | Resources.NotFoundException e) {

                        // Intentionally ignored. If icon resources cannot be found, do not update.

                    }

                }

            }

            if (!TextUtils.isEmpty(summaryUri)) {

                String summary = TileUtils.getTextFromUri(context, summaryUri, providerMap,

                        TileUtils.META_DATA_PREFERENCE_SUMMARY);

                // Only update the summary if it has actually changed.

                if (summary == null) {

                    if (matchingPref.getSummary() != null) {

                        matchingPref.setSummary(summary);

                    }

                } else if (!summary.equals(matchingPref.getSummary())) {

                    matchingPref.setSummary(summary);

                }

            }

        }

    }

}