Commit Graph

121823 Commits

Author SHA1 Message Date
Darrell Shi
2119a2dcf9 Merge "Prevent the screen reader box from unexpected scrolling in dream setting page." into tm-qpr-dev am: 34db15a008
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517324

Change-Id: Ib3444fa954cdc2d6a4c179994f36963673b46492
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 16:13:40 +00:00
Darrell Shi
34db15a008 Merge "Prevent the screen reader box from unexpected scrolling in dream setting page." into tm-qpr-dev 2023-03-17 15:47:23 +00:00
Bill Yi
14e9cdb4fd [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 59769526e0
Blank merge reason: commit message contains skip directive

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

Change-Id: I74c650a1dc74ebe956bf01f55c33a99593a34057
2023-03-17 13:17:19 +00:00
Bill Yi
816a0bbd13 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7c58d10ebb
Blank merge reason: commit message contains skip directive

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

Change-Id: I11219ef573331fc96a958889a2b0d36699a7b869
2023-03-17 13:17:11 +00:00
Betty Chang
3f97cfd4af Merge "[LE Audio] Set activity for result after scanning the QR code" into udc-dev am: bb2c12b990 am: 07392a5407
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22097102

Change-Id: Ibade94f089c88447ad8d4dab692d20a9569b146f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 12:38:16 +00:00
Betty Chang
41813a1aef Merge "[LE Audio] Set activity for result after scanning the QR code" into udc-dev am: bb2c12b990 am: 85d94c956a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22097102

Change-Id: I1e6c50d4e9413fb220653bdbf90b202c0cfac430
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 12:31:19 +00:00
Betty Chang
07392a5407 Merge "[LE Audio] Set activity for result after scanning the QR code" into udc-dev am: bb2c12b990
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22097102

Change-Id: Id7b44d3e72f1a09134dd2f36497d5bcb7189617a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 11:57:21 +00:00
Betty Chang
85d94c956a Merge "[LE Audio] Set activity for result after scanning the QR code" into udc-dev am: bb2c12b990
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22097102

Change-Id: I60593725a54c2aaaf31bede229911aa1a9858882
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 11:56:37 +00:00
Betty Chang
bb2c12b990 Merge "[LE Audio] Set activity for result after scanning the QR code" into udc-dev 2023-03-17 11:19:50 +00:00
SongFerngWang
12066c72f9 Update OpenNetworkSelect UI at main thread
Bug: 270652395
Test: local test and atest AutoSelectPreferenceControllerTest
Change-Id: Idfc7a07106d552c35a94414bb14eac0fbdc3974f
2023-03-17 18:49:38 +08:00
Jason Hsu
eb5c9fc06c Merge "Update the exclamation icon can be announced by screen reader" into udc-dev am: fe9c359367 am: 41987d7df5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22093886

Change-Id: I4dc925fc6ffc09a30ea320c6d5f1e3163850c967
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 08:28:02 +00:00
SongFerng Wang
c2de82488b Merge "Close the dialog activity when user click cancel or background" into udc-dev am: e959be60a9 am: c9384a7b9c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22133443

Change-Id: I0c5c933104507fbf39f099bb326adb3d8f622271
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 08:27:53 +00:00
Jason Hsu
2654d8c4a1 Merge "Update the exclamation icon can be announced by screen reader" into udc-dev am: fe9c359367 am: da1515c23c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22093886

Change-Id: I89d7caf5aa34c3634c19109f9d0d33345e513ee2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 08:27:18 +00:00
SongFerng Wang
c76a578729 Merge "Close the dialog activity when user click cancel or background" into udc-dev am: e959be60a9 am: d77aee952e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22133443

Change-Id: I57c2a58c69288c520f98a1fd3a004da260766f03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 08:26:24 +00:00
Jason Hsu
41987d7df5 Merge "Update the exclamation icon can be announced by screen reader" into udc-dev am: fe9c359367
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22093886

Change-Id: I759f29261d3e9b55f63848844c2c0675e6e6a505
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 07:54:01 +00:00
Jason Hsu
da1515c23c Merge "Update the exclamation icon can be announced by screen reader" into udc-dev am: fe9c359367
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22093886

Change-Id: I4300460b93cff1da41201afd492b7f718199afe4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 07:53:56 +00:00
SongFerng Wang
c9384a7b9c Merge "Close the dialog activity when user click cancel or background" into udc-dev am: e959be60a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22133443

Change-Id: I501720108e6971f39a6cca615997ae134da7214f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 07:53:31 +00:00
SongFerng Wang
d77aee952e Merge "Close the dialog activity when user click cancel or background" into udc-dev am: e959be60a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22133443

Change-Id: I33971c5308a2a170c48b92bb976b9253ee3d31ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 07:53:19 +00:00
Jason Hsu
fe9c359367 Merge "Update the exclamation icon can be announced by screen reader" into udc-dev 2023-03-17 07:29:02 +00:00
SongFerng Wang
e959be60a9 Merge "Close the dialog activity when user click cancel or background" into udc-dev 2023-03-17 07:13:36 +00:00
changbetty
74dc069d16 [LE Audio] Set activity for result after scanning the QR code
Bug: 263554347
Bug: 265281156
Bug: 248409874
Test: manual test
Change-Id: Ia252f29ad9dfdc09266e91cc9ecaa32ed8c749c2
2023-03-17 06:02:08 +00:00
SongFerngWang
07114a6d00 Close the dialog activity when user click cancel or background
Bug: 241346100
Test: local test
Change-Id: Id9d931fc8b74ef566ffe3c6135aaf433cd9f770b
2023-03-17 12:37:29 +08:00
Bill Yi
71e954c78b Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I79c7f425dac1cd278eface63dc0c3702616bfc88
2023-03-16 20:45:10 -07:00
Bill Yi
82c23db452 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ie8640533b71ecdb1baf669edd91ed6df54df8a4d
2023-03-16 20:40:36 -07:00
Bill Yi
59769526e0 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I15422a02d7174c3cfc21c00ce39cbde8d0234c8b
2023-03-16 20:29:17 -07:00
Bill Yi
7c58d10ebb Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I9910d114216f4f3c749fa096cb37e0d843bb82fc
2023-03-16 20:23:48 -07:00
Bill Yi
6a2956d8f6 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Id5f1e2b04c372627f2fde37fc8139bf1a6bc3068
2023-03-16 16:53:20 -07:00
Bill Yi
2dbe4ce5e3 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I848d29310bf900377aaf9d557a7e0cfdb063a700
2023-03-16 16:35:27 -07:00
Bill Yi
62b0143cf5 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib1e2d8288425103c66d8d73f05e6755894a94f93
2023-03-16 16:30:34 -07:00
Menghan Li
bf41cd4505 [automerger skipped] Merge "Update color-check-baseline.xml" into tm-qpr-dev am: 1306ebf737 -s ours am: 2600b1bbc2 -s ours am: 813f654aa1 -s ours am: 771028e76b -s ours
am skip reason: Merged-In Ife355166df080ce7371a95b5cea28575227153f0 with SHA-1 f952e89d4b is already in history

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

Change-Id: Ic3840f78f5cce8939e6c3d44ebe85af5671da3a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 22:52:58 +00:00
menghanli
28ca0ee836 [automerger skipped] Update color-check-baseline.xml am: 796fcccd9b -s ours am: 6f478f1a6b -s ours am: dba1c83ed4 -s ours am: 1ef86aaa54 -s ours
am skip reason: Merged-In Ife355166df080ce7371a95b5cea28575227153f0 with SHA-1 f952e89d4b is already in history

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

Change-Id: I2d7afa711558b6ef268864ff1a44e43724273946
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 22:52:53 +00:00
Menghan Li
840c9d3cce [automerger skipped] Merge "Update color-check-baseline.xml" into tm-qpr-dev am: 1306ebf737 -s ours am: 2600b1bbc2 -s ours am: 813f654aa1 -s ours am: 8b8d20e8d5 -s ours
am skip reason: Merged-In Ife355166df080ce7371a95b5cea28575227153f0 with SHA-1 f952e89d4b is already in history

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

Change-Id: Ifffbbfc104f27817549338d80ad067784e583678
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 22:50:54 +00:00
menghanli
452a7678cc [automerger skipped] Update color-check-baseline.xml am: 796fcccd9b -s ours am: 6f478f1a6b -s ours am: dba1c83ed4 -s ours am: 1d5f0f3f97 -s ours
am skip reason: Merged-In Ife355166df080ce7371a95b5cea28575227153f0 with SHA-1 f952e89d4b is already in history

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

Change-Id: Ie857df8e3127479d26c10c989fbb3c2265b503cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 22:50:50 +00:00
Menghan Li
8b8d20e8d5 [automerger skipped] Merge "Update color-check-baseline.xml" into tm-qpr-dev am: 1306ebf737 -s ours am: 2600b1bbc2 -s ours am: 813f654aa1 -s ours
am skip reason: Merged-In Ife355166df080ce7371a95b5cea28575227153f0 with SHA-1 f952e89d4b is already in history

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

Change-Id: I3fe4acd8ef00a78e81c779eb858177f5557cc574
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 22:17:52 +00:00
menghanli
1d5f0f3f97 [automerger skipped] Update color-check-baseline.xml am: 796fcccd9b -s ours am: 6f478f1a6b -s ours am: dba1c83ed4 -s ours
am skip reason: Merged-In Ife355166df080ce7371a95b5cea28575227153f0 with SHA-1 f952e89d4b is already in history

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

Change-Id: If522ebe6ba5eb52beb19df64686493522793d00a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 22:17:50 +00:00
Menghan Li
771028e76b [automerger skipped] Merge "Update color-check-baseline.xml" into tm-qpr-dev am: 1306ebf737 -s ours am: 2600b1bbc2 -s ours am: 813f654aa1 -s ours
am skip reason: Merged-In Ife355166df080ce7371a95b5cea28575227153f0 with SHA-1 f952e89d4b is already in history

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

Change-Id: Idd37efaf1da85d58f584f8e7d0f20bcac969e4b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 22:17:16 +00:00
menghanli
1ef86aaa54 [automerger skipped] Update color-check-baseline.xml am: 796fcccd9b -s ours am: 6f478f1a6b -s ours am: dba1c83ed4 -s ours
am skip reason: Merged-In Ife355166df080ce7371a95b5cea28575227153f0 with SHA-1 f952e89d4b is already in history

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

Change-Id: Ieb3f4673e8229e4ecc58c2288a2e832d317dd608
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 22:16:54 +00:00
Menghan Li
813f654aa1 [automerger skipped] Merge "Update color-check-baseline.xml" into tm-qpr-dev am: 1306ebf737 -s ours am: 2600b1bbc2 -s ours
am skip reason: Merged-In Ife355166df080ce7371a95b5cea28575227153f0 with SHA-1 f952e89d4b is already in history

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

Change-Id: Id167b7cda9295904f5f8aa173bacaeb7175a9b5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 21:37:43 +00:00
menghanli
dba1c83ed4 [automerger skipped] Update color-check-baseline.xml am: 796fcccd9b -s ours am: 6f478f1a6b -s ours
am skip reason: Merged-In Ife355166df080ce7371a95b5cea28575227153f0 with SHA-1 f952e89d4b is already in history

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

Change-Id: I3059f4c5bb13108c00abfe3844e45739312ba155
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 21:37:36 +00:00
Michael Groover
1a3e4e7e35 Merge "Make CheckReturnValue errorprone check a warning for unit tests" into udc-dev am: 8458e7f630 am: da1856f5b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22121970

Change-Id: I6d664992005e028c70e7933ee21904d85191b1b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 21:18:43 +00:00
Michael Groover
0aa08f54f1 Merge "Make CheckReturnValue errorprone check a warning for unit tests" into udc-dev am: 8458e7f630 am: 4dc0e53808
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22121970

Change-Id: I9ac105df1154f75d3ec2e3fb5521eeb6335edbde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 21:01:56 +00:00
Kweku Adams
536c0b237f Merge "Revert "Remove duplicate strings."" into udc-dev am: 9a087d6c19 am: 45ae15f19c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22106646

Change-Id: Ifc93c03f8033a508a820e25d8c2dd7ba60860939
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 21:00:07 +00:00
Michael Groover
4dc0e53808 Merge "Make CheckReturnValue errorprone check a warning for unit tests" into udc-dev am: 8458e7f630
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22121970

Change-Id: I83ca3dc101ad8863e32f10b0a9961505d6dfa82e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 20:59:59 +00:00
Menghan Li
2600b1bbc2 [automerger skipped] Merge "Update color-check-baseline.xml" into tm-qpr-dev am: 1306ebf737 -s ours
am skip reason: Merged-In Ife355166df080ce7371a95b5cea28575227153f0 with SHA-1 f952e89d4b is already in history

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

Change-Id: I204ee5dc7a8861b51d06420c6bb1d4ff7b216c9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 20:59:03 +00:00
menghanli
6f478f1a6b [automerger skipped] Update color-check-baseline.xml am: 796fcccd9b -s ours
am skip reason: Merged-In Ife355166df080ce7371a95b5cea28575227153f0 with SHA-1 f952e89d4b is already in history

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

Change-Id: I6a67de10b42d08b3786b01928377d020c8513630
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 20:58:48 +00:00
Michael Groover
da1856f5b1 Merge "Make CheckReturnValue errorprone check a warning for unit tests" into udc-dev am: 8458e7f630
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22121970

Change-Id: Iea42035f8a83fe8b6ff3d22965c08c17ec50631c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 20:58:39 +00:00
Julia Reynolds
b592601d9f Merge "Remove explicit number from string" into udc-dev am: fe310a86de am: bf920a9e6b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22121609

Change-Id: I26ca2fede77748a1cfb34666eba7f65dff607073
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 20:56:14 +00:00
Kweku Adams
7c82ea06a2 Merge "Revert "Remove duplicate strings."" into udc-dev am: 9a087d6c19 am: eaba347a70
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22106646

Change-Id: I903e6289111448ffe71856b1830b914823ff1953
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 20:45:56 +00:00
Michael Groover
8458e7f630 Merge "Make CheckReturnValue errorprone check a warning for unit tests" into udc-dev 2023-03-16 20:41:12 +00:00
Julia Reynolds
f98a5d8fb6 Merge "Remove explicit number from string" into udc-dev am: fe310a86de am: 91ef0f1ee4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22121609

Change-Id: Iec0ebc4d6e02029800c0009778e9e7f8cf3f2306
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 20:40:26 +00:00