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
This commit is contained in:
@@ -0,0 +1,27 @@
|
||||
/*
|
||||
* 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();
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
/*
|
||||
* 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;
|
||||
}
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user