Fix the section below "Pair new device" moves up a few pixels
This CL add new controller that used to show the summary when bluetooth is off. It can prevent a jank since the UI is decided before render. Bug: 182232469 Test: make RunSettingsRoboTests -j56 Change-Id: I78eb757cd1b636fbb18028fb2294861467bc6eba
This commit is contained in:
@@ -33,7 +33,8 @@ import com.android.settingslib.core.lifecycle.events.OnStop;
|
||||
|
||||
/**
|
||||
* Controller to maintain the {@link androidx.preference.Preference} for add
|
||||
* device. It monitor Bluetooth's status(on/off) and decide if need to show summary or not.
|
||||
* device without summary at beginning. It monitor Bluetooth's status(on/off) and decide if need
|
||||
* to show summary or not.
|
||||
*/
|
||||
public class AddDevicePreferenceController extends BasePreferenceController
|
||||
implements LifecycleObserver, OnStart, OnStop {
|
||||
@@ -46,7 +47,8 @@ public class AddDevicePreferenceController extends BasePreferenceController
|
||||
}
|
||||
};
|
||||
private IntentFilter mIntentFilter;
|
||||
private BluetoothAdapter mBluetoothAdapter;
|
||||
|
||||
protected BluetoothAdapter mBluetoothAdapter;
|
||||
|
||||
public AddDevicePreferenceController(Context context, String key) {
|
||||
super(context, key);
|
||||
@@ -57,6 +59,7 @@ public class AddDevicePreferenceController extends BasePreferenceController
|
||||
@Override
|
||||
public void onStart() {
|
||||
mContext.registerReceiver(mReceiver, mIntentFilter);
|
||||
updateState(mPreference);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -75,17 +78,22 @@ public class AddDevicePreferenceController extends BasePreferenceController
|
||||
@Override
|
||||
public int getAvailabilityStatus() {
|
||||
return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)
|
||||
&& isBluetoothEnabled()
|
||||
? AVAILABLE
|
||||
: UNSUPPORTED_ON_DEVICE;
|
||||
}
|
||||
|
||||
@Override
|
||||
public CharSequence getSummary() {
|
||||
return mBluetoothAdapter != null && mBluetoothAdapter.isEnabled()
|
||||
return isBluetoothEnabled()
|
||||
? ""
|
||||
: mContext.getString(R.string.connected_device_add_device_summary);
|
||||
}
|
||||
|
||||
protected boolean isBluetoothEnabled() {
|
||||
return mBluetoothAdapter != null && mBluetoothAdapter.isEnabled();
|
||||
}
|
||||
|
||||
void updateState() {
|
||||
updateState(mPreference);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
/*
|
||||
* 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;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user