Merge "Remove all reference to SmsMirroring in Android Settings." (29a2379b) · Commits · e / os / android_packages_apps_Settings

res/drawable/ic_sms_mirroring_24dp.xml

deleted100644 → 0

+0 −25

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- 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.
		-->
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="24dp"
		android:height="24dp"
		android:viewportWidth="24.0"
		android:viewportHeight="24.0"
		android:tint="?android:attr/colorControlNormal">
		<path
		android:fillColor="#FF000000"
		android:pathData="M20,2C21.1,2 22,2.9 22,4L22,16C22,17.1 21.1,18 20,18L6,18L2,22L2.01,4C2.01,2.9 2.9,2 4,2L20,2ZM8,8L4,12L8,16L8,13L14,13L14,11L8,11L8,8ZM19.666,7.872L16.038,4.372L16.038,6.997L10,6.997L10,9L16.038,9L16.038,11.372L19.666,7.872Z"/>
		</vector>

+0 −3

Original line number	Diff line number	Diff line
		@@ -8130,9 +8130,6 @@
		and powering other device [CHAR LIMIT=NONE] -->
		<string name="usb_summary_MIDI_power">MIDI and supplying power</string>

		<!-- Settings item title for SMS Mirroring preference [CHAR LIMIT=35] -->
		<string name="sms_mirroring_pref">SMS Mirroring</string>

		<!-- Settings item title for background check prefs [CHAR LIMIT=35] -->
		<string name="background_check_pref">Background check</string>

+0 −7

Original line number	Diff line number	Diff line
		@@ -42,13 +42,6 @@
		android:icon="@drawable/ic_android"
		android:order="-4"/>

		<Preference
		android:key="sms_mirroring"
		android:title="@string/sms_mirroring_pref"
		android:icon="@drawable/ic_sms_mirroring_24dp"
		android:summary="@string/summary_placeholder"
		android:order="-3"/>

		<SwitchPreference
		android:key="bluetooth_on_while_driving"
		android:title="@string/bluetooth_on_while_driving_pref"

+0 −7

Original line number	Diff line number	Diff line
		@@ -39,13 +39,6 @@
		android:icon="@drawable/ic_android"
		android:order="-4"/>

		<Preference
		android:key="sms_mirroring"
		android:title="@string/sms_mirroring_pref"
		android:icon="@drawable/ic_sms_mirroring_24dp"
		android:summary="@string/summary_placeholder"
		android:order="-3"/>

		<Preference
		android:key="usb_mode"
		android:title="@string/usb_pref"

+0 −11

Original line number	Diff line number	Diff line
		@@ -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;
		}
		};