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

Merge "Revert "Get enrollment animation from overlay""

Browse Source
This commit is contained in:
Kevin Chyn
2018-12-21 22:23:55 +00:00
committed by Android (Google) Code Review
parent 19ce37648a 4cedaafe0e
commit 3205fe6419
9 changed files with 25 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
View File

@@ -23,7 +23,6 @@ import android.content.Context;
import com.android.settings.accounts.AccountFeatureProvider;
import com.android.settings.applications.ApplicationFeatureProvider;
import com.android.settings.biometrics.face.FaceFeatureProvider;
import com.android.settings.bluetooth.BluetoothFeatureProvider;
import com.android.settings.dashboard.DashboardFeatureProvider;
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
@@ -66,7 +65,6 @@ public class FakeFeatureFactory extends FeatureFactory {
public final AssistGestureFeatureProvider assistGestureFeatureProvider;
public final AccountFeatureProvider mAccountFeatureProvider;
public final ContextualCardFeatureProvider mContextualCardFeatureProvider;
public final FaceFeatureProvider mFaceFeatureProvider;
public final BluetoothFeatureProvider mBluetoothFeatureProvider;
public PanelFeatureProvider panelFeatureProvider;
@@ -112,7 +110,6 @@ public class FakeFeatureFactory extends FeatureFactory {
mAccountFeatureProvider = mock(AccountFeatureProvider.class);
mContextualCardFeatureProvider = mock(ContextualCardFeatureProvider.class);
panelFeatureProvider = mock(PanelFeatureProvider.class);
mFaceFeatureProvider = mock(FaceFeatureProvider.class);
mBluetoothFeatureProvider = mock(BluetoothFeatureProvider.class);
}
@@ -201,15 +198,11 @@ public class FakeFeatureFactory extends FeatureFactory {
return panelFeatureProvider;
}
@Override
public ContextualCardFeatureProvider getContextualCardFeatureProvider(Context context) {
return mContextualCardFeatureProvider;
}
@Override
public FaceFeatureProvider getFaceFeatureProvider() {
return mFaceFeatureProvider;
}
@Override
public BluetoothFeatureProvider getBluetoothFeatureProvider(Context context) {
return mBluetoothFeatureProvider;