Move code from SuggestionChecks to FeatureProvider
This is step one to deprecate SuggestionChecks. Moving logic into SuggestionFeatureProvider allows potential logic override and improves testability. Also moved isSuggestionComplete tests to corresponding activity/pref controller test. Bug: 65065268 Test: robotests Change-Id: I2071d30fc58bb84acad2083ca03cfcf7d41f10cb
This commit is contained in:
Fan Zhang
@@ -54,7 +54,7 @@ public interface SuggestionFeatureProvider {
|
||||
boolean isSmartSuggestionEnabled(Context context);
|
||||
|
||||
/** Return true if the suggestion has already been completed and does not need to be shown */
|
||||
boolean isSuggestionCompleted(Context context, @NonNull ComponentName suggestion);
|
||||
boolean isSuggestionComplete(Context context, @NonNull ComponentName suggestion);
|
||||
|
||||
/**
|
||||
* Returns the {@link SharedPreferences} that holds metadata for suggestions.
|
||||
|
||||
@@ -39,13 +39,18 @@ import com.android.settings.Settings.DoubleTwistSuggestionActivity;
|
||||
import com.android.settings.Settings.NightDisplaySuggestionActivity;
|
||||
import com.android.settings.Settings.SwipeToNotificationSuggestionActivity;
|
||||
import com.android.settings.core.instrumentation.MetricsFeatureProvider;
|
||||
import com.android.settings.fingerprint.FingerprintEnrollSuggestionActivity;
|
||||
import com.android.settings.fingerprint.FingerprintSuggestionActivity;
|
||||
import com.android.settings.gestures.DoubleTapPowerPreferenceController;
|
||||
import com.android.settings.gestures.DoubleTapScreenPreferenceController;
|
||||
import com.android.settings.gestures.DoubleTwistPreferenceController;
|
||||
import com.android.settings.gestures.PickupGesturePreferenceController;
|
||||
import com.android.settings.gestures.SwipeToNotificationPreferenceController;
|
||||
import com.android.settings.overlay.FeatureFactory;
|
||||
import com.android.settings.password.ScreenLockSuggestionActivity;
|
||||
import com.android.settings.support.NewDeviceIntroSuggestionActivity;
|
||||
import com.android.settings.wallpaper.WallpaperSuggestionActivity;
|
||||
import com.android.settings.wifi.WifiCallingSuggestionActivity;
|
||||
import com.android.settingslib.drawer.Tile;
|
||||
import com.android.settingslib.suggestions.SuggestionParser;
|
||||
|
||||
@@ -96,12 +101,21 @@ public class SuggestionFeatureProviderImpl implements SuggestionFeatureProvider
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isSuggestionCompleted(Context context, @NonNull ComponentName component) {
|
||||
public boolean isSuggestionComplete(Context context, @NonNull ComponentName component) {
|
||||
final String className = component.getClassName();
|
||||
if (className.equals(NightDisplaySuggestionActivity.class.getName())) {
|
||||
if (className.equals(WallpaperSuggestionActivity.class.getName())) {
|
||||
return WallpaperSuggestionActivity.isSuggestionComplete(context);
|
||||
} else if (className.equals(FingerprintSuggestionActivity.class.getName())) {
|
||||
return FingerprintSuggestionActivity.isSuggestionComplete(context);
|
||||
} else if (className.equals(FingerprintEnrollSuggestionActivity.class.getName())) {
|
||||
return FingerprintEnrollSuggestionActivity.isSuggestionComplete(context);
|
||||
} else if (className.equals(ScreenLockSuggestionActivity.class.getName())) {
|
||||
return ScreenLockSuggestionActivity.isSuggestionComplete(context);
|
||||
} else if (className.equals(WifiCallingSuggestionActivity.class.getName())) {
|
||||
return WifiCallingSuggestionActivity.isSuggestionComplete(context);
|
||||
} else if (className.equals(NightDisplaySuggestionActivity.class.getName())) {
|
||||
return hasUsedNightDisplay(context);
|
||||
}
|
||||
if (className.equals(NewDeviceIntroSuggestionActivity.class.getName())) {
|
||||
} else if (className.equals(NewDeviceIntroSuggestionActivity.class.getName())) {
|
||||
return NewDeviceIntroSuggestionActivity.isSuggestionComplete(context);
|
||||
} else if (className.equals(DoubleTapPowerSuggestionActivity.class.getName())) {
|
||||
return DoubleTapPowerPreferenceController
|
||||
|
||||
@@ -16,23 +16,10 @@
|
||||
|
||||
package com.android.settings.dashboard.suggestions;
|
||||
|
||||
import android.app.KeyguardManager;
|
||||
import android.app.WallpaperManager;
|
||||
import android.app.admin.DevicePolicyManager;
|
||||
import android.content.ComponentName;
|
||||
import android.content.Context;
|
||||
import android.hardware.fingerprint.FingerprintManager;
|
||||
import android.support.annotation.VisibleForTesting;
|
||||
|
||||
import com.android.ims.ImsManager;
|
||||
import com.android.settings.Settings.FingerprintEnrollSuggestionActivity;
|
||||
import com.android.settings.Settings.ScreenLockSuggestionActivity;
|
||||
import com.android.settings.Settings.WifiCallingSuggestionActivity;
|
||||
import com.android.settings.Utils;
|
||||
import com.android.settings.fingerprint.FingerprintSuggestionActivity;
|
||||
import com.android.settings.overlay.FeatureFactory;
|
||||
import com.android.settings.wallpaper.WallpaperSuggestionActivity;
|
||||
import com.android.settings.wrapper.WallpaperManagerWrapper;
|
||||
import com.android.settingslib.drawer.Tile;
|
||||
|
||||
/**
|
||||
@@ -43,69 +30,17 @@ public class SuggestionsChecks {
|
||||
private static final String TAG = "SuggestionsChecks";
|
||||
private final Context mContext;
|
||||
|
||||
private final WallpaperManagerWrapper mWallpaperManager;
|
||||
|
||||
public SuggestionsChecks(Context context) {
|
||||
mContext = context.getApplicationContext();
|
||||
mWallpaperManager = new WallpaperManagerWrapper(mContext);
|
||||
}
|
||||
|
||||
public boolean isSuggestionComplete(Tile suggestion) {
|
||||
ComponentName component = suggestion.intent.getComponent();
|
||||
String className = component.getClassName();
|
||||
if (className.equals(WallpaperSuggestionActivity.class.getName())) {
|
||||
return hasWallpaperSet();
|
||||
} else if (className.equals(WifiCallingSuggestionActivity.class.getName())) {
|
||||
return isWifiCallingUnavailableOrEnabled();
|
||||
} else if (className.equals(FingerprintSuggestionActivity.class.getName())) {
|
||||
return !Utils.hasFingerprintHardware(mContext) || !isFingerprintEnabled()
|
||||
|| isNotSingleFingerprintEnrolled();
|
||||
} else if (className.equals(ScreenLockSuggestionActivity.class.getName())) {
|
||||
return isDeviceSecured();
|
||||
} else if (className.equals(FingerprintEnrollSuggestionActivity.class.getName())) {
|
||||
final FingerprintManager manager = Utils.getFingerprintManagerOrNull(mContext);
|
||||
if (manager == null || !isFingerprintEnabled()
|
||||
|| !Utils.hasFingerprintHardware(mContext)) {
|
||||
return true;
|
||||
}
|
||||
return manager.hasEnrolledFingerprints();
|
||||
}
|
||||
|
||||
final SuggestionFeatureProvider provider =
|
||||
FeatureFactory.getFactory(mContext).getSuggestionFeatureProvider(mContext);
|
||||
|
||||
return provider.isSuggestionCompleted(mContext, component);
|
||||
return provider.isSuggestionComplete(mContext, component);
|
||||
}
|
||||
|
||||
private boolean isDeviceSecured() {
|
||||
KeyguardManager km = mContext.getSystemService(KeyguardManager.class);
|
||||
return km.isKeyguardSecure();
|
||||
}
|
||||
|
||||
private boolean isNotSingleFingerprintEnrolled() {
|
||||
FingerprintManager manager = Utils.getFingerprintManagerOrNull(mContext);
|
||||
return manager == null || manager.getEnrolledFingerprints().size() != 1;
|
||||
}
|
||||
|
||||
public boolean isWifiCallingUnavailableOrEnabled() {
|
||||
if (!ImsManager.isWfcEnabledByPlatform(mContext) ||
|
||||
!ImsManager.isWfcProvisionedOnDevice(mContext)) {
|
||||
return true;
|
||||
}
|
||||
return ImsManager.isWfcEnabledByUser(mContext)
|
||||
&& ImsManager.isNonTtyOrTtyOnVolteEnabled(mContext);
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
boolean hasWallpaperSet() {
|
||||
return mWallpaperManager.getWallpaperId(WallpaperManager.FLAG_SYSTEM) > 0;
|
||||
}
|
||||
|
||||
private boolean isFingerprintEnabled() {
|
||||
DevicePolicyManager dpManager =
|
||||
(DevicePolicyManager) mContext.getSystemService(Context.DEVICE_POLICY_SERVICE);
|
||||
final int dpmFlags = dpManager.getKeyguardDisabledFeatures(null, /* admin */
|
||||
mContext.getUserId());
|
||||
return (dpmFlags & DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT) == 0;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user