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

Commit 4b302a16 authored by Marie Matheson's avatar Marie Matheson
Browse files

Adds SecuritySetting feature for providing an alternative SecuritySettings fragment 

Bug: 181764224
Test: New tests added to SettingsUnitTests.
Test: Tested manually with and without feature-provided fragment.
Test: No new failures in SettingsUnitTests, or robolectric. No failures in security directory of robolectric tests.
Change-Id: I21038baf3098c18e1713a332085a5efc376f73da
parent 1c2216e5

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

+6 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import com.android.settings.localepicker.LocaleFeatureProvider; 
import com.android.settings.panel.PanelFeatureProvider;

import com.android.settings.search.SearchFeatureProvider;

import com.android.settings.security.SecurityFeatureProvider;

import com.android.settings.security.SecuritySettingsFeatureProvider;

import com.android.settings.slices.SlicesFeatureProvider;

import com.android.settings.users.UserFeatureProvider;

import com.android.settings.wifi.WifiTrackerLibProvider;
@@ -162,6 +163,11 @@ public abstract class FeatureFactory { 
     */

    public abstract ExtraAppInfoFeatureProvider getExtraAppInfoFeatureProvider();



    /**

     * Retrieve implementation for SecuritySettings feature.

     */

    public abstract SecuritySettingsFeatureProvider getSecuritySettingsFeatureProvider();



    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
@@ -63,6 +63,8 @@ import com.android.settings.search.SearchFeatureProvider; 
import com.android.settings.search.SearchFeatureProviderImpl;

import com.android.settings.security.SecurityFeatureProvider;

import com.android.settings.security.SecurityFeatureProviderImpl;

import com.android.settings.security.SecuritySettingsFeatureProvider;

import com.android.settings.security.SecuritySettingsFeatureProviderImpl;

import com.android.settings.slices.SlicesFeatureProvider;

import com.android.settings.slices.SlicesFeatureProviderImpl;

import com.android.settings.users.UserFeatureProvider;
@@ -100,6 +102,7 @@ public class FeatureFactoryImpl extends FeatureFactory { 
    private FaceFeatureProvider mFaceFeatureProvider;

    private WifiTrackerLibProvider mWifiTrackerLibProvider;

    private ExtraAppInfoFeatureProvider mExtraAppInfoFeatureProvider;

    private SecuritySettingsFeatureProvider mSecuritySettingsFeatureProvider;



    @Override

    public SupportFeatureProvider getSupportFeatureProvider(Context context) {
@@ -313,4 +316,12 @@ public class FeatureFactoryImpl extends FeatureFactory { 
        }

        return mExtraAppInfoFeatureProvider;

    }



    @Override

    public SecuritySettingsFeatureProvider getSecuritySettingsFeatureProvider() {

        if (mSecuritySettingsFeatureProvider == null) {

            mSecuritySettingsFeatureProvider = new SecuritySettingsFeatureProviderImpl();

        }

        return mSecuritySettingsFeatureProvider;

    }

}

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

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

 * Copyright (C) 2021 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;



/** FeatureProvider for security settings. */

public interface SecuritySettingsFeatureProvider {



    /** Returns whether an alternative SecuritySettings fragment is available. */

    boolean hasAlternativeSecuritySettingsFragment();



    /** Returns the alternative SecuritySettings fragment name if available. */

    String getAlternativeSecuritySettingsFragmentClassname();

}

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

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

 * Copyright (C) 2021 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;



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

public class SecuritySettingsFeatureProviderImpl implements SecuritySettingsFeatureProvider {



    @Override

    public boolean hasAlternativeSecuritySettingsFragment() {

        return false;

    }



    @Override

    public String getAlternativeSecuritySettingsFragmentClassname() {

        return null;

    }

}

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

+29 −0
Original line number Diff line number Diff line
@@ -19,12 +19,17 @@ package com.android.settings.security; 
import android.content.Context;

import android.hardware.face.FaceManager;

import android.hardware.fingerprint.FingerprintManager;

import android.text.TextUtils;

import android.util.FeatureFlagUtils;



import androidx.preference.Preference;



import com.android.settings.R;

import com.android.settings.Utils;

import com.android.settings.core.BasePreferenceController;

import com.android.settings.core.FeatureFlags;

import com.android.settings.core.SubSettingLauncher;

import com.android.settings.overlay.FeatureFactory;



public class TopLevelSecurityEntryPreferenceController extends BasePreferenceController {
@@ -56,4 +61,28 @@ public class TopLevelSecurityEntryPreferenceController extends BasePreferenceCon 
            return mContext.getText(R.string.security_dashboard_summary_no_fingerprint);

        }

    }



    @Override

    public boolean handlePreferenceTreeClick(Preference preference) {

        if (!TextUtils.equals(preference.getKey(), getPreferenceKey())) {

            return super.handlePreferenceTreeClick(preference);

        }



        SecuritySettingsFeatureProvider securitySettingsFeatureProvider =

                FeatureFactory.getFactory(mContext).getSecuritySettingsFeatureProvider();

        if (securitySettingsFeatureProvider.hasAlternativeSecuritySettingsFragment()) {

            String alternativeFragmentClassname =

                    securitySettingsFeatureProvider

                            .getAlternativeSecuritySettingsFragmentClassname();

            if (alternativeFragmentClassname != null) {

                new SubSettingLauncher(mContext)

                        .setDestination(alternativeFragmentClassname)

                        .setSourceMetricsCategory(getMetricsCategory())

                        .launch();

                return true;

            }

        }



        return super.handlePreferenceTreeClick(preference);

    }

}