Merge "Remove the obsolete bluetooth code" into pi-dev (fa150fca) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+10 −17

Original line number	Diff line number	Diff line
		@@ -197,11 +197,6 @@
		<action android:name="android.settings.BLUETOOTH_SETTINGS" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		<category android:name="android.intent.category.DEFAULT" />
		<category android:name="android.intent.category.VOICE_LAUNCH" />
		</intent-filter>
		<intent-filter android:priority="10">
		<action android:name="com.android.settings.action.SETTINGS"/>
		</intent-filter>
		@@ -396,31 +391,29 @@
		android:value="com.android.settings.ApnSettings" />
		</activity>

		<activity
		<!-- Keep compatibility with old shortcuts. -->
		<activity-alias
		android:name="Settings$BluetoothSettingsActivity"
		android:label="@string/bluetooth_settings_title"
		android:icon="@drawable/ic_settings_bluetooth"
		android:enabled="false"
		android:taskAffinity="com.android.settings"
		android:parentActivityName="Settings">
		android:label="@string/devices_title"
		android:targetActivity=".Settings$ConnectedDeviceDashboardActivity"
		android:exported="true">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		<category android:name="android.intent.category.VOICE_LAUNCH" />
		<category android:name="com.android.settings.SHORTCUT" />
		<category android:name="android.intent.category.DEFAULT" />
		<category android:name="com.android.settings.SHORTCUT" />
		</intent-filter>
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.bluetooth.BluetoothSettings" />
		</activity>
		android:value="com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment" />
		</activity-alias>

		<!-- Keep compatibility with old shortcuts. -->
		<activity-alias android:name=".bluetooth.BluetoothSettings"
		android:label="@string/bluetooth_settings_title"
		android:label="@string/devices_title"
		android:targetActivity="Settings$BluetoothSettingsActivity"
		android:exported="true"
		android:clearTaskOnLaunch="true">
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.bluetooth.BluetoothSettings" />
		android:value="com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment" />
		</activity-alias>

		<activity android:name="Settings$AssistGestureSettingsActivity"

res/values/strings.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -9849,4 +9849,6 @@
		<!-- Warning text about the visibility of device name. [CHAR LIMIT=NONE] -->
		<string name="about_phone_device_name_warning">Your device name is visible to apps on your phone. It may also be seen by other people when you connect to Bluetooth devices or set up a Wi-Fi hotspot.</string>

		<!-- Title for Connected device shortcut [CHAR LIMIT=30] -->
		<string name="devices_title">Devices</string>
		</resources>

src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceController.java

deleted100644 → 0

+0 −135

Original line number	Diff line number	Diff line
		/*
		* 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;

		import android.content.Context;
		import android.support.v7.preference.Preference;
		import android.support.v7.preference.PreferenceScreen;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		import com.android.settings.R;
		import com.android.settings.core.InstrumentedPreferenceFragment;
		import com.android.settings.core.PreferenceControllerMixin;
		import com.android.settings.core.SubSettingLauncher;
		import com.android.settings.overlay.FeatureFactory;
		import com.android.settings.widget.MasterSwitchController;
		import com.android.settings.widget.MasterSwitchPreference;
		import com.android.settings.widget.SummaryUpdater.OnSummaryChangeListener;
		import com.android.settingslib.bluetooth.LocalBluetoothManager;
		import com.android.settingslib.core.AbstractPreferenceController;
		import com.android.settingslib.core.lifecycle.LifecycleObserver;
		import com.android.settingslib.core.lifecycle.events.OnPause;
		import com.android.settingslib.core.lifecycle.events.OnResume;
		import com.android.settingslib.core.lifecycle.events.OnStart;
		import com.android.settingslib.core.lifecycle.events.OnStop;

		//TODO(b/69926683): remove this controller in Android P.
		public class BluetoothMasterSwitchPreferenceController extends AbstractPreferenceController
		implements PreferenceControllerMixin, OnSummaryChangeListener, LifecycleObserver, OnResume,
		OnPause, OnStart, OnStop {

		public static final String KEY_TOGGLE_BLUETOOTH = "toggle_bluetooth";

		private LocalBluetoothManager mBluetoothManager;
		private MasterSwitchPreference mBtPreference;
		private BluetoothEnabler mBluetoothEnabler;
		private BluetoothSummaryUpdater mSummaryUpdater;
		private RestrictionUtils mRestrictionUtils;
		private InstrumentedPreferenceFragment mFragment;

		public BluetoothMasterSwitchPreferenceController(Context context,
		LocalBluetoothManager bluetoothManager, InstrumentedPreferenceFragment fragment) {
		this(context, bluetoothManager, new RestrictionUtils(), fragment);
		}

		@VisibleForTesting
		public BluetoothMasterSwitchPreferenceController(Context context,
		LocalBluetoothManager bluetoothManager, RestrictionUtils restrictionUtils,
		InstrumentedPreferenceFragment fragment) {
		super(context);
		mBluetoothManager = bluetoothManager;
		mSummaryUpdater = new BluetoothSummaryUpdater(mContext, this, mBluetoothManager);
		mRestrictionUtils = restrictionUtils;
		mFragment = fragment;
		}

		@Override
		public void displayPreference(PreferenceScreen screen) {
		super.displayPreference(screen);
		mBtPreference = (MasterSwitchPreference) screen.findPreference(KEY_TOGGLE_BLUETOOTH);
		mBluetoothEnabler = new BluetoothEnabler(mContext,
		new MasterSwitchController(mBtPreference),
		FeatureFactory.getFactory(mContext).getMetricsFeatureProvider(), mBluetoothManager,
		MetricsEvent.ACTION_SETTINGS_MASTER_SWITCH_BLUETOOTH_TOGGLE,
		mRestrictionUtils);
		}

		@Override
		public boolean handlePreferenceTreeClick(Preference preference) {
		if (KEY_TOGGLE_BLUETOOTH.equals(preference.getKey())) {
		new SubSettingLauncher(mContext)
		.setDestination(BluetoothSettings.class.getName())
		.setTitle(R.string.bluetooth)
		.setSourceMetricsCategory(mFragment.getMetricsCategory())
		.launch();
		return true;
		}
		return super.handlePreferenceTreeClick(preference);
		}

		@Override
		public boolean isAvailable() {
		return true;
		}

		@Override
		public String getPreferenceKey() {
		return KEY_TOGGLE_BLUETOOTH;
		}

		@Override
		public void onResume() {
		mSummaryUpdater.register(true);
		}

		@Override
		public void onPause() {
		mSummaryUpdater.register(false);
		}

		@Override
		public void onStart() {
		if (mBluetoothEnabler != null) {
		mBluetoothEnabler.resume(mContext);
		}
		}

		@Override
		public void onStop() {
		if (mBluetoothEnabler != null) {
		mBluetoothEnabler.pause();
		}
		}

		@Override
		public void onSummaryChanged(String summary) {
		if (mBtPreference != null) {
		mBtPreference.setSummary(summary);
		}
		}

		}

src/com/android/settings/bluetooth/BluetoothSettings.java

deleted100644 → 0

+0 −454

File deleted.

Preview size limit exceeded, changes collapsed.

src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -42,7 +42,6 @@ import java.util.WeakHashMap;
		* Parent class for settings fragments that contain a list of Bluetooth
		* devices.
		*
		* @see BluetoothSettings
		* @see DevicePickerFragment
		*/
		// TODO: Refactor this fragment
		@@ -204,10 +203,6 @@ public abstract class DeviceListPreferenceFragment extends
		mDevicePreferenceMap.put(cachedDevice, preference);
		}

		/**
		* Overridden in {@link BluetoothSettings} to add a listener.
		* @param preference the newly added preference
		*/
		void initDevicePreference(BluetoothDevicePreference preference) {
		// Does nothing by default
		}