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

130161 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Fabian Kozynski
01f7d38e8a 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: I6bda0911ef32a2262bacaee387e0e6d91104e56f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 18:30:41 +00:00
TreeHugger Robot
8c71335c76 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 719a4c645f -s ours am: 8f5a0bc281 -s ours am: 8c1f73fa64 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4e9e61e7279e180ffcd1a2f63c33e7b209ada556
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 18:22:33 +00:00
Bill Yi
6c963a22b6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b80d56cfc0 -s ours am: a18807d9ca -s ours am: 012fe175c0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id43e92ef44f0c79b2ebad6ef45889f0e0c128b60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 18:22:29 +00:00
Mady Mellor
e20dd783b6 Merge "Update the colors for bubbles settings based on new spec" into udc-dev am: 57406435cf am: 0399987aa1 am: 50cacfcc1e am: aaaff5d10b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23622468

Change-Id: I1106041e3d0fb2f5018c74405122ece19d630263
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 18:20:07 +00:00
Oli Thompson
a23373fcbd Merge "Fix emergency button not visible on pattern work challenge screen" into udc-dev am: 01b382546e am: e86146d685 am: f35b1be8ac am: f06564cad0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23631338

Change-Id: I1325593d422fcb525dfa3a5dc96fa82309a9753d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 18:18:13 +00:00
Mady Mellor
17809cfce9 Merge "Update the colors for bubbles settings based on new spec" into udc-dev am: 57406435cf am: 9db4671279 am: 196d91218e am: 8df5d27350 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23622468

Change-Id: I8160238ef70fcedd66991dcfb7d6832194e56ef7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 18:17:45 +00:00
Oli Thompson
8d1f6c11da Merge "Fix emergency button not visible on pattern work challenge screen" into udc-dev am: 01b382546e am: 86f36a032f am: 5435412488 am: 0577ca8dde 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23631338

Change-Id: I44f038f6e2ef17313b3eef85fef8f55dc6422b80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 18:16:11 +00:00
Bill Yi
c786aff029 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe27600237 -s ours am: aeacaaee64 -s ours am: 149607d2b7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic1fca41eb2a83d828b4d53bbee42d43ff50df81c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 18:14:26 +00:00
Mady Mellor
05e8cdb009 Merge "Update the colors for bubbles settings based on new spec" into udc-dev am: 57406435cf am: 0399987aa1 am: f55de6cdd1 am: 0be0c80a7c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23622468

Change-Id: I3ac67d3e911875bc049aaca5b70dd7cc4fdacbc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 18:14:20 +00:00
Oli Thompson
8dd9f78d1a Merge "Fix emergency button not visible on pattern work challenge screen" into udc-dev am: 01b382546e am: e86146d685 am: ca697c000a am: 1a883223d2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23631338

Change-Id: I66013972ab62e4eef4b592b2a65844f89ecd6c31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 18:12:10 +00:00
Mady Mellor
aaaff5d10b Merge "Update the colors for bubbles settings based on new spec" into udc-dev am: 57406435cf am: 0399987aa1 am: 50cacfcc1e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23622468

Change-Id: I97a260701f3c88fab3888c5428bb68064024339d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 17:49:20 +00:00
Oli Thompson
f06564cad0 Merge "Fix emergency button not visible on pattern work challenge screen" into udc-dev am: 01b382546e am: e86146d685 am: f35b1be8ac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23631338

Change-Id: Id79a0aeecc9e53185ebf60e0fc27439031f20204
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 17:48:50 +00:00
Fabian Kozynski
d3df7f5090 Merge "Fix typo in product string" into udc-dev 2023-06-09 17:44:36 +00:00
Mady Mellor
8df5d27350 Merge "Update the colors for bubbles settings based on new spec" into udc-dev am: 57406435cf am: 9db4671279 am: 196d91218e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23622468

Change-Id: I57bb026463eda2764ba9a3cfc92fbbcda95bf4a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 17:44:24 +00:00
Oli Thompson
0577ca8dde Merge "Fix emergency button not visible on pattern work challenge screen" into udc-dev am: 01b382546e am: 86f36a032f am: 5435412488 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23631338

Change-Id: Ica70115a1faf2cacb29d9f44f427d31b30e562be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 17:44:08 +00:00
Mady Mellor
0be0c80a7c Merge "Update the colors for bubbles settings based on new spec" into udc-dev am: 57406435cf am: 0399987aa1 am: f55de6cdd1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23622468

Change-Id: I522e268341ca3b7bab8cab7be5ca736ebaeb3c18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 17:43:43 +00:00
Oli Thompson
1a883223d2 Merge "Fix emergency button not visible on pattern work challenge screen" into udc-dev am: 01b382546e am: e86146d685 am: ca697c000a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23631338

Change-Id: Ic85a04f5844fe373393a0811e07f553f83722827
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 17:42:40 +00:00
Mady Mellor
196d91218e Merge "Update the colors for bubbles settings based on new spec" into udc-dev am: 57406435cf am: 9db4671279 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23622468

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

Change-Id: I04aa1bd70bcec3e1ed275dc27eff3c58a9c51c6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 17:03:21 +00:00
Mady Mellor
50cacfcc1e Merge "Update the colors for bubbles settings based on new spec" into udc-dev am: 57406435cf am: 0399987aa1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23622468

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

Change-Id: I82b44ce36153a64d37629f40dc8c7805c17847a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 17:02:43 +00:00
Mady Mellor
ebfa483008 Merge "Update the colors for bubbles settings based on new spec" into udc-dev am: 57406435cf am: d219333161 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23622468

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

Change-Id: I8f3631be2dc924fe8cf61278ccc6c2b9547c1629
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 16:59:57 +00:00
Mady Mellor
f55de6cdd1 Merge "Update the colors for bubbles settings based on new spec" into udc-dev am: 57406435cf am: 0399987aa1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23622468

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

Change-Id: Ifcde9f0a8fc75fc01909771df880f2b6ee70dab9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 16:58:49 +00:00