Bonian Chen
244f21d9d7
resolve merge conflicts of 81d1cd0871
to stage-aosp-master am: 4ec8323bad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19465627
Change-Id: I1c79864417df3c542538634621cb0458a892d926
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-29 10:11:11 +00:00
Bonian Chen
4ec8323bad
resolve merge conflicts of 81d1cd0871
to stage-aosp-master
...
Test: Build pass this conflict resolution.
Bug: None
Change-Id: Iaacaeaa579025deee52b29b4b1245fc7c0fa0346
2022-07-29 07:34:35 +00:00
LuK1337
988a76f5bb
Settings: Make NetworkScanHelper max search time customizable
...
Default max search time (300) fails on some devices.
Test: Network scan works on OnePlus 9 after overlaying
max network scan search time to 254.
Change-Id: Ia0038fac6d2000748e0aa08fd6a53f11876728d7
2022-07-25 17:44:40 -07:00
Treehugger Robot
2058af23ac
Merge "Fix ExtraText lint errors" am: 000bc450b0
am: 91420db7c7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2141272
Change-Id: I0caf8634598434942ce4e3ecd2bbd3c32adf1fb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-14 11:58:53 +00:00
Treehugger Robot
91420db7c7
Merge "Fix ExtraText lint errors" am: 000bc450b0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2141272
Change-Id: Ia0f5c48b9581ab8722c06e226acd59e9ac18cde3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-14 11:32:07 +00:00
TreeHugger Robot
6f09916f9d
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-07-05 00:45:36 +00:00
Bill Yi
72d5864095
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I5ea05490d13515baaeda9ea7b6c153c8c2d0a54e
2022-07-03 14:12:52 -07:00
Bill Yi
1f4237da27
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic08c9ecc8d5fe64b43b00c9f87860ee2a5f5b46b
2022-07-03 14:08:30 -07:00
Cole Faust
ad66ad55ca
Fix ExtraText lint errors
...
Android lint is being updated, and now
checks for extra text in android manifest
and resource xml files.
Bug: 236431222
Test: Presubmits
Change-Id: Ia74638562af2ba068546cb3c994e1f7f784cf663
2022-06-29 12:20:39 -07:00
Joshua Mccloskey
06b76edbb7
Merge "Updated FP enroll confirmation string" into tm-dev am: 75313dcb5d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18801434
Change-Id: I024b04ef4f87b923ff48d09fcf88036f7b51b89c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 16:27:59 +00:00
Joshua Mccloskey
75313dcb5d
Merge "Updated FP enroll confirmation string" into tm-dev
2022-06-10 16:05:31 +00:00
TreeHugger Robot
2b662c5a07
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-06-10 06:08:45 +00:00
Bill Yi
c1ebda67c2
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3b4ba2fd47b3ab2f58a1eb962a12872f85f224f4
2022-06-09 09:49:56 -07:00
Bill Yi
5391d591c8
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ibb0a9c21fb33588f13b99a46a30dd191e28d587b
2022-06-09 09:45:40 -07:00
TreeHugger Robot
f700b7398c
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-06-09 02:39:03 +00:00
Bill Yi
d98e536863
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I650e4197e0aff594a172c01f04cffd4092b7467d
2022-06-08 14:12:47 -07:00
Bill Yi
fe71b2e76c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4111bd9a5feee6d6a8b5db7861d622ea893515e2
2022-06-08 14:08:50 -07:00
Joshua McCloskey
77452db3f9
Updated FP enroll confirmation string
...
Test: Verified correct string shows after FP enrollment.
Fixes: 234183906
Change-Id: I57e7ce836d4dc5ad2caf198aa59738f64dc4c049
2022-06-08 20:59:36 +00:00
Bill Yi
e6b9e1fdf5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3cdc674297a6f760c146bfd95190496a88309055
2022-06-07 07:29:07 -07:00
Edgar Wang
025baa318b
Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509
Change-Id: I831063be158b5097e3cc82e8d5db767676096811
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 04:40:14 +00:00
Edgar Wang
1f6334825f
Merge "Recalculate view's height when tab is selected" into tm-dev
2022-06-07 04:17:39 +00:00
TreeHugger Robot
95b4c4798d
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-06-06 18:42:20 +00:00
TreeHugger Robot
059271dcc4
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-06-06 18:42:20 +00:00
Treehugger Robot
0570287625
Merge changes I0ea498d2,I2d650eb3,I8adcf27e am: 2bec16eda0
am: 4494e0fcfe
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2115174
Change-Id: I29df0438b0286cd08ecf714585d60bf234985321
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 07:38:18 +00:00
Treehugger Robot
4494e0fcfe
Merge changes I0ea498d2,I2d650eb3,I8adcf27e am: 2bec16eda0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2115174
Change-Id: Ia42f377f4688deb033a87d7ea47e9c4194980517
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 06:52:27 +00:00
Treehugger Robot
2bec16eda0
Merge changes I0ea498d2,I2d650eb3,I8adcf27e
...
* changes:
Grey out LE audio offload switcher as LE audio isn't enabled/supported
Unify the LE audio string and refine the layout to put LE audio switch together
Add LE Audio feature switcher in the developer option menu
2022-06-06 06:37:11 +00:00
Bill Yi
88b4a11c90
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I81fb26845d241e6c415fb5e57c8a96622c01e4bc
2022-06-05 21:57:47 -07:00
Bill Yi
71660567f7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I5c968be7dc8df7de1548f9e84940619e2dfa970e
2022-06-05 21:54:11 -07:00
Bill Yi
d3dc439a10
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Idbd661c3b6a62971ef7ee40430437aac416cccdc
2022-06-04 00:58:31 -07:00
Bill Yi
71c19fea50
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-06-03 18:27:21 +00:00
Bill Yi
1217038cc5
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-06-03 18:27:21 +00:00
Alice Kuo
b13abc03dd
Unify the LE audio string and refine the layout to put LE audio switch together
...
Screenshot: https://screenshot.googleplex.com/A6PwLhscRUypgYK
Bug: 233018305
Bug: 233005340
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioPreferenceControllerTest
Test: switch LE audio feature, and check LE audio functionality status
Change-Id: I2d650eb315790c3efc7510d9e125aeaf4464cda6
2022-06-03 11:52:50 +08:00
Bill Yi
73cce5c14c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia49f737cc5715a3d46a483f5c4fd695bc72a50ea
2022-06-02 13:33:28 -07:00
Lin Yuan
246f5e231c
Merge "Fix: policy enforcement for location wifi scanning" into tm-dev am: 6ffe64a0a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670858
Change-Id: Icc131e7dd1fee70832aaf4627f806850963c70c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 20:33:20 +00:00
Bill Yi
8f7ce798e7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic884cd038873ee7aaa8468e81fb1c07408dcc251
2022-06-02 13:29:41 -07:00
Lin Yuan
6ffe64a0a9
Merge "Fix: policy enforcement for location wifi scanning" into tm-dev
2022-06-02 19:59:07 +00:00
TreeHugger Robot
2dd22a060a
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-06-02 06:41:58 +00:00
Betty Chang
d131bdfbec
Merge "[LE Audio] Broadcast Sink UI" am: e3295efcd0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2113244
Change-Id: I4d58377302a60869bce6cd4d2a70a6f61d35e752
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 04:01:11 +00:00
TreeHugger Robot
c705beea0d
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-06-01 19:23:59 +00:00
Joshua Mccloskey
3dd64a3e25
Merge "Ensure lottie animations are not empty." into tm-dev am: 14a5aded8f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18688745
Change-Id: Icd03348aae7c7f2814a4b00244016caaf8f6bbf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 18:53:17 +00:00
Joshua Mccloskey
14a5aded8f
Merge "Ensure lottie animations are not empty." into tm-dev
2022-06-01 18:02:39 +00:00
Chaohui Wang
c308cad5c4
Merge "Clean up DarkUIInfoDialogFragment" into tm-dev am: 9ada0accef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18669107
Change-Id: I2b28f1f5052b553accc273ac356bd47ea832e805
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 12:37:45 +00:00
Bill Yi
7e605531d0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I577bf242a12cc6c991af536908032b74cf248c93
2022-06-01 00:12:09 -07:00
Bill Yi
4a398405a2
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9f567279aeb9988c80aa4307da54c62823b2682b
2022-06-01 00:01:36 -07:00
changbetty
a7b89ba24b
[LE Audio] Broadcast Sink UI
...
- Add dialog for Broadcast and find broadcast source
- Add Activity for find broadcast source
Bug: 228274114
Test: Manual test
Change-Id: I830efc3514fc42aaa4e53f491ed3a7459bd9bb41
Merged-In: I830efc3514fc42aaa4e53f491ed3a7459bd9bb41
2022-06-01 06:40:07 +00:00
Joshua McCloskey
68f6089745
Ensure lottie animations are not empty.
...
Test: Verified device doesn't crash in AOSP when lottie
animations are empty.
Bug: 228284341
Change-Id: If39096b3169c4956cb7f3ec66c4df58e41c66e86
2022-06-01 01:01:12 +00:00
Lin Yuan
c877dce583
Fix: policy enforcement for location wifi scanning
...
Make DISALLOW_CONFIG_LOCATION effectively disallow wifi scanning and
bluetooth scanning settings for location services.
screenshots: http://shortn/_EUOdqrOcnS , http://shortn/_j320QDm1Zo
Bug: 228315522
Bug: 228315529
Test: atest SettingsRoboTests, on device
Change-Id: I78291579a79e915a27ebdd051b3caf3fc04efc41
(cherry picked from commit fcae147f58
)
2022-05-31 23:00:32 +00:00
Alice Kuo
0d11fd07e7
Add LE Audio feature switcher in the developer option menu
...
Add a switcher to enable/disable LE audio feature. The switcher could be
enabled by setprop ro.bluetooth.leaudio_offload.supported=true
screenshot: https://screenshot.googleplex.com/6aGP664S9PX5EMS
Bug: 233018305
Bug: 233005340
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioPreferenceControllerTest
Test: switch LE audio feature, and check LE audio functionality status
Change-Id: I8adcf27edd1438df445d32fca93f35ff5020a3b3
2022-05-31 18:11:58 +08:00
Chaohui Wang
75e4028b3e
Clean up DarkUIInfoDialogFragment
...
The usage of this dialog is removed in
Change Ie2cf147de53385ae0c626c8472306f1b85317686
But this dialog is created (but not show) in DarkUIPreferenceController
each time dark mode toggle is turned on by user.
So clean this up.
Fix: 234419979
Test: make Settings
Change-Id: Icdc9d7a4fb77dc8b2a3f1a9d8e3f40fc0af4917d
2022-05-31 17:58:05 +08:00
Zoey Chen
bd8c589390
Merge "[LeAudio] Remove the QrCamera and decorateView in Settings" am: 31011d591f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107987
Change-Id: Iee27c40089c612cd2e9ac80a4fa218d707fffd0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-31 03:57:00 +00:00