Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd841d25 authored by Chelsea Hao's avatar Chelsea Hao Committed by Android (Google) Code Review
Browse files

Merge "Move bluetooth qs tile dialog into systemui.bluetooth package." into main

parents ce6d7d4f 3c4c42df

packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogDelegate.java

+6 −6
Original line number Diff line number Diff line
@@ -43,14 +43,14 @@ import com.android.settingslib.bluetooth.CachedBluetoothDevice; 
import com.android.settingslib.bluetooth.LocalBluetoothManager;

import com.android.systemui.accessibility.hearingaid.HearingDevicesListAdapter.HearingDeviceItemCallback;

import com.android.systemui.animation.DialogTransitionAnimator;

import com.android.systemui.bluetooth.qsdialog.ActiveHearingDeviceItemFactory;

import com.android.systemui.bluetooth.qsdialog.AvailableHearingDeviceItemFactory;

import com.android.systemui.bluetooth.qsdialog.ConnectedDeviceItemFactory;

import com.android.systemui.bluetooth.qsdialog.DeviceItem;

import com.android.systemui.bluetooth.qsdialog.DeviceItemFactory;

import com.android.systemui.bluetooth.qsdialog.SavedHearingDeviceItemFactory;

import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.plugins.ActivityStarter;

import com.android.systemui.qs.tiles.dialog.bluetooth.ActiveHearingDeviceItemFactory;

import com.android.systemui.qs.tiles.dialog.bluetooth.AvailableHearingDeviceItemFactory;

import com.android.systemui.qs.tiles.dialog.bluetooth.ConnectedDeviceItemFactory;

import com.android.systemui.qs.tiles.dialog.bluetooth.DeviceItem;

import com.android.systemui.qs.tiles.dialog.bluetooth.DeviceItemFactory;

import com.android.systemui.qs.tiles.dialog.bluetooth.SavedHearingDeviceItemFactory;

import com.android.systemui.res.R;

import com.android.systemui.statusbar.phone.SystemUIDialog;

packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesListAdapter.java

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import android.widget.TextView; 
import androidx.annotation.NonNull;

import androidx.recyclerview.widget.RecyclerView;



import com.android.systemui.qs.tiles.dialog.bluetooth.DeviceItem;

import com.android.systemui.bluetooth.qsdialog.DeviceItem;

import com.android.systemui.res.R;



import kotlin.Pair;

packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothAutoOnInteractor.kt→packages/SystemUI/src/com/android/systemui/bluetooth/qsdialog/BluetoothAutoOnInteractor.kt

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.systemui.qs.tiles.dialog.bluetooth

package com.android.systemui.bluetooth.qsdialog



import android.util.Log

import com.android.systemui.dagger.SysUISingleton

packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothAutoOnRepository.kt→packages/SystemUI/src/com/android/systemui/bluetooth/qsdialog/BluetoothAutoOnRepository.kt

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 The Android Open Source Project

 * Copyright (C) 2024 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.
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.systemui.qs.tiles.dialog.bluetooth

package com.android.systemui.bluetooth.qsdialog



import android.bluetooth.BluetoothAdapter

import android.util.Log

packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothStateInteractor.kt→packages/SystemUI/src/com/android/systemui/bluetooth/qsdialog/BluetoothStateInteractor.kt

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 The Android Open Source Project

 * Copyright (C) 2024 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.
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.systemui.qs.tiles.dialog.bluetooth

package com.android.systemui.bluetooth.qsdialog



import android.bluetooth.BluetoothAdapter

import android.bluetooth.BluetoothAdapter.STATE_OFF