Remove BluetoothFeatureProvider and impl
It's not used by anything Change-Id: I03a73461a391657b8efbce13670a0c92fc4e3565 Fixes: 111940586 Test: rebuild
This commit is contained in:
@@ -1,32 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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 {
|
|
||||||
/**
|
|
||||||
* @return whether additional pairing page is enabled
|
|
||||||
*/
|
|
||||||
boolean isPairingPageEnabled();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return whether device details should be shown as a separate page (true) or a dialog (false)
|
|
||||||
*/
|
|
||||||
boolean isDeviceDetailPageEnabled();
|
|
||||||
}
|
|
@@ -1,17 +0,0 @@
|
|||||||
package com.android.settings.bluetooth;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Impl for bluetooth feature provider
|
|
||||||
*/
|
|
||||||
public class BluetoothFeatureProviderImpl implements BluetoothFeatureProvider {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isPairingPageEnabled() {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isDeviceDetailPageEnabled() {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
@@ -23,7 +23,6 @@ import android.util.Log;
|
|||||||
import com.android.settings.R;
|
import com.android.settings.R;
|
||||||
import com.android.settings.accounts.AccountFeatureProvider;
|
import com.android.settings.accounts.AccountFeatureProvider;
|
||||||
import com.android.settings.applications.ApplicationFeatureProvider;
|
import com.android.settings.applications.ApplicationFeatureProvider;
|
||||||
import com.android.settings.bluetooth.BluetoothFeatureProvider;
|
|
||||||
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;
|
||||||
import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;
|
import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;
|
||||||
@@ -103,8 +102,6 @@ public abstract class FeatureFactory {
|
|||||||
|
|
||||||
public abstract UserFeatureProvider getUserFeatureProvider(Context context);
|
public abstract UserFeatureProvider getUserFeatureProvider(Context context);
|
||||||
|
|
||||||
public abstract BluetoothFeatureProvider getBluetoothFeatureProvider(Context context);
|
|
||||||
|
|
||||||
public abstract SlicesFeatureProvider getSlicesFeatureProvider();
|
public abstract SlicesFeatureProvider getSlicesFeatureProvider();
|
||||||
|
|
||||||
public abstract AccountFeatureProvider getAccountFeatureProvider();
|
public abstract AccountFeatureProvider getAccountFeatureProvider();
|
||||||
|
@@ -22,12 +22,12 @@ import android.content.Context;
|
|||||||
import android.net.ConnectivityManager;
|
import android.net.ConnectivityManager;
|
||||||
import android.os.UserManager;
|
import android.os.UserManager;
|
||||||
|
|
||||||
|
import androidx.annotation.Keep;
|
||||||
|
|
||||||
import com.android.settings.accounts.AccountFeatureProvider;
|
import com.android.settings.accounts.AccountFeatureProvider;
|
||||||
import com.android.settings.accounts.AccountFeatureProviderImpl;
|
import com.android.settings.accounts.AccountFeatureProviderImpl;
|
||||||
import com.android.settings.applications.ApplicationFeatureProvider;
|
import com.android.settings.applications.ApplicationFeatureProvider;
|
||||||
import com.android.settings.applications.ApplicationFeatureProviderImpl;
|
import com.android.settings.applications.ApplicationFeatureProviderImpl;
|
||||||
import com.android.settings.bluetooth.BluetoothFeatureProvider;
|
|
||||||
import com.android.settings.bluetooth.BluetoothFeatureProviderImpl;
|
|
||||||
import com.android.settings.connecteddevice.dock.DockUpdaterFeatureProviderImpl;
|
import com.android.settings.connecteddevice.dock.DockUpdaterFeatureProviderImpl;
|
||||||
import com.android.settings.dashboard.DashboardFeatureProvider;
|
import com.android.settings.dashboard.DashboardFeatureProvider;
|
||||||
import com.android.settings.dashboard.DashboardFeatureProviderImpl;
|
import com.android.settings.dashboard.DashboardFeatureProviderImpl;
|
||||||
@@ -53,8 +53,6 @@ import com.android.settings.users.UserFeatureProvider;
|
|||||||
import com.android.settings.users.UserFeatureProviderImpl;
|
import com.android.settings.users.UserFeatureProviderImpl;
|
||||||
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
|
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
|
||||||
|
|
||||||
import androidx.annotation.Keep;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* {@link FeatureFactory} implementation for AOSP Settings.
|
* {@link FeatureFactory} implementation for AOSP Settings.
|
||||||
*/
|
*/
|
||||||
@@ -73,7 +71,6 @@ 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;
|
|
||||||
private SlicesFeatureProvider mSlicesFeatureProvider;
|
private SlicesFeatureProvider mSlicesFeatureProvider;
|
||||||
private AccountFeatureProvider mAccountFeatureProvider;
|
private AccountFeatureProvider mAccountFeatureProvider;
|
||||||
private DeviceIndexFeatureProviderImpl mDeviceIndexFeatureProvider;
|
private DeviceIndexFeatureProviderImpl mDeviceIndexFeatureProvider;
|
||||||
@@ -191,14 +188,6 @@ 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) {
|
||||||
|
@@ -23,7 +23,6 @@ import android.content.Context;
|
|||||||
|
|
||||||
import com.android.settings.accounts.AccountFeatureProvider;
|
import com.android.settings.accounts.AccountFeatureProvider;
|
||||||
import com.android.settings.applications.ApplicationFeatureProvider;
|
import com.android.settings.applications.ApplicationFeatureProvider;
|
||||||
import com.android.settings.bluetooth.BluetoothFeatureProvider;
|
|
||||||
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;
|
||||||
import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;
|
import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;
|
||||||
@@ -62,7 +61,6 @@ 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;
|
|
||||||
public final AccountFeatureProvider mAccountFeatureProvider;
|
public final AccountFeatureProvider mAccountFeatureProvider;
|
||||||
public final DeviceIndexFeatureProvider deviceIndexFeatureProvider;
|
public final DeviceIndexFeatureProvider deviceIndexFeatureProvider;
|
||||||
|
|
||||||
@@ -104,7 +102,6 @@ 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);
|
|
||||||
slicesFeatureProvider = mock(SlicesFeatureProvider.class);
|
slicesFeatureProvider = mock(SlicesFeatureProvider.class);
|
||||||
mAccountFeatureProvider = mock(AccountFeatureProvider.class);
|
mAccountFeatureProvider = mock(AccountFeatureProvider.class);
|
||||||
deviceIndexFeatureProvider = mock(DeviceIndexFeatureProvider.class);
|
deviceIndexFeatureProvider = mock(DeviceIndexFeatureProvider.class);
|
||||||
@@ -175,11 +172,6 @@ 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;
|
||||||
|
Reference in New Issue
Block a user