PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
130,193 Commits 1 Branch 0 Tags
d29b650a85132b1658b179007d2f774aea93b90c
Commit Graph

130193 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Hsu
d29b650a85 Merge "Change the summary string to exclude 'Audio output' feature" into udc-dev am: fecfa96723 am: 9a4eb33abd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557965

Change-Id: Ifd54ee359c929a2caefab45cb588947c21c94821
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 04:50:18 +00:00
Jason Hsu
9a4eb33abd Merge "Change the summary string to exclude 'Audio output' feature" into udc-dev am: fecfa96723 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557965

Change-Id: Ia4ab1ba53c07c21b00ad6e64d57399f78ed3184e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 04:19:29 +00:00
Jason Hsu
fecfa96723 Merge "Change the summary string to exclude 'Audio output' feature" into udc-dev 2023-06-12 03:54:11 +00:00
Avinash Vadlamudi
0592598494 [Auto Pin Confirmation]: Add talkback capability for Auto-confirm correct PIN checkbox even if it is not in focus am: 01637b556e am: 812ca56cfc am: 9502bd9690 am: 50f8a0c5de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601571

Change-Id: Iba4a6691c0165f12c7c593f3f5f9708c6014c34a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-10 04:13:30 +00:00
Avinash Vadlamudi
f567dc4d5b [Auto Pin Confirmation]: Add talkback capability for Auto-confirm correct PIN checkbox even if it is not in focus am: 01637b556e am: 90d3d346e6 am: d581a5d1fb am: f18d6d4f67 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601571

Change-Id: I44d8a3bad47956658340ac73d4b306b815ae3b3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-10 04:13:22 +00:00
Avinash Vadlamudi
abc41961f9 [Auto Pin Confirmation]: Add talkback capability for Auto-confirm correct PIN checkbox even if it is not in focus am: 01637b556e am: 812ca56cfc am: e01f430341 am: 6793da2403 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601571

Change-Id: Ided86ce67dfe0367f576c743aea319fa0f547b39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-10 04:12:20 +00:00
Avinash Vadlamudi
79b6b22946 [Auto Pin Confirmation]: Add talkback capability for Auto-confirm correct PIN checkbox even if it is not in focus am: 01637b556e am: ed07a60d40 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601571

Change-Id: Ida030b17e83a55a784bc7aeb937de10a6e12fa4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-10 03:49:12 +00:00
Fabian Kozynski
001f02bd65 Merge "Fix typo in product string" into udc-dev am: d3df7f5090 am: 0b2a060708 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23600032

Change-Id: Ic60f6da21b560646fbcc61ebb0ccd8100a9cd084
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-10 03:47:30 +00:00
Mady Mellor
8ffb399d5a Merge "Update the colors for bubbles settings based on new spec" into udc-dev am: 57406435cf am: e31798fc60 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23622468

Change-Id: I5de9ee0aa555a87f98977663bd85f21395b35523
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-10 03:31:21 +00:00
Avinash Vadlamudi
50f8a0c5de [Auto Pin Confirmation]: Add talkback capability for Auto-confirm correct PIN checkbox even if it is not in focus am: 01637b556e am: 812ca56cfc am: 9502bd9690 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601571

Change-Id: I8c9c4a7983a167b13a98e61e7a22b129cf3656a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-10 03:30:52 +00:00
Oli Thompson
52cec87875 Merge "Fix emergency button not visible on pattern work challenge screen" into udc-dev am: 01b382546e am: b6ee871b16 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23631338

Change-Id: I397724dbca10d56e336f7552031d6677c7f6bd29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-10 03:26:51 +00:00
Avinash Vadlamudi
f18d6d4f67 [Auto Pin Confirmation]: Add talkback capability for Auto-confirm correct PIN checkbox even if it is not in focus am: 01637b556e am: 90d3d346e6 am: d581a5d1fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601571

Change-Id: I12f2407233c338ce05002fececd3e34005cbb922
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-10 03:25:39 +00:00
Avinash Vadlamudi
6793da2403 [Auto Pin Confirmation]: Add talkback capability for Auto-confirm correct PIN checkbox even if it is not in focus am: 01637b556e am: 812ca56cfc am: e01f430341 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601571

Change-Id: Ia1f45b68d6223cab06930e15fc05c3cba6ca8950
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-10 03:25:24 +00:00
Mady Mellor
1820bec766 Merge "Fix colors in bubble settings so they're more visible" into udc-dev am: 8a47899369 am: 5ab24ad404 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23607273

Change-Id: Ice97dc1f82fefe37643063c5d4b4fb02a2dce39b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-10 03:07:19 +00:00
Treehugger Robot
6939649fa7 Merge "Fix low contrast on work challenge screen emergency call button" into udc-dev am: a34a510a40 am: 78b1a8f233 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601981

Change-Id: I13ad4b243b2ffcd5bb3b58471fb38a71627d8af5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-10 03:03:32 +00:00
Avinash Vadlamudi
d581a5d1fb [Auto Pin Confirmation]: Add talkback capability for Auto-confirm correct PIN checkbox even if it is not in focus am: 01637b556e am: 90d3d346e6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601571

Change-Id: Ic155f854ae8a1136e037cd65c52b6bd6e0c35d7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-10 02:45:20 +00:00
Avinash Vadlamudi
9502bd9690 [Auto Pin Confirmation]: Add talkback capability for Auto-confirm correct PIN checkbox even if it is not in focus am: 01637b556e am: 812ca56cfc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601571

Change-Id: I1001a1811c14a4d8002488a8051ae207a6f5477d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-10 02:44:25 +00:00
Aleksandar Kiridžić
1cafb6b304 Merge "speech: On-device recognition settings profile selector" into udc-dev am: b5b15a6689 am: 09a10f99f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517421

Change-Id: Ife631266f662a941454e7771c52af361c9a3b92a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-10 02:41:19 +00:00
Avinash Vadlamudi
c4c85c8d89 [Auto Pin Confirmation]: Add talkback capability for Auto-confirm correct PIN checkbox even if it is not in focus am: 01637b556e am: 3730239bd7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601571

Change-Id: I27b0bebd69fe6bdf344f434bae90b655540417ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-10 02:40:55 +00:00
Avinash Vadlamudi
e01f430341 [Auto Pin Confirmation]: Add talkback capability for Auto-confirm correct PIN checkbox even if it is not in focus am: 01637b556e am: 812ca56cfc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601571

Change-Id: I19b29b1a66e7824ee0635630b767667958aebe68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-10 02:40:52 +00:00
Avinash Vadlamudi
3730239bd7 [Auto Pin Confirmation]: Add talkback capability for Auto-confirm correct PIN checkbox even if it is not in focus am: 01637b556e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601571

Change-Id: I72e847af6480cc3787e4ae1c8777656800ab4dae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-10 02:03:03 +00:00
Avinash Vadlamudi
812ca56cfc [Auto Pin Confirmation]: Add talkback capability for Auto-confirm correct PIN checkbox even if it is not in focus am: 01637b556e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601571

Change-Id: Ib3b5ae9d55f47da3f9a7e5734bd8f6a55ae267f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-10 02:02:34 +00:00
Avinash Vadlamudi
ed07a60d40 [Auto Pin Confirmation]: Add talkback capability for Auto-confirm correct PIN checkbox even if it is not in focus am: 01637b556e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601571

Change-Id: I9c6e95cbce1adc4361bfbff3d1e82895e8804331
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-10 02:02:20 +00:00
Avinash Vadlamudi
90d3d346e6 [Auto Pin Confirmation]: Add talkback capability for Auto-confirm correct PIN checkbox even if it is not in focus am: 01637b556e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601571

Change-Id: I58b483720e2a7ed6ed5d92094192fe2b7a5f3df6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-10 01:58:13 +00:00
TreeHugger Robot
15789bbdca Merge "[Settings] Fix crash when user enter bluetooth page quickly." into udc-dev am: 3e374cc7a7 am: d23d398c91 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601556

Change-Id: I4cfec0c4aefd00145fab634ef5cc7544dc9e793c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-10 01:43:23 +00:00
Avinash Vadlamudi
01637b556e [Auto Pin Confirmation]: Add talkback capability for Auto-confirm correct PIN checkbox even if it is not in focus 
- set accessibilityLiveRegion as Polite mode to allow talkback to announce the state of checkbox even if is not in focus

Bug: 281950677
Test: Manual test by flashing on device and checking in talkback mode
Change-Id: Ia1066e2df1f40e6c339a4cd63f92acf0858f8f3d
 2023-06-10 01:25:18 +00:00
George Chang
8b871ecc2a Merge "Correct typo in the launch via NFC bottom string" into udc-dev am: 832e0b015e am: 320068c8ba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23584036

Change-Id: I8764b80b46558217472de3219b28d7b3ca496d81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-10 00:53:50 +00:00
Ale Nijamkin
b200f28709 Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd am: 46f5cbdeec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573917

Change-Id: I19f482fad512eba0c9d40ab1895e1265efd8c5ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 23:04:42 +00:00
Fabian Kozynski
cbd5029ced Merge "Fix typo in product string" into udc-dev am: d3df7f5090 am: b7d25fdf3f am: 2e9e7dc954 am: 28e8a2693a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23600032

Change-Id: I4fe774a8f1c8c4d5df630cb5ab4e4ec61020af04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 20:54:45 +00:00
Fabian Kozynski
c112f6fa11 Merge "Fix typo in product string" into udc-dev am: d3df7f5090 am: 9bbac9f715 am: 4fe137bb53 am: d48a0307c7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23600032

Change-Id: I43640bacbc73ad5a526ea4a5f0230bc3026c13b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 20:54:10 +00:00
Fabian Kozynski
58862215c1 Merge "Fix typo in product string" into udc-dev am: d3df7f5090 am: b7d25fdf3f am: 6812734387 am: 215c9e6b42 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23600032

Change-Id: I3d96d19cb0c22a991a662e9f0bd4df59f1d4b7d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 20:52:18 +00:00
Fabian Kozynski
28e8a2693a Merge "Fix typo in product string" into udc-dev am: d3df7f5090 am: b7d25fdf3f am: 2e9e7dc954 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23600032

Change-Id: I3332b3274ba70711a1f93142e346ba389a894ec6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 20:07:15 +00:00
Fabian Kozynski
d48a0307c7 Merge "Fix typo in product string" into udc-dev am: d3df7f5090 am: 9bbac9f715 am: 4fe137bb53 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23600032

Change-Id: I2b0a3b68e57a094756b8532b2daba00abae0a8bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 20:04:30 +00:00
Fabian Kozynski
215c9e6b42 Merge "Fix typo in product string" into udc-dev am: d3df7f5090 am: b7d25fdf3f am: 6812734387 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23600032

Change-Id: I15bcc9c68a2cb73507e0960cfe09a736b04fc0e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 20:03:17 +00:00
Treehugger Robot
9ac11151e9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f996cfceba -s ours am: 059773bd86 -s ours am: fce013b4c4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6fa8fce364b0a3970a644bf599ff2763f1fe9baf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 19:42:14 +00:00
Bill Yi
777bf3b817 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 506e105fdb -s ours am: 284d320abb -s ours am: 6bec5e04ab -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9789f79bab68f87b037e802f6423683b92841aee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 19:42:09 +00:00
Fabian Kozynski
4fe137bb53 Merge "Fix typo in product string" into udc-dev am: d3df7f5090 am: 9bbac9f715 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23600032

Change-Id: I086cb765e7be36ca87770422dc7c16eb984e48ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 19:18:24 +00:00
Fabian Kozynski
2e9e7dc954 Merge "Fix typo in product string" into udc-dev am: d3df7f5090 am: b7d25fdf3f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23600032

Change-Id: I1beb1480af4da0d8198234b54876dd4f2c2db8f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 19:18:01 +00:00
Automerger Merge Worker
a1b2103c4a Merge changes from topic "am-48006da27498425ca097ed9afc18c015" 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ba4dc8f0bc -s ours am: c1c4d6c954 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ea2e6b3670 -s ours am: a88a0effa1 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d8d85a8485 -s ours am: d7fd44696f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7d99401b8e -s ours am: 032bd77d1f -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8c296cdd64 -s ours am: 978d527579 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d152c7b1bf -s ours am: b04612043e -s ours
 2023-06-09 19:17:20 +00:00
Fabian Kozynski
b7b737386d Merge "Fix typo in product string" into udc-dev am: d3df7f5090 am: 01f7d38e8a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23600032

Change-Id: I0ca34a84b8b2def9338eda1293e3552fc7b53ad7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 19:16:35 +00:00
Fabian Kozynski
6812734387 Merge "Fix typo in product string" into udc-dev am: d3df7f5090 am: b7d25fdf3f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23600032

Change-Id: Ia06abaf07d312a9526320469c699159fa1c4c0dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 19:16:13 +00:00
Treehugger Robot
a0fc9a612c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ba4dc8f0bc -s ours am: c1c4d6c954 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9a1efc1ad0f7832f296d7df207eed9e0e88c6bc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 19:13:54 +00:00
Bill Yi
536de8050b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ea2e6b3670 -s ours am: a88a0effa1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iab7c89a96b64715a31ef96d1dc8ff4140654d270
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 19:13:51 +00:00
Treehugger Robot
388ffe3934 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d8d85a8485 -s ours am: d7fd44696f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id1b0022c5e48113582edba089d7f9c837575bf20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 19:13:49 +00:00
Bill Yi
6c21f03a22 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7d99401b8e -s ours am: 032bd77d1f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If0d2a5350f4fc0d1bd7a7483b8ea9e4acb28050e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 19:13:42 +00:00
Treehugger Robot
e9f539edd4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8c296cdd64 -s ours am: 978d527579 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id8ba9c135c3b24d3cab76aa72807e8eab811fe6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 19:13:40 +00:00
Bill Yi
018eb51dbd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d152c7b1bf -s ours am: b04612043e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia9f3d41397017959b9ef6c3fb5ae89653b68106f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 19:13:01 +00:00
Fabian Kozynski
9bbac9f715 Merge "Fix typo in product string" into udc-dev am: d3df7f5090 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23600032

Change-Id: I18c217922a8725f376f02e9f6d07d10de3cac891
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 18:32:29 +00:00
Treehugger Robot
474061efcf Merge "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev am: 185244f43d am: 53d4f7899d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467968

Change-Id: I69ccef5c2482271aecc0d3fa1b34643779412e8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 18:31:45 +00:00
Fabian Kozynski
b7d25fdf3f Merge "Fix typo in product string" into udc-dev am: d3df7f5090 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23600032

Change-Id: I6ba750177b5016d18408d33e7d95712e936050b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 18:31:12 +00:00