Merge "Bluetooth and NFC added back to Connection preferences" into pi-dev (32b1a412) · Commits · e / os / android_packages_apps_Settings

res/xml/connected_devices.xml

+0 −15

Original line number	Diff line number	Diff line
		@@ -48,21 +48,6 @@
		android:fragment="com.android.settings.connecteddevice.PreviouslyConnectedDeviceDashboardFragment"
		settings:allowDividerAbove="true"/>

		<Preference
		android:fragment="com.android.settings.connecteddevice.BluetoothDashboardFragment"
		android:key="bluetooth_settings"
		android:title="@string/bluetooth_settings_title"
		android:icon="@drawable/ic_settings_bluetooth"/>

		<PreferenceCategory
		android:key="dashboard_tile_placeholder" />

		<SwitchPreference
		android:key="toggle_nfc"
		android:title="@string/nfc_quick_toggle_title"
		android:icon="@drawable/ic_nfc"
		android:summary="@string/nfc_quick_toggle_summary"/>

		<Preference
		android:key="connection_preferences"
		android:title="@string/connected_device_connections_title"

res/xml/connected_devices_advanced.xml

+18 −4

Original line number	Diff line number	Diff line
		@@ -20,12 +20,26 @@
		android:key="connected_devices_advanced_screen"
		android:title="@string/connected_device_connections_title">

		<Preference
		android:fragment="com.android.settings.connecteddevice.BluetoothDashboardFragment"
		android:key="bluetooth_settings"
		android:title="@string/bluetooth_settings_title"
		android:icon="@drawable/ic_settings_bluetooth"
		android:order="-9"/>

		<SwitchPreference
		android:key="toggle_nfc"
		android:title="@string/nfc_quick_toggle_title"
		android:icon="@drawable/ic_nfc"
		android:summary="@string/nfc_quick_toggle_summary"
		android:order="-7"/>

		<com.android.settingslib.RestrictedPreference
		android:fragment="com.android.settings.nfc.AndroidBeam"
		android:key="android_beam_settings"
		android:title="@string/android_beam_settings_title"
		android:icon="@drawable/ic_android"
		android:order="-4"/>
		android:order="-6"/>

		<SwitchPreference
		android:key="bluetooth_on_while_driving"
		@@ -33,7 +47,7 @@
		android:icon="@drawable/ic_settings_bluetooth"
		android:summary="@string/bluetooth_on_while_driving_summary"
		settings:controller="com.android.settings.connecteddevice.BluetoothOnWhileDrivingPreferenceController"
		android:order="-2"/>
		android:order="-4"/>

		<com.android.settingslib.RestrictedPreference
		android:key="connected_device_printing"
		@@ -41,7 +55,7 @@
		android:summary="@string/summary_placeholder"
		android:icon="@drawable/ic_settings_print"
		android:fragment="com.android.settings.print.PrintSettingsFragment"
		android:order="-1"/>
		android:order="-3"/>

		<Preference
		android:key="bt_received_files"
		@@ -50,6 +64,6 @@

		<PreferenceCategory
		android:key="dashboard_tile_placeholder"
		android:order="50"/>
		android:order="-8"/>

		</PreferenceScreen>

src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import com.android.settings.R;
		import com.android.settings.bluetooth.BluetoothFilesPreferenceController;
		import com.android.settings.dashboard.DashboardFragment;
		import com.android.settings.nfc.AndroidBeamPreferenceController;
		import com.android.settings.nfc.NfcPreferenceController;
		import com.android.settings.print.PrintSettingPreferenceController;
		import com.android.settings.search.BaseSearchIndexProvider;
		import com.android.settingslib.core.AbstractPreferenceController;
		@@ -78,10 +79,16 @@ public class AdvancedConnectedDeviceDashboardFragment extends DashboardFragment

		final PrintSettingPreferenceController printerController =
		new PrintSettingPreferenceController(context);
		final NfcPreferenceController nfcPreferenceController =
		new NfcPreferenceController(context);

		if (lifecycle != null) {
		lifecycle.addObserver(beamPreferenceController);
		lifecycle.addObserver(printerController);
		lifecycle.addObserver(nfcPreferenceController);
		}

		controllers.add(nfcPreferenceController);
		controllers.add(printerController);

		return controllers;

src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java

+0 −28

Original line number	Diff line number	Diff line
		@@ -26,10 +26,7 @@ import com.android.settings.dashboard.DashboardFragment;
		import com.android.settings.dashboard.SummaryLoader;
		import com.android.settings.nfc.NfcPreferenceController;
		import com.android.settings.search.BaseSearchIndexProvider;
		import com.android.settingslib.core.AbstractPreferenceController;
		import com.android.settingslib.core.lifecycle.Lifecycle;

		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.List;

		@@ -62,25 +59,6 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment {
		return R.xml.connected_devices;
		}

		@Override
		protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
		return buildPreferenceControllers(context, getLifecycle());
		}

		private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
		Lifecycle lifecycle) {
		final List<AbstractPreferenceController> controllers = new ArrayList<>();
		final NfcPreferenceController nfcPreferenceController =
		new NfcPreferenceController(context);
		controllers.add(nfcPreferenceController);

		if (lifecycle != null) {
		lifecycle.addObserver(nfcPreferenceController);
		}

		return controllers;
		}

		@Override
		public void onAttach(Context context) {
		super.onAttach(context);
		@@ -138,12 +116,6 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment {
		return Arrays.asList(sir);
		}

		@Override
		public List<AbstractPreferenceController> createPreferenceControllers(Context
		context) {
		return buildPreferenceControllers(context, null /* lifecycle */);
		}

		@Override
		public List<String> getNonIndexableKeys(Context context) {
		List<String> keys = super.getNonIndexableKeys(context);