Merge "Fix not on the top when entering device detail page" into tm-qpr-dev am: 9ac1712145
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20008465 Change-Id: I2a8dd8e4bb9f11ab239ec7a4e420b38c52623a66 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -22,19 +22,25 @@ import androidx.preference.PreferenceFragmentCompat;
|
||||
import androidx.preference.PreferenceScreen;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.applications.SpacePreference;
|
||||
import com.android.settings.core.SubSettingLauncher;
|
||||
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
|
||||
import com.android.settingslib.bluetooth.HearingAidProfile;
|
||||
import com.android.settingslib.core.lifecycle.Lifecycle;
|
||||
import com.android.settingslib.widget.ButtonPreference;
|
||||
|
||||
import com.google.common.annotations.VisibleForTesting;
|
||||
|
||||
/**
|
||||
* This class handles button preference logic to display for hearing aid device.
|
||||
*/
|
||||
public class BluetoothDetailsPairOtherController extends BluetoothDetailsController {
|
||||
private static final String KEY_PAIR_OTHER = "hearing_aid_pair_other_button";
|
||||
@VisibleForTesting
|
||||
static final String KEY_SPACE = "hearing_aid_space_layout";
|
||||
|
||||
private ButtonPreference mPreference;
|
||||
private SpacePreference mSpacePreference;
|
||||
|
||||
public BluetoothDetailsPairOtherController(Context context,
|
||||
PreferenceFragmentCompat fragment,
|
||||
@@ -62,13 +68,20 @@ public class BluetoothDetailsPairOtherController extends BluetoothDetailsControl
|
||||
: R.string.bluetooth_pair_left_ear_button;
|
||||
|
||||
mPreference = screen.findPreference(getPreferenceKey());
|
||||
mSpacePreference = screen.findPreference(KEY_SPACE);
|
||||
mPreference.setTitle(stringRes);
|
||||
setPreferencesVisibility(getButtonPreferenceVisibility(mCachedDevice));
|
||||
mPreference.setOnClickListener(v -> launchPairingDetail());
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void refresh() {
|
||||
mPreference.setVisible(getButtonPreferenceVisibility(mCachedDevice));
|
||||
setPreferencesVisibility(getButtonPreferenceVisibility(mCachedDevice));
|
||||
}
|
||||
|
||||
private void setPreferencesVisibility(boolean visible) {
|
||||
mPreference.setVisible(visible);
|
||||
mSpacePreference.setVisible(visible);
|
||||
}
|
||||
|
||||
private boolean getButtonPreferenceVisibility(CachedBluetoothDevice cachedDevice) {
|
||||
|
||||
Reference in New Issue
Block a user