Merge "Fix connected devices settings jank issue" into sc-dev (8cb761e3) · Commits · e / os / android_packages_apps_Settings

res/xml/connected_devices.xml

+1 −12

Original line number	Diff line number	Diff line
		@@ -40,24 +40,13 @@
		android:key="add_bt_devices"
		android:title="@string/bluetooth_pairing_pref_title"
		android:icon="@drawable/ic_add_24dp"
		android:fragment="com.android.settings.bluetooth.BluetoothPairingDetail"
		settings:allowDividerAbove="true"
		settings:keywords="@string/keywords_add_bt_device"
		settings:userRestriction="no_config_bluetooth"
		settings:useAdminDisabledSummary="true"
		settings:controller="com.android.settings.connecteddevice.AddDevicePreferenceController"/>

		<com.android.settingslib.RestrictedPreference
		android:key="add_bt_devices_summary"
		android:title="@string/bluetooth_pairing_pref_title"
		android:icon="@drawable/ic_add_24dp"
		android:summary="@string/connected_device_add_device_summary"
		android:fragment="com.android.settings.bluetooth.BluetoothPairingDetail"
		settings:allowDividerAbove="true"
		settings:keywords="@string/keywords_add_bt_device"
		settings:userRestriction="no_config_bluetooth"
		settings:useAdminDisabledSummary="true"
		settings:controller="com.android.settings.connecteddevice.AddDeviceSummaryPreferenceController"/>
		settings:controller="com.android.settings.connecteddevice.AddDevicePreferenceController"/>

		<PreferenceCategory
		android:key="previously_connected_devices"

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -41,6 +41,12 @@ public class BluetoothDeviceRenamePreferenceController extends
		mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
		}

		@Override
		public int getAvailabilityStatus() {
		return mBluetoothAdapter != null && mBluetoothAdapter.isEnabled()
		? AVAILABLE : UNSUPPORTED_ON_DEVICE;
		}

		/**
		* Set the {@link Fragment} that used to show {@link LocalDeviceNameDialogFragment}
		* in {@code handlePreferenceTreeClick}

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

+4 −10

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@ import com.android.settingslib.core.lifecycle.events.OnStop;

		/**
		* Controller to maintain the {@link androidx.preference.Preference} for add
		* device without summary at beginning. It monitor Bluetooth's status(on/off) and decide if need
		* device. It monitor Bluetooth's status(on/off) and decide if need
		* to show summary or not.
		*/
		public class AddDevicePreferenceController extends BasePreferenceController
		@@ -43,12 +43,11 @@ public class AddDevicePreferenceController extends BasePreferenceController
		private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
		@Override
		public void onReceive(Context context, Intent intent) {
		updateState();
		updateState(mPreference);
		}
		};
		private IntentFilter mIntentFilter;

		protected BluetoothAdapter mBluetoothAdapter;
		private BluetoothAdapter mBluetoothAdapter;

		public AddDevicePreferenceController(Context context, String key) {
		super(context, key);
		@@ -59,7 +58,6 @@ public class AddDevicePreferenceController extends BasePreferenceController
		@Override
		public void onStart() {
		mContext.registerReceiver(mReceiver, mIntentFilter);
		updateState(mPreference);
		}

		@Override
		@@ -72,13 +70,13 @@ public class AddDevicePreferenceController extends BasePreferenceController
		super.displayPreference(screen);
		if (isAvailable()) {
		mPreference = screen.findPreference(getPreferenceKey());
		updateState(mPreference);
		}
		}

		@Override
		public int getAvailabilityStatus() {
		return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)
		&& isBluetoothEnabled()
		? AVAILABLE
		: UNSUPPORTED_ON_DEVICE;
		}
		@@ -93,8 +91,4 @@ public class AddDevicePreferenceController extends BasePreferenceController
		protected boolean isBluetoothEnabled() {
		return mBluetoothAdapter != null && mBluetoothAdapter.isEnabled();
		}

		void updateState() {
		updateState(mPreference);
		}
		}

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

deleted100644 → 0

+0 −39

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2021 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 android.content.pm.PackageManager;

		/**
		* Controller to maintain the {@link androidx.preference.Preference} for add
		* device with summary at beginning. It monitor Bluetooth's status(on/off) and decide if need
		* to show summary or not.
		*/
		public class AddDeviceSummaryPreferenceController extends AddDevicePreferenceController {

		public AddDeviceSummaryPreferenceController(Context context, String key) {
		super(context, key);
		}

		@Override
		public int getAvailabilityStatus() {
		return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)
		&& !isBluetoothEnabled()
		? AVAILABLE
		: UNSUPPORTED_ON_DEVICE;
		}
		}

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -103,6 +103,7 @@ public class PreviouslyConnectedDevicePreferenceController extends BasePreferenc
		final Context context = screen.getContext();
		mBluetoothDeviceUpdater.setPrefContext(context);
		mSavedDockUpdater.setPreferenceContext(context);
		mBluetoothDeviceUpdater.forceUpdate();
		}
		}