Remove all reference to SmsMirroring in Android Settings.
Test: Robotests Change-Id: I3318c6915cae95522f09838f00a3c567fe9e5fc5
This commit is contained in:
@@ -81,11 +81,6 @@ public class AdvancedConnectedDeviceDashboardFragment extends DashboardFragment
|
||||
lifecycle.addObserver(bluetoothPreferenceController);
|
||||
controllers.add(bluetoothPreferenceController);
|
||||
|
||||
SmsMirroringFeatureProvider smsMirroringFeatureProvider =
|
||||
FeatureFactory.getFactory(context).getSmsMirroringFeatureProvider();
|
||||
AbstractPreferenceController smsMirroringController =
|
||||
smsMirroringFeatureProvider.getController(context);
|
||||
controllers.add(smsMirroringController);
|
||||
controllers.add(new BluetoothFilesPreferenceController(context));
|
||||
controllers.add(new BluetoothOnWhileDrivingPreferenceController(context));
|
||||
return controllers;
|
||||
@@ -114,12 +109,6 @@ public class AdvancedConnectedDeviceDashboardFragment extends DashboardFragment
|
||||
}
|
||||
keys.add(BluetoothMasterSwitchPreferenceController.KEY_TOGGLE_BLUETOOTH);
|
||||
|
||||
SmsMirroringFeatureProvider smsMirroringFeatureProvider =
|
||||
FeatureFactory.getFactory(context).getSmsMirroringFeatureProvider();
|
||||
SmsMirroringPreferenceController smsMirroringController =
|
||||
smsMirroringFeatureProvider.getController(context);
|
||||
smsMirroringController.updateNonIndexableKeys(keys);
|
||||
|
||||
return keys;
|
||||
}
|
||||
};
|
||||
|
@@ -90,11 +90,6 @@ public class ConnectedDeviceDashboardFragmentOld extends DashboardFragment {
|
||||
lifecycle.addObserver(bluetoothPreferenceController);
|
||||
controllers.add(bluetoothPreferenceController);
|
||||
|
||||
SmsMirroringFeatureProvider smsMirroringFeatureProvider =
|
||||
FeatureFactory.getFactory(context).getSmsMirroringFeatureProvider();
|
||||
AbstractPreferenceController smsMirroringController =
|
||||
smsMirroringFeatureProvider.getController(context);
|
||||
controllers.add(smsMirroringController);
|
||||
return controllers;
|
||||
}
|
||||
|
||||
@@ -157,12 +152,6 @@ public class ConnectedDeviceDashboardFragmentOld extends DashboardFragment {
|
||||
}
|
||||
keys.add(BluetoothMasterSwitchPreferenceController.KEY_TOGGLE_BLUETOOTH);
|
||||
|
||||
SmsMirroringFeatureProvider smsMirroringFeatureProvider =
|
||||
FeatureFactory.getFactory(context).getSmsMirroringFeatureProvider();
|
||||
SmsMirroringPreferenceController smsMirroringController =
|
||||
smsMirroringFeatureProvider.getController(context);
|
||||
smsMirroringController.updateNonIndexableKeys(keys);
|
||||
|
||||
return keys;
|
||||
}
|
||||
};
|
||||
|
@@ -1,28 +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.connecteddevice;
|
||||
|
||||
import android.content.Context;
|
||||
|
||||
public interface SmsMirroringFeatureProvider {
|
||||
|
||||
/** Returns whether to show SMS mirroring. */
|
||||
boolean shouldShowSmsMirroring(Context context);
|
||||
|
||||
/** Returns a preference controller for SMS mirroring. */
|
||||
SmsMirroringPreferenceController getController(Context context);
|
||||
}
|
@@ -1,31 +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.connecteddevice;
|
||||
|
||||
import android.content.Context;
|
||||
|
||||
public class SmsMirroringFeatureProviderImpl implements SmsMirroringFeatureProvider {
|
||||
@Override
|
||||
public boolean shouldShowSmsMirroring(Context context) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public SmsMirroringPreferenceController getController(Context context) {
|
||||
return new SmsMirroringPreferenceController(context);
|
||||
}
|
||||
}
|
||||
|
@@ -1,45 +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.connecteddevice;
|
||||
|
||||
import android.content.Context;
|
||||
|
||||
import com.android.settings.core.PreferenceControllerMixin;
|
||||
import com.android.settings.overlay.FeatureFactory;
|
||||
import com.android.settingslib.core.AbstractPreferenceController;
|
||||
|
||||
public class SmsMirroringPreferenceController extends AbstractPreferenceController
|
||||
implements PreferenceControllerMixin {
|
||||
|
||||
static final String KEY_SMS_MIRRORING = "sms_mirroring";
|
||||
|
||||
private SmsMirroringFeatureProvider mFeatureProvider;
|
||||
|
||||
public SmsMirroringPreferenceController(Context context) {
|
||||
super(context);
|
||||
mFeatureProvider = FeatureFactory.getFactory(context).getSmsMirroringFeatureProvider();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isAvailable() {
|
||||
return mFeatureProvider.shouldShowSmsMirroring(mContext);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getPreferenceKey() {
|
||||
return KEY_SMS_MIRRORING;
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user