PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Hide DCK Device] Move the aconfig flag for hide DCK device feature to settingslib

Browse Source 
Test: atest: com.android.settings.bluetooth.ConnectedBluetoothDeviceUpdaterTest
Test: atest: com.android.settings.bluetooth.SavedBluetoothDeviceUpdaterTest
Bug: 323298503
Bug: 324475542
Flag: ACONFIG com.android.settingslib.flags.enable_hide_exclusively_managed_bluetooth_device DEVELOPMENT
Change-Id: I558b749501807afcea7c15d94f498f01162a6f1e
This commit is contained in:
Srinivas Patibandla
2024-02-16 22:38:00 +00:00
parent 22b3c1fe1d
commit 85f941f9c3
6 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
aconfig/settings_connecteddevice_flag_declarations.aconfig
View File

@@ -21,10 +21,3 @@ flag {
description: "Order the saved bluetooth devices by most recently connected."
bug: "306160434"
}
flag {
name: "enable_hide_exclusively_managed_bluetooth_device"
namespace: "dck_framework"
description: "Hide exclusively managed Bluetooth devices in BT settings menu."
bug: "322285078"
}

2
src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java
View File

@@ -24,9 +24,9 @@ import android.util.Log;
import androidx.preference.Preference;
import com.android.settings.connecteddevice.DevicePreferenceCallback;
import com.android.settings.flags.Flags;
import com.android.settingslib.bluetooth.BluetoothUtils;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.flags.Flags;
/**
* Controller to maintain connected bluetooth devices

2
src/com/android/settings/bluetooth/DeviceListPreferenceFragment.kt
View File

@@ -34,13 +34,13 @@ import androidx.preference.PreferenceCategory
import androidx.preference.PreferenceGroup
import com.android.settings.R
import com.android.settings.dashboard.RestrictedDashboardFragment
import com.android.settings.flags.Flags
import com.android.settingslib.bluetooth.BluetoothCallback
import com.android.settingslib.bluetooth.BluetoothDeviceFilter
import com.android.settingslib.bluetooth.BluetoothUtils
import com.android.settingslib.bluetooth.CachedBluetoothDevice
import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager
import com.android.settingslib.bluetooth.LocalBluetoothManager
import com.android.settingslib.flags.Flags
import java.util.concurrent.ConcurrentHashMap
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers

2
src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java
View File

@@ -25,10 +25,10 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import com.android.settings.connecteddevice.DevicePreferenceCallback;
import com.android.settings.flags.Flags;
import com.android.settingslib.bluetooth.BluetoothUtils;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;
import com.android.settingslib.flags.Flags;
import java.util.ArrayList;
import java.util.List;

2
tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java
View File

@@ -41,12 +41,12 @@ import android.util.Pair;
import com.android.settings.connecteddevice.DevicePreferenceCallback;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.flags.Flags;
import com.android.settings.testutils.shadow.ShadowAudioManager;
import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
import com.android.settings.testutils.shadow.ShadowCachedBluetoothDeviceManager;
import com.android.settingslib.bluetooth.BluetoothUtils;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.flags.Flags;
import org.junit.Before;
import org.junit.Rule;

2
tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java
View File

@@ -40,12 +40,12 @@ import android.util.Pair;
import com.android.settings.connecteddevice.DevicePreferenceCallback;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.flags.Flags;
import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
import com.android.settingslib.bluetooth.BluetoothUtils;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;
import com.android.settingslib.bluetooth.LocalBluetoothManager;
import com.android.settingslib.flags.Flags;
import org.junit.Before;
import org.junit.Rule;