Bill Yi
26c0aadb0d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: bc051a4860
-s ours am: 11d22a70ee
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425014
Change-Id: Ie7aa002f8f76d827a30eb0516c68ef209cc15357
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 05:01:43 +00:00
TreeHugger Robot
7232cf4cc5
Merge "Fix App battery usage crash" into udc-dev am: d25bd214ae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22414534
Change-Id: I001f2e9c1dbdbf32893bfea2026947cc5e40c191
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 05:01:35 +00:00
Bill Yi
b030d1f75d
Merge changes from topic "tc_change_23040307_27" into udc-dev am: 8234ea3375
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425014
Change-Id: I2714fc8501f6d73f7bd9dde76fca7c0da0994530
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 05:00:45 +00:00
Bill Yi
fe883b6e17
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7a4e68d269
am: eea2a19c9a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425014
Change-Id: Ia11a7606f2463c21b46419abe30c4d3d461b7c1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 05:00:42 +00:00
Bill Yi
11d22a70ee
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: bc051a4860
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425014
Change-Id: I7a1c8d167c91a8b176abe094ea70b6d1d58156e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 04:56:48 +00:00
TreeHugger Robot
d25bd214ae
Merge "Fix App battery usage crash" into udc-dev
2023-04-04 04:47:31 +00:00
Bill Yi
bc051a4860
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2023-04-04 04:33:23 +00:00
Bill Yi
8234ea3375
Merge changes from topic "tc_change_23040307_27" into udc-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7a4e68d269
Import translations. DO NOT MERGE ANYWHERE
2023-04-04 04:33:23 +00:00
Bill Yi
99cd04815d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 179fdda8d3
-s ours am: 076cc4fc6c
-s ours am: 0fcfd96c98
-s ours am: bdf1c0d0ff
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425018
Change-Id: Idf25b7790691057d297e0299ed985312078b39d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 04:18:20 +00:00
Hao Dong
73067479ae
Merge "Show a dialog preventing fingerprint enrollment in split mode." into udc-dev am: 5a2ba07f63
am: 0703f48ea6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22361082
Change-Id: I8c2fecfcf2305d25ab19f3428498df9ad98aa620
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 04:06:14 +00:00
Hao Dong
682df93573
Merge "Show Class 3 consent screen in enrollment with strong face." into udc-dev am: 637ae9d983
am: 8aae584706
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22078930
Change-Id: Ia56e0688dc54abd45a8f596a50b463ebaf33a707
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 04:06:03 +00:00
Bill Yi
fe473cf724
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4c6c727262
am: 7d4a0514cf
-s ours am: d91a9e506a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425015
Change-Id: I6b9e3cfaf4c031ff4afc491a6e5f63f0978f6bef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 04:05:38 +00:00
Bill Yi
17e1717f88
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: a3af1db910
-s ours am: c7918b9ac3
-s ours am: 506a9b317d
-s ours am: e63893afe7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22393776
Change-Id: Ie2760bf635c108e6a25306c50f3d1fae1aaa386e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 03:15:27 +00:00
Bill Yi
7c12e49714
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a2f4c8bd49
-s ours am: 2309f00455
-s ours am: 7555bb81d1
-s ours am: 66ce27e9b1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22393776
Change-Id: Ia4aef91bf583942b66a8c3b818f92dac6919a409
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 03:15:18 +00:00
Bill Yi
ceaeb7d2fc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f884a037be
-s ours am: 2a19621591
-s ours am: 3c525dc4e3
-s ours am: d32bfe69d6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22393771
Change-Id: If0b9d060e06ba6bc2daf7d963594350f32bc32b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 03:14:59 +00:00
Bill Yi
ecb090ae5b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5847bd476f
-s ours am: 107129903a
-s ours am: bdd7345e26
-s ours am: ebe838839b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22393771
Change-Id: I3b11f04d31fe26e8854314acc5697869754e65be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 03:14:39 +00:00
Angela Wang
cf897c1eed
Merge "Improves Settings search result of Flash Notifications" into udc-dev am: 4fb7c76213
am: c725f550c0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323070
Change-Id: I95322b2238c7dd17147b61eb6cda4a865d983fef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 02:11:38 +00:00
Bonian Chen
482b56d66c
[automerger skipped] [Settings] Avoid from user without sufficient permission to change WiFi am: 61e6c46fa7
am: e8b96d4b25
-s ours am: 432886441f
-s ours am: 11606c8bc1
-s ours
...
am skip reason: Merged-In I4fadaf2bdc55b97419f9e6abbd3cfa63af034f6a with SHA-1 a1d3fe061e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21373178
Change-Id: Id0b5e3a32cb671e17426b622b82b4f5bcd626bec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 02:11:26 +00:00
Candice Lo
93518a816e
Merge "Announce scaled value for font scaling seekbar in Talkback" into udc-dev am: 470dbd6884
am: e0c519f15b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22347809
Change-Id: I4872ac05481fd8d6541bb98d33eacc4a3ca95e13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 02:11:14 +00:00
Chris Antol
9ee8622e0d
[automerger skipped] Merge "Enable hover states for SeekBarPreference" into udc-dev am: ca08af3ff6
am: d067d026d8
-s ours
...
am skip reason: Merged-In Ibbbd0e0ef627576acb5eb3f4acb6d40dcceb0371 with SHA-1 7bfd10736c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22361715
Change-Id: I69e77b98b0677e2c6f417d9521c5481a7ae51d49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 02:10:59 +00:00
Bill Yi
c1e4d84b70
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: cadf15af82
-s ours am: 9964fcc418
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324317
Change-Id: I5029f144d4e118b99de345c93115b7e44730dd33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 02:00:34 +00:00
Bill Yi
a7b2e90ca8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 31c51eb0d6
-s ours am: 2ef9315b35
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324317
Change-Id: I02b81bbc089bd73edc693ef398b384c0f960a152
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 02:00:29 +00:00
Bill Yi
c24f0773cf
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 126b81097a
-s ours am: c3402313e6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324315
Change-Id: Ic305cf9a6d9b6f722ff0acc08063d16c996dad33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 02:00:26 +00:00
Bill Yi
0b730431d6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 55e5d7a9c7
-s ours am: 68121e313a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324315
Change-Id: I246c1bf841bdf6e2e01add0585d411c2c1099109
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 01:59:57 +00:00
Bill Yi
9b47b3e79a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3a355835db
-s ours am: ce26a7c63a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324313
Change-Id: Id3ef5fc872f188a80b7dc52b260546cc7b6ef515
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 01:59:30 +00:00
Bill Yi
5d9eac7479
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ea4029233f
-s ours am: b434cc34ef
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324313
Change-Id: Ia8da99b621748bbfaf36096fb244b04141aa46d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 01:59:06 +00:00
TreeHugger Robot
5aae6b741c
Merge "Moves lock screen shortcuts summary loading to the background." into udc-dev am: 8ae1abecc1
am: 0afc876fdc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22260969
Change-Id: Ib125f37cc58ebecbc049af4d8b746b681b9ab633
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 01:57:18 +00:00
Jan Tomljanovic
fa3bb3bd6d
Merge "Change page title of More security & privacy settings" into udc-dev am: d082c0aa4c
am: 025333e827
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22372069
Change-Id: Ife6c213431b9ae593cc61e8e691c8d9d5ec9c20b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 01:57:05 +00:00
Yuri Ufimtsev
9bd67bdca9
Merge "Change Biometric preferences summary when not enrolled" into udc-dev am: df9c660ed6
am: 5e46e6bf92
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22372068
Change-Id: I662e5b2b572474fcd9c9c2b1120193805b3634ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 01:56:46 +00:00
Quang Luong
d6d560ff6e
Don't overwrite security params when editing saved config
...
WifiConfigController2 sets the security params of a saved config, which
may overwrite @hide fields like SecurityParams#mIsAddedByAutoUpgrade. To
prevent this, only set the security params for a new config, and use the
existing security params for existing configs.
Bug: 262312532
Test: atest WifiConfigController2Test
Change-Id: I9ef5eb8ce2b4208e1fad27bd68fc4f0fad7d1008
2023-04-04 00:55:13 +00:00
SongFerng Wang
12587b5e47
Merge "UI add more log" into udc-dev am: 378c2cf87b
am: b9b465f6bf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22371396
Change-Id: I3236e21c24eb34275be388129b4cb04010f40a78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 00:23:21 +00:00
Marcelo Arteiro
1b7576a110
Merge "Automated Token Alignment Android/Material" into udc-dev am: 0102eb84ec
am: 3b53e332a6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21989405
Change-Id: I8368866b6af111f885d73fcaf171c53e31b1907c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 00:21:34 +00:00
TreeHugger Robot
b6d3c1f379
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: d3dd46984a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425009
Change-Id: I62d8d19be69b59c24b575b5f68f24dc3e1d0f1a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-03 23:57:11 +00:00
Bill Yi
6f805154f4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 10dcb7b74a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425009
Change-Id: I7450c56e05726476e490292b59f710a92b3e215d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-03 23:57:05 +00:00
TreeHugger Robot
f7faeda213
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: f49808be95
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425005
Change-Id: I6f618564a3a262e2be3af47f8962c8a10d4d30a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-03 23:56:58 +00:00
Bill Yi
116a977af2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: baad0b1a23
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425005
Change-Id: I0e883d1597865d0ca3aa4c596a94d000df8a7fbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-03 23:56:47 +00:00
TreeHugger Robot
a8f718b412
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 86e8a12fb3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425003
Change-Id: Iae9df9ba358e4615c9c9dd3307b1d695ab25ab2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-03 23:56:20 +00:00
Bill Yi
182018c6b1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 34efab58d3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425003
Change-Id: Iec2bc8d686995f34bd3f06bf004a0cd549cf3a02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-03 23:55:50 +00:00
TreeHugger Robot
d3dd46984a
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-04-03 23:14:11 +00:00
TreeHugger Robot
f49808be95
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-04-03 23:14:11 +00:00
TreeHugger Robot
86e8a12fb3
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-04-03 23:14:11 +00:00
TreeHugger Robot
6fb1f18478
Merge "Import translations. DO NOT MERGE ANYWHERE"
2023-04-03 23:03:11 +00:00
TreeHugger Robot
9a20fccb6c
Merge "Import translations. DO NOT MERGE ANYWHERE"
2023-04-03 23:03:11 +00:00
TreeHugger Robot
13ba90011a
Merge "Import translations. DO NOT MERGE ANYWHERE"
2023-04-03 23:03:11 +00:00
Bill Yi
5038a47c89
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 179fdda8d3
-s ours am: 076cc4fc6c
-s ours am: 0fcfd96c98
-s ours am: 3342f42150
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425018
Change-Id: I5503611c1417fd4187aaf068a124e1ea81093553
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-03 22:57:14 +00:00
Hao Dong
2e31d34f69
Merge "Show a dialog preventing fingerprint enrollment in split mode." into udc-dev am: 5a2ba07f63
am: 70f4d50b2f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22361082
Change-Id: Icf2d8ff26f0c6e242271ddd494a69177b9342cda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-03 22:54:47 +00:00
Hao Dong
005f214d54
Merge "Show Class 3 consent screen in enrollment with strong face." into udc-dev am: 637ae9d983
am: fc1fe263fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22078930
Change-Id: I6a0ac3df96141e23621f5c6d3f814c6f07fafd64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-03 22:52:33 +00:00
Bill Yi
fa4e2c72af
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia388647234a08b6a569c4fb853ae6702eba75927
2023-04-03 15:43:43 -07:00
Bill Yi
3342f42150
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 179fdda8d3
-s ours am: 076cc4fc6c
-s ours am: 0fcfd96c98
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425018
Change-Id: I925f5d7970474efd23de284baa6852c2448097f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-03 22:01:54 +00:00
Hao Dong
70f4d50b2f
Merge "Show a dialog preventing fingerprint enrollment in split mode." into udc-dev am: 5a2ba07f63
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22361082
Change-Id: Icd3ea8987a10c465c48a353a9baa47316518231b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-03 22:01:33 +00:00