Commit Graph

122346 Commits

Author SHA1 Message Date
Betty Chang
b7073086ab [automerger skipped] Merge "To fix the footer link is not clickable in the Bluetooth Settings" am: cc7da9e61d am: 6ac664c975 am: df94418ec6 -s ours am: 5face72c87 -s ours
am skip reason: Merged-In If9e666df7b987e0dbe3d550ac0af03b9d79230de with SHA-1 3512374f62 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2507379

Change-Id: I8cd83952c79327051320168e5c8c51a7e43100fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 17:13:05 +00:00
Becca Hughes
994e9395eb Fix ordering on work profile
Test: on device
Bug: 274126565
Change-Id: I137369fc9a2b5fbb2e200b6c906e11a9dea3a847
2023-03-24 16:42:26 +00:00
Betty Chang
5face72c87 [automerger skipped] Merge "To fix the footer link is not clickable in the Bluetooth Settings" am: cc7da9e61d am: 6ac664c975 am: df94418ec6 -s ours
am skip reason: Merged-In If9e666df7b987e0dbe3d550ac0af03b9d79230de with SHA-1 3512374f62 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2507379

Change-Id: Ia878da405a0c4c5ad8487d467ebd9b3e6556f43d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 16:25:10 +00:00
Betty Chang
df94418ec6 Merge "To fix the footer link is not clickable in the Bluetooth Settings" am: cc7da9e61d am: 6ac664c975
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2507379

Change-Id: Ia05fb646720a4b0aeee71047f1aa9cecd519a6eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 15:56:20 +00:00
Zoey Chen
a7268a053f [Settings] NPE when finish MobileNetworkSettings am: 6929616581 am: 9108eded86
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252145

Change-Id: I233923c0c35f5d6e0d381d3eb7af248f7cd4ffaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 15:40:15 +00:00
Zoey Chen
47a9598a6b [Settings] NPE when finish MobileNetworkSettings am: 6929616581 am: 515c943e15
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252145

Change-Id: I2b2374c357e92e835dc35243dae80ed6d39916c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 15:37:29 +00:00
Betty Chang
6ac664c975 Merge "To fix the footer link is not clickable in the Bluetooth Settings" am: cc7da9e61d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2507379

Change-Id: I141e9cbef78ea7e192047d07e054f8810b376219
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 15:26:58 +00:00
Betty Chang
cc7da9e61d Merge "To fix the footer link is not clickable in the Bluetooth Settings" 2023-03-24 15:01:48 +00:00
Zoey Chen
9108eded86 [Settings] NPE when finish MobileNetworkSettings am: 6929616581
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252145

Change-Id: Ifc94d1cc39c825906a36e6e3df9a1f953fe092d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 14:59:18 +00:00
Zoey Chen
515c943e15 [Settings] NPE when finish MobileNetworkSettings am: 6929616581
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252145

Change-Id: I2aab326575b8ad36f33001550a6f6b09c4ca7b11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 14:58:42 +00:00
Zoey Chen
7beb190e9c [Settings] Hide package name if needed
Bug: 273167633
Test: local test
Change-Id: I237d8f5821080283465a6cf72ad7505a55a6bb81
2023-03-24 14:00:31 +00:00
Zoey Chen
6929616581 [Settings] NPE when finish MobileNetworkSettings
Add NPE protection when finish

Bug: 271524675
Test: local test
Change-Id: I74bb54f2e591534b411589c150ce0bd993c2e6dd
2023-03-24 13:08:29 +00:00
Matías Hernández
005a382091 Prevent guest users from toggling "hide silent notifications"
This is a global setting, not per user, and shouldn't be modifiable by a guest. It can still be toggled by other, "normal" users, for the same global effect.

Fixes: 260570341
Test: atest
Change-Id: Id6e1803b5364f3b50bdbc14af0468979c96b5638
2023-03-24 12:15:58 +01:00
changbetty
d31f12eb4e To fix the footer link is not clickable in the Bluetooth Settings
- Links are not allowed in footer preference title now. So follow the
   Wi-Fi UX design to add the string "Change". Let the user to click and
   go to the Bluetooth scanninng settings

Bug: 265167737
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=BluetoothSwitchPreferenceControllerTest

Change-Id: If9e666df7b987e0dbe3d550ac0af03b9d79230de
Merged-In: If9e666df7b987e0dbe3d550ac0af03b9d79230de
2023-03-24 09:23:27 +00:00
Automerger Merge Worker
fd83f9a20a Merge "Merge "Remove unnecessary indexes for Location services" into udc-dev am: d1d2374b89 am: 1888c8511c" 2023-03-24 08:36:22 +00:00
Yanting Yang
e9e1557d8c Merge "Remove unnecessary indexes for Location services" into udc-dev am: d1d2374b89 am: 1888c8511c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22221742

Change-Id: Ibcf55a06ebcfa25aefe443ce666fc9b894e77478
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 08:36:17 +00:00
Yanting Yang
2748af490e Merge "Remove unnecessary indexes for Location services" into udc-dev am: d1d2374b89 am: ea4caf30e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22221742

Change-Id: If79dd8f9c3855f9d22e45bc063368bf2670ab368
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 08:36:14 +00:00
Automerger Merge Worker
4c211c73f1 Merge "Merge "Imporve UI of system langauge list" into udc-dev am: e2eb822266 am: 6c5e56e736" 2023-03-24 08:36:10 +00:00
TreeHugger Robot
f1b2f301f3 Merge "Imporve UI of system langauge list" into udc-dev am: e2eb822266 am: 6c5e56e736
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22200382

Change-Id: I05427766ed441e33b5ee991cd4782ddad731271c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 08:36:03 +00:00
TreeHugger Robot
9fc39c6d13 Merge "Imporve UI of system langauge list" into udc-dev am: e2eb822266 am: 97b345aac8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22200382

Change-Id: I5b998e506cc7b7e13c2030cda3f4c07c18d35d6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 08:36:02 +00:00
Yanting Yang
1888c8511c Merge "Remove unnecessary indexes for Location services" into udc-dev am: d1d2374b89
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22221742

Change-Id: Icd95ed324f3fe31197c0961fa5031b12ee5318d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 08:09:11 +00:00
Yanting Yang
ea4caf30e1 Merge "Remove unnecessary indexes for Location services" into udc-dev am: d1d2374b89
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22221742

Change-Id: Ib20e5c6754f68775214964f598c5e91c26a2d9f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 08:08:24 +00:00
TreeHugger Robot
97b345aac8 Merge "Imporve UI of system langauge list" into udc-dev am: e2eb822266
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22200382

Change-Id: I764c81c0ad6175de4e6b6462755bf0a873563aa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 08:07:56 +00:00
TreeHugger Robot
6c5e56e736 Merge "Imporve UI of system langauge list" into udc-dev am: e2eb822266
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22200382

Change-Id: I8e1d7460fff0447c5ad5529cae588f23cf46adfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 08:07:51 +00:00
Yanting Yang
d1d2374b89 Merge "Remove unnecessary indexes for Location services" into udc-dev 2023-03-24 07:42:02 +00:00
Yanting Yang
5b95f6384b Remove unnecessary indexes for Location services
Remove the indexes from LocationServicesForWork since it is only used
in the two tabs scenario. Should not provide its entry in Settings
Search to launch it independently.

Bug: 265056058
Test: manual
Change-Id: I495c6e9c913acb1da3fd759f0d2e12fc7d935389
2023-03-24 15:39:24 +08:00
TreeHugger Robot
e2eb822266 Merge "Imporve UI of system langauge list" into udc-dev 2023-03-24 07:37:05 +00:00
TreeHugger Robot
6d9f2cf637 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-03-24 07:24:21 +00:00
Automerger Merge Worker
8555fd9608 Merge "Merge "Clean up Settings to allow a2dp, hfp, and le audio to be simultaneously connected on the same device" am: ca3aa2a557 am: 9526a60e6b am: 9145d7e6ce am: caea0d9aff am: 5dcd468056" 2023-03-24 03:54:25 +00:00
Treehugger Robot
0fbecd70f1 Merge "Clean up Settings to allow a2dp, hfp, and le audio to be simultaneously connected on the same device" am: ca3aa2a557 am: 9526a60e6b am: 9145d7e6ce am: caea0d9aff am: 5dcd468056
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2375795

Change-Id: I47321f6d29597518a9b29cb63a1781878f12d6dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 03:54:06 +00:00
Treehugger Robot
549c0f3575 Merge "Clean up Settings to allow a2dp, hfp, and le audio to be simultaneously connected on the same device" am: ca3aa2a557 am: 9526a60e6b am: 9145d7e6ce am: caea0d9aff am: 07d355dcba
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2375795

Change-Id: I094da08c629a555f28a1cc01fcda81e5491cbf1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 03:54:04 +00:00
Treehugger Robot
5dcd468056 Merge "Clean up Settings to allow a2dp, hfp, and le audio to be simultaneously connected on the same device" am: ca3aa2a557 am: 9526a60e6b am: 9145d7e6ce am: caea0d9aff
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2375795

Change-Id: Ifc947954755bcb7e97fbfa994a0965ba101909c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 03:26:51 +00:00
Treehugger Robot
07d355dcba Merge "Clean up Settings to allow a2dp, hfp, and le audio to be simultaneously connected on the same device" am: ca3aa2a557 am: 9526a60e6b am: 9145d7e6ce am: caea0d9aff
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2375795

Change-Id: Idc887c5bbfb7881d812d2d3415e85f72f0cbc1df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 03:26:39 +00:00
Treehugger Robot
caea0d9aff Merge "Clean up Settings to allow a2dp, hfp, and le audio to be simultaneously connected on the same device" am: ca3aa2a557 am: 9526a60e6b am: 9145d7e6ce
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2375795

Change-Id: Ic7ad166567137761143322e108fd66854caa9edc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 02:54:13 +00:00
Treehugger Robot
9145d7e6ce Merge "Clean up Settings to allow a2dp, hfp, and le audio to be simultaneously connected on the same device" am: ca3aa2a557 am: 9526a60e6b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2375795

Change-Id: I0eac72eb5e473771f4792916fb5ae2211aae1e42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 02:24:11 +00:00
Treehugger Robot
9526a60e6b Merge "Clean up Settings to allow a2dp, hfp, and le audio to be simultaneously connected on the same device" am: ca3aa2a557
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2375795

Change-Id: Ic2fb8afdd80cd3892aeccb45fafec6b65de1e68f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 01:55:21 +00:00
Treehugger Robot
ca3aa2a557 Merge "Clean up Settings to allow a2dp, hfp, and le audio to be simultaneously connected on the same device" 2023-03-24 01:24:50 +00:00
Rahul Sabnis
b1e25950b8 Clean up Settings to allow a2dp, hfp, and le audio to be simultaneously
connected on the same device

Removes the classic audio toggles for dual mode audio devices.

Bug: 257881495
Test: Manual
Change-Id: Ie6794b4d904c74a7c5137ad141172c10188a99f9
2023-03-23 16:51:49 -07:00
Bill Yi
cf289a551f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 9850976bf3 -s ours am: 3fd3c68bc9 -s ours am: e0c151f401 -s ours am: 02009efec2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I80afa6950dee4689e75d309c7c6ca94e5a5a50d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 20:31:41 +00:00
Bill Yi
9fb728596e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5fb9d8914e -s ours am: b9446778d8 -s ours am: f58ee3f5f1 -s ours am: 1dbb0068e0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifceb9fd8f30703956aaf4fb50bdd1ee532740d09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 20:31:16 +00:00
William Loh
f24007cf38 [automerger skipped] Merge "Keep same behavior after initiatingPackageName change" into udc-dev am: 6e5e43829b am: 84b6862b46 -s ours
am skip reason: Merged-In I3b8639c5530782375d0b26c9a65c1662eced5493 with SHA-1 5d2420d493 is already in history

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

Change-Id: Ice497525bc9871ab042b4fd1b269ce10e189c010
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 20:24:19 +00:00
Bill Yi
02009efec2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 9850976bf3 -s ours am: 3fd3c68bc9 -s ours am: e0c151f401 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If40857846ae4833a221f5fb2bdff01451617940d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 20:13:23 +00:00
Bill Yi
1dbb0068e0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5fb9d8914e -s ours am: b9446778d8 -s ours am: f58ee3f5f1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id83ac3d55a381d87f464b0c28e1909116171b120
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 20:12:43 +00:00
TreeHugger Robot
df9e3e04b1 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-03-23 20:08:13 +00:00
TreeHugger Robot
20659e265f Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-03-23 20:08:13 +00:00
William Loh
84b6862b46 Merge "Keep same behavior after initiatingPackageName change" into udc-dev am: 6e5e43829b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22212986

Change-Id: I859465aa15851d7028f724d1a014c10c3f54550b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 20:07:45 +00:00
Automerger Merge Worker
840cb32efb Merge changes from topic "am-ae5f7f5b98a34069a8b49bcfb641d65b"
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 9850976bf3 -s ours am: 3fd3c68bc9 -s ours am: e0c151f401 -s ours am: e5e9d6ec2e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5fb9d8914e -s ours am: b9446778d8 -s ours am: f58ee3f5f1 -s ours am: a336abaeaf -s ours
2023-03-23 19:47:23 +00:00
Ioana Alexandru
d1d014a927 Merge "Clarify notifications behavior in bypass setting." into udc-dev am: f8662a4f40 am: d376093e8a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22195537

Change-Id: I2db145ce99e32d3475c307b81ca425bb3296c1d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 19:45:01 +00:00
Bill Yi
59bf2b0eeb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 9850976bf3 -s ours am: 3fd3c68bc9 -s ours am: e0c151f401 -s ours am: e5e9d6ec2e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie8f0f8bdecd139f80cad1c00a2a031a42c83b2a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 19:43:53 +00:00
Bill Yi
a8a36e068a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5fb9d8914e -s ours am: b9446778d8 -s ours am: f58ee3f5f1 -s ours am: a336abaeaf -s ours
am skip reason: subject contains skip directive

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

Change-Id: I739aa6ae1b19be5f5aea405804cc65b867d74eae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 19:43:41 +00:00