Fix search index for a financed device
Now with two preference controllers, one for enterprise device and one for financed device, the search index issue (querying "Financed device info" in Settings does not show a search result) is fixed. The financed preference controller is used when the device is a financed device. Otherwise, the enterprise preference controller is used. Bug: 183551684 Test: Used a test device that is registered via ZT Test: m RunSettingsRoboTests ROBOTEST_FILTER=EnterprisePrivacyPreferenceControllerTest Test: m RunSettingsRoboTests ROBOTEST_FILTER=FinancedPrivacyPreferenceControllerTest Test: m RunSettingsRoboTests ROBOTEST_FILTER=PrivacyPreferenceControllerHelperTest Change-Id: I051144ec9004f86456285078ebb1c72266f80a55
This commit is contained in:
@@ -0,0 +1,62 @@
|
||||
/*
|
||||
* 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.enterprise;
|
||||
|
||||
import android.content.Context;
|
||||
|
||||
import androidx.preference.Preference;
|
||||
|
||||
import com.android.internal.annotations.VisibleForTesting;
|
||||
import com.android.settings.core.PreferenceControllerMixin;
|
||||
import com.android.settingslib.core.AbstractPreferenceController;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
/** Preference controller which displays a financed preference for financed devices. */
|
||||
public class FinancedPrivacyPreferenceController extends AbstractPreferenceController implements
|
||||
PreferenceControllerMixin {
|
||||
|
||||
private static final String PREF_KEY_FINANCED_PRIVACY = "financed_privacy";
|
||||
private final PrivacyPreferenceControllerHelper mPrivacyPreferenceControllerHelper;
|
||||
|
||||
public FinancedPrivacyPreferenceController(Context context) {
|
||||
this(Objects.requireNonNull(context), new PrivacyPreferenceControllerHelper(context));
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
FinancedPrivacyPreferenceController(
|
||||
Context context, PrivacyPreferenceControllerHelper privacyPreferenceControllerHelper) {
|
||||
super(Objects.requireNonNull(context));
|
||||
mPrivacyPreferenceControllerHelper = Objects.requireNonNull(
|
||||
privacyPreferenceControllerHelper);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateState(Preference preference) {
|
||||
mPrivacyPreferenceControllerHelper.updateState(preference);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isAvailable() {
|
||||
return mPrivacyPreferenceControllerHelper.isFinancedDevice();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getPreferenceKey() {
|
||||
return PREF_KEY_FINANCED_PRIVACY;
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user