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

Merge changes from topic "presubmit-am-58603bfd39e0474b9e10a90af62fa3f5" into tm-qpr-dev-plus-aosp am: b0f9c2deae am: f929dc6dea

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22755956

Change-Id: Iab16c528e722e71eac6cbc223a68a567e95cfd80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
SongFerng Wang
2023-04-25 07:41:59 +00:00
committed by Automerger Merge Worker
parent 505b391a41 f929dc6dea
commit 4b8ac3daa9
5 changed files with 479 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
res/values/config.xml
View File

@@ -498,6 +498,15 @@
<!-- Slice Uri to query nearby devices. -->
<string name="config_nearby_devices_slice_uri" translatable="false">content://com.google.android.gms.nearby.fastpair/device_status_list_item</string>
<!-- BT Slice intent action. To support Settings 2 panel, BT slice can't use PendingIntent.send(). Therefore, here defines the Slice intent action. -->
<string name="config_bt_slice_intent_action" translatable="false"></string>
<!-- BT Slice pending intent action. To support Settings 2 panel, BT slice can't use PendingIntent.send(). Therefore, here defines the Slice pending intent action. -->
<string name="config_bt_slice_pending_intent_action" translatable="false"></string>
<!-- BT Slice EXTRA_INTENT. To support Settings 2 panel, BT slice can't use PendingIntent.send(). Therefore, here defines the Slice EXTRA_INTENT. -->
<string name="config_bt_slice_extra_intent" translatable="false"></string>
<!-- BT Slice EXTRA_PENDING_INTENT. To support Settings 2 panel, BT slice can't use PendingIntent.send(). Therefore, here defines the Slice EXTRA_PENDING_INTENT. -->
<string name="config_bt_slice_extra_pending_intent" translatable="false"></string>
<!-- Grayscale settings intent -->
<string name="config_grayscale_settings_intent" translatable="false"></string>

10
res/xml/bluetooth_device_details_fragment.xml
View File

@@ -61,11 +61,9 @@
settings:controller="com.android.settings.slices.SlicePreferenceController"
settings:allowDividerAbove="true"/>
<com.android.settings.slices.SlicePreference
android:key="bt_device_slice"
settings:controller="com.android.settings.slices.BlockingSlicePrefController"
settings:allowDividerBelow="true"
settings:allowDividerAbove="true"/>
<PreferenceCategory
android:key="bt_device_slice_category"
settings:controller="com.android.settings.bluetooth.BlockingPrefWithSliceController"/>
<PreferenceCategory
android:key="device_companion_apps"/>
@@ -108,4 +106,4 @@
settings:searchable="false"
settings:controller="com.android.settings.bluetooth.BluetoothDetailsMacAddressController"/>
</PreferenceScreen>
</PreferenceScreen>