Merge "Hide the setting from the search when feature is disabled." into main
This commit is contained in:
@@ -19,13 +19,10 @@ package com.android.settings.security;
|
||||
import android.app.settings.SettingsEnums;
|
||||
import android.content.Context;
|
||||
import android.os.Bundle;
|
||||
import android.os.UserManager;
|
||||
|
||||
import androidx.annotation.VisibleForTesting;
|
||||
import androidx.preference.SwitchPreference;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.Utils;
|
||||
import com.android.settings.dashboard.DashboardFragment;
|
||||
import com.android.settings.search.BaseSearchIndexProvider;
|
||||
import com.android.settingslib.search.SearchIndexable;
|
||||
@@ -36,8 +33,10 @@ public class ContentProtectionPreferenceFragment extends DashboardFragment {
|
||||
|
||||
// Required by @SearchIndexable to make the fragment and preferences to be indexed.
|
||||
// Do not rename.
|
||||
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
|
||||
new BaseSearchIndexProvider(R.layout.content_protection_preference_fragment);
|
||||
@VisibleForTesting
|
||||
public static final ContentProtectionSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
|
||||
new ContentProtectionSearchIndexProvider(
|
||||
R.layout.content_protection_preference_fragment);
|
||||
|
||||
@Override
|
||||
public void onAttach(Context context) {
|
||||
@@ -63,4 +62,17 @@ public class ContentProtectionPreferenceFragment extends DashboardFragment {
|
||||
protected String getLogTag() {
|
||||
return TAG;
|
||||
}
|
||||
|
||||
public static class ContentProtectionSearchIndexProvider extends BaseSearchIndexProvider {
|
||||
|
||||
public ContentProtectionSearchIndexProvider(int xmlRes) {
|
||||
super(xmlRes);
|
||||
}
|
||||
|
||||
@Override
|
||||
@VisibleForTesting
|
||||
public boolean isPageSearchEnabled(Context context) {
|
||||
return ContentProtectionPreferenceUtils.isAvailable(context);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -0,0 +1,63 @@
|
||||
/*
|
||||
* Copyright (C) 2023 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 static com.android.internal.R.string.config_defaultContentProtectionService;
|
||||
|
||||
import android.content.ComponentName;
|
||||
import android.content.Context;
|
||||
import android.provider.DeviceConfig;
|
||||
import android.view.contentcapture.ContentCaptureManager;
|
||||
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.annotation.NonNull;
|
||||
|
||||
/** Util class for content protection preference. */
|
||||
public class ContentProtectionPreferenceUtils {
|
||||
|
||||
/**
|
||||
* Whether or not the content protection setting page is available.
|
||||
*/
|
||||
public static boolean isAvailable(@NonNull Context context) {
|
||||
if (!settingUiEnabled() || getContentProtectionServiceComponentName(context) == null) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
private static String getContentProtectionServiceFlatComponentName(@NonNull Context context) {
|
||||
return context.getString(config_defaultContentProtectionService);
|
||||
}
|
||||
|
||||
@Nullable
|
||||
private static ComponentName getContentProtectionServiceComponentName(@NonNull Context context) {
|
||||
String flatComponentName = getContentProtectionServiceFlatComponentName(context);
|
||||
if (flatComponentName == null) {
|
||||
return null;
|
||||
}
|
||||
return ComponentName.unflattenFromString(flatComponentName);
|
||||
}
|
||||
|
||||
/**
|
||||
* Whether or not the content protection UI is enabled.
|
||||
*/
|
||||
private static boolean settingUiEnabled() {
|
||||
return DeviceConfig.getBoolean(
|
||||
DeviceConfig.NAMESPACE_CONTENT_CAPTURE,
|
||||
ContentCaptureManager.DEVICE_CONFIG_PROPERTY_ENABLE_CONTENT_PROTECTION_RECEIVER,
|
||||
ContentCaptureManager.DEFAULT_ENABLE_CONTENT_PROTECTION_RECEIVER);
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user