Add feature provider for Bluetooth

Also add method to check whether pairing page is enabled.

Bug: 38134564
Test: RunSettingsGoogleRoboTests
Change-Id: Ib74ece46f9624242895a366eac889957924f84c6
This commit is contained in:
jackqdyulei
2017-05-08 15:29:14 -07:00
parent 910f69c62a
commit 3db59a8430
5 changed files with 62 additions and 0 deletions

View File

@@ -0,0 +1,27 @@
/*
* Copyright (C) 2017 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.bluetooth;
/**
* Feature provider for bluetooth feature
*/
public interface BluetoothFeatureProvider {
/**
* Check whether additional pairing page is enabled
*/
boolean isPairingPageEnabled();
}

View File

@@ -0,0 +1,12 @@
package com.android.settings.bluetooth;
/**
* Impl for bluetooth feature provider
*/
public class BluetoothFeatureProviderImpl implements BluetoothFeatureProvider {
@Override
public boolean isPairingPageEnabled() {
return false;
}
}

View File

@@ -22,6 +22,7 @@ import android.util.Log;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.applications.ApplicationFeatureProvider; import com.android.settings.applications.ApplicationFeatureProvider;
import com.android.settings.bluetooth.BluetoothFeatureProvider;
import com.android.settings.core.instrumentation.MetricsFeatureProvider; import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.dashboard.DashboardFeatureProvider; import com.android.settings.dashboard.DashboardFeatureProvider;
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider; import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
@@ -97,6 +98,8 @@ public abstract class FeatureFactory {
public abstract UserFeatureProvider getUserFeatureProvider(Context context); public abstract UserFeatureProvider getUserFeatureProvider(Context context);
public abstract BluetoothFeatureProvider getBluetoothFeatureProvider(Context context);
public static final class FactoryNotFoundException extends RuntimeException { public static final class FactoryNotFoundException extends RuntimeException {
public FactoryNotFoundException(Throwable throwable) { public FactoryNotFoundException(Throwable throwable) {
super("Unable to create factory. Did you misconfigure Proguard?", throwable); super("Unable to create factory. Did you misconfigure Proguard?", throwable);

View File

@@ -27,6 +27,8 @@ import com.android.settings.applications.ApplicationFeatureProvider;
import com.android.settings.applications.ApplicationFeatureProviderImpl; import com.android.settings.applications.ApplicationFeatureProviderImpl;
import com.android.settings.applications.IPackageManagerWrapperImpl; import com.android.settings.applications.IPackageManagerWrapperImpl;
import com.android.settings.applications.PackageManagerWrapperImpl; import com.android.settings.applications.PackageManagerWrapperImpl;
import com.android.settings.bluetooth.BluetoothFeatureProvider;
import com.android.settings.bluetooth.BluetoothFeatureProviderImpl;
import com.android.settings.core.instrumentation.MetricsFeatureProvider; import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.dashboard.DashboardFeatureProvider; import com.android.settings.dashboard.DashboardFeatureProvider;
import com.android.settings.dashboard.DashboardFeatureProviderImpl; import com.android.settings.dashboard.DashboardFeatureProviderImpl;
@@ -66,6 +68,7 @@ public class FeatureFactoryImpl extends FeatureFactory {
private PowerUsageFeatureProvider mPowerUsageFeatureProvider; private PowerUsageFeatureProvider mPowerUsageFeatureProvider;
private AssistGestureFeatureProvider mAssistGestureFeatureProvider; private AssistGestureFeatureProvider mAssistGestureFeatureProvider;
private UserFeatureProvider mUserFeatureProvider; private UserFeatureProvider mUserFeatureProvider;
private BluetoothFeatureProvider mBluetoothFeatureProvider;
@Override @Override
public SupportFeatureProvider getSupportFeatureProvider(Context context) { public SupportFeatureProvider getSupportFeatureProvider(Context context) {
@@ -168,6 +171,14 @@ public class FeatureFactoryImpl extends FeatureFactory {
return mUserFeatureProvider; return mUserFeatureProvider;
} }
@Override
public BluetoothFeatureProvider getBluetoothFeatureProvider(Context context) {
if (mBluetoothFeatureProvider == null) {
mBluetoothFeatureProvider = new BluetoothFeatureProviderImpl();
}
return mBluetoothFeatureProvider;
}
@Override @Override
public AssistGestureFeatureProvider getAssistGestureFeatureProvider() { public AssistGestureFeatureProvider getAssistGestureFeatureProvider() {
if (mAssistGestureFeatureProvider == null) { if (mAssistGestureFeatureProvider == null) {

View File

@@ -18,6 +18,7 @@ package com.android.settings.testutils;
import android.content.Context; import android.content.Context;
import com.android.settings.applications.ApplicationFeatureProvider; import com.android.settings.applications.ApplicationFeatureProvider;
import com.android.settings.bluetooth.BluetoothFeatureProvider;
import com.android.settings.core.instrumentation.MetricsFeatureProvider; import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.dashboard.DashboardFeatureProvider; import com.android.settings.dashboard.DashboardFeatureProvider;
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider; import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
@@ -34,6 +35,7 @@ import com.android.settings.users.UserFeatureProvider;
import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.mockingDetails;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
/** /**
@@ -55,6 +57,7 @@ public class FakeFeatureFactory extends FeatureFactory {
public final SuggestionFeatureProvider suggestionsFeatureProvider; public final SuggestionFeatureProvider suggestionsFeatureProvider;
public final UserFeatureProvider userFeatureProvider; public final UserFeatureProvider userFeatureProvider;
public final AssistGestureFeatureProvider assistGestureFeatureProvider; public final AssistGestureFeatureProvider assistGestureFeatureProvider;
public final BluetoothFeatureProvider bluetoothFeatureProvider;
/** /**
* Call this in {@code @Before} method of the test class to use fake factory. * Call this in {@code @Before} method of the test class to use fake factory.
@@ -90,6 +93,7 @@ public class FakeFeatureFactory extends FeatureFactory {
suggestionsFeatureProvider = mock(SuggestionFeatureProvider.class); suggestionsFeatureProvider = mock(SuggestionFeatureProvider.class);
userFeatureProvider = mock(UserFeatureProvider.class); userFeatureProvider = mock(UserFeatureProvider.class);
assistGestureFeatureProvider = mock(AssistGestureFeatureProvider.class); assistGestureFeatureProvider = mock(AssistGestureFeatureProvider.class);
bluetoothFeatureProvider = mock(BluetoothFeatureProvider.class);
} }
@Override @Override
@@ -152,6 +156,11 @@ public class FakeFeatureFactory extends FeatureFactory {
return userFeatureProvider; return userFeatureProvider;
} }
@Override
public BluetoothFeatureProvider getBluetoothFeatureProvider(Context context) {
return bluetoothFeatureProvider;
}
@Override @Override
public AssistGestureFeatureProvider getAssistGestureFeatureProvider() { public AssistGestureFeatureProvider getAssistGestureFeatureProvider() {
return assistGestureFeatureProvider; return assistGestureFeatureProvider;