PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor some Preference Controllers to use BasePreferenceController

Browse Source 
Test: atest SettingsUnitTests
Change-Id: Ic93f29d6c35cb1a43937fa7bf2f1e2d489cdd09f
This commit is contained in:
Yuri Ufimtsev
2022-01-05 10:42:11 +00:00
parent fe76826c73
commit cdc2677cd1
11 changed files with 33 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java
View File

@@ -18,21 +18,15 @@ import android.content.Context;
import androidx.preference.Preference;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
import java.util.Objects;
public class EnterprisePrivacyPreferenceController extends AbstractPreferenceController implements
public class EnterprisePrivacyPreferenceController extends BasePreferenceController implements
PreferenceControllerMixin {
private static final String KEY_ENTERPRISE_PRIVACY = "enterprise_privacy";
private final PrivacyPreferenceControllerHelper mPrivacyPreferenceControllerHelper;
private final String mPreferenceKey;
public EnterprisePrivacyPreferenceController(Context context) {
this(Objects.requireNonNull(context), KEY_ENTERPRISE_PRIVACY);
}
public EnterprisePrivacyPreferenceController(Context context, String key) {
this(Objects.requireNonNull(context), new PrivacyPreferenceControllerHelper(context), key);
@@ -41,10 +35,9 @@ public class EnterprisePrivacyPreferenceController extends AbstractPreferenceCon
@VisibleForTesting
EnterprisePrivacyPreferenceController(Context context,
PrivacyPreferenceControllerHelper privacyPreferenceControllerHelper, String key) {
super(Objects.requireNonNull(context));
super(Objects.requireNonNull(context), key);
mPrivacyPreferenceControllerHelper = Objects.requireNonNull(
privacyPreferenceControllerHelper);
this.mPreferenceKey = key;
}
@Override
@@ -53,13 +46,10 @@ public class EnterprisePrivacyPreferenceController extends AbstractPreferenceCon
}
@Override
public boolean isAvailable() {
public int getAvailabilityStatus() {
return mPrivacyPreferenceControllerHelper.hasDeviceOwner()
&& !mPrivacyPreferenceControllerHelper.isFinancedDevice();
}
@Override
public String getPreferenceKey() {
return mPreferenceKey;
&& !mPrivacyPreferenceControllerHelper.isFinancedDevice()
? AVAILABLE
: UNSUPPORTED_ON_DEVICE;
}
}