Treehugger Robot
d86ec6652a
Merge "Correct used size of Storage Settings." into udc-d1-dev
2023-07-26 01:47:59 +00:00
Weng Su
78de3a6d03
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 6afcad7626
-s ours am: 2aa573fbd1
-s ours am: 80de015a39
-s ours am: 29c6c35f9c
-s ours am: 513e07f285
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24018267
Change-Id: I77af34c8fb0238c41abffb0ede7bb0a589569bf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 00:55:04 +00:00
Weng Su
fecc2f5b05
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 6afcad7626
-s ours am: 2aa573fbd1
-s ours am: d091c49a5b
-s ours am: d7d57a81dd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24018267
Change-Id: I3c059234701d4a078ce16541005fd60cb246f0fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 00:54:13 +00:00
Weng Su
513e07f285
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 6afcad7626
-s ours am: 2aa573fbd1
-s ours am: 80de015a39
-s ours am: 29c6c35f9c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24018267
Change-Id: I06ad174c8441679c53b94420a1682f27e8aa454f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 00:31:47 +00:00
Weng Su
d7d57a81dd
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 6afcad7626
-s ours am: 2aa573fbd1
-s ours am: d091c49a5b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24018267
Change-Id: I9b3588da224b22bc4ad95fd29420286a9a31155b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 23:49:37 +00:00
Weng Su
29c6c35f9c
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 6afcad7626
-s ours am: 2aa573fbd1
-s ours am: 80de015a39
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24018267
Change-Id: I8c1a4703d8695a27142c0410d52ce39d61ce0a10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 23:43:13 +00:00
Weng Su
e1d57b1b25
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: ef2fd5b7cd
-s ours am: ae5606811f
-s ours am: d487a5f38d
-s ours am: ff24b1049d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982016
Change-Id: Ib8d1c81619a411702fc292d725aae5866252a0d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 22:55:51 +00:00
Weng Su
80de015a39
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 6afcad7626
-s ours am: 2aa573fbd1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24018267
Change-Id: I31bd3642eebb68a371bf56646f497ff05f58b3a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 22:35:12 +00:00
Weng Su
ff24b1049d
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: ef2fd5b7cd
-s ours am: ae5606811f
-s ours am: d487a5f38d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982016
Change-Id: I43243fb24399603dbb0c3a2059eb818d040feae0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 22:33:09 +00:00
Weng Su
d091c49a5b
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 6afcad7626
-s ours am: 2aa573fbd1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24018267
Change-Id: If458e770efd95aa86a030864d6fb12bba88a6447
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 22:33:08 +00:00
Weng Su
f0736c4a01
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: ef2fd5b7cd
am: 995a7a4b71
-s ours am: 464f9e07c8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982016
Change-Id: I19d3227710d27672eab5c6c616f1a20491f28753
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 22:31:58 +00:00
Weng Su
464f9e07c8
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: ef2fd5b7cd
am: 995a7a4b71
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982016
Change-Id: I3093550d3785532c19daeb1cff3e4b46cc048b95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 21:50:46 +00:00
Weng Su
2aa573fbd1
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 6afcad7626
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24018267
Change-Id: I4454cf3c8cb00f2aa046123debde13d472b6fba7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 21:48:02 +00:00
Weng Su
d487a5f38d
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: ef2fd5b7cd
-s ours am: ae5606811f
-s ours
...
am skip reason: Merged-In I5cf984000244b4ad901c6a4977a1368279323e0a with SHA-1 8c6c1ca236
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982016
Change-Id: I1f3a68c7b237832351a3b87a704a1095340fa9d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 21:44:20 +00:00
Weng Su
ae5606811f
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: ef2fd5b7cd
-s ours
...
am skip reason: Merged-In I5cf984000244b4ad901c6a4977a1368279323e0a with SHA-1 8c6c1ca236
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982016
Change-Id: Ie6719f8ad85070e094ab685d16c65579cbc006b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 21:02:22 +00:00
Treehugger Robot
1ad564b9b9
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Restrict ApnEditor settings" into tm-qpr-dev am: a88e1b6c73
-s ours am: a364f6475a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025006
Change-Id: Ia54e445885861ee810783414d67cf33074212339
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 21:00:40 +00:00
Weng Su
5bc1b45a85
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: bd5e3c0c05
-s ours am: 82c89c8ef7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025006
Change-Id: I215f6bc431796c15ab3a71aed5d9894ea6050f34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 21:00:38 +00:00
Weng Su
995a7a4b71
[RESTRICT AUTOMERGE] Restrict ApnEditor settings am: ef2fd5b7cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982016
Change-Id: I6730a2d19a398f2ae6fe585c617d9713205139a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 21:00:19 +00:00
Treehugger Robot
57b00e28ea
Merge "Restrict ApnEditor settings" into udc-dev am: 64c88a192a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982512
Change-Id: Ic052e568818d4829fe40250e00679742fc816263
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 20:59:46 +00:00
Treehugger Robot
a364f6475a
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Restrict ApnEditor settings" into tm-qpr-dev am: a88e1b6c73
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025006
Change-Id: I657080d670e7149418757a7311b339d0d104863f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 20:35:29 +00:00
Weng Su
82c89c8ef7
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: bd5e3c0c05
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025006
Change-Id: Ic98d995f5949fd3cd19d5193afd17bb67f68d579
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 20:35:23 +00:00
Treehugger Robot
64c88a192a
Merge "Restrict ApnEditor settings" into udc-dev
2023-07-25 20:09:39 +00:00
Treehugger Robot
a88e1b6c73
Merge "[RESTRICT AUTOMERGE] Restrict ApnEditor settings" into tm-qpr-dev
2023-07-25 19:48:14 +00:00
Treehugger Robot
1a073f4f6c
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-07-24 19:18:34 +00:00
Bill Yi
0b179a9a1c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If5cf9ebde62e0be58cacf65575d45f79c5cc1a79
2023-07-24 09:23:04 -07:00
Bill Yi
47855826c7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1927131129b72df309406cf5dfe3a37b7d94e71c
2023-07-24 09:20:40 -07:00
Treehugger Robot
90d628186c
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-07-22 01:35:20 +00:00
Treehugger Robot
22e1df0c7e
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-07-22 01:35:20 +00:00
Treehugger Robot
d52951de52
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-07-22 01:35:20 +00:00
Wenhui Yang
c6c9d74f06
Update learn more string for udfps fp settings
...
Update the learn more message for udfps fingerprint unlock to make it
consistent with sdfps.
Fixes: 289167628
Test: manual (see bug)
Change-Id: Iac6edb1c176dab462c91e1bf6236dfe4d0988693
2023-07-21 02:36:24 +00:00
Bill Yi
2819e72250
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I24da05f824c241f76981357b5468d082899e1de7
2023-07-20 15:00:17 -07:00
Bill Yi
f9caafcc39
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I91e1b33c246709f423cb28de5c3924b66eafb843
2023-07-20 14:58:39 -07:00
Bill Yi
60714bfa6f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I55987bdb3e12aebb2cca8e928454c4411e92cc1d
2023-07-20 14:56:49 -07:00
Ken Lin
a6f2464e8c
Merge "Settings crashed when changing the Screen Resolution" into udc-d1-dev
2023-07-19 03:58:47 +00:00
Bill Yi
1832da3618
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic74eb981990ec4d4855818cf41b6ce2da99311dc
2023-07-18 14:41:23 -07:00
Ken Lin
c655c82ada
Settings crashed when changing the Screen Resolution
...
Check if index is out of bound
Bug: 288256336
Test: Change to Full resolution, set Smallest width to 426 dp, then
switch to High resolution
Test: atest ScreenResolutionFragmentTest
Change-Id: Ida4128e76e097050b01deae91c9d669e58ab9e8f
2023-07-18 02:30:09 +00:00
Bill Yi
1e86da303c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d999ce533
-s ours am: 9785c80168
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24068200
Change-Id: I0890d4e15c37c5f22cfe1a5c72bfa46d1e6512d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 19:57:10 +00:00
Bill Yi
80172630a4
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-07-14 19:56:04 +00:00
Bill Yi
0cc5a16f95
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eec083c169
-s ours am: 1ff28d9c1a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24069363
Change-Id: Icaf934d95d7072cbd9e4163c592f62efe523a3b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 19:32:22 +00:00
Bill Yi
9785c80168
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d999ce533
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24068200
Change-Id: I61ee6c3d5277ec175c863db02356fdad27ce0afc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 18:48:32 +00:00
Bill Yi
1ff28d9c1a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eec083c169
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24069363
Change-Id: I2de227d48fb0409fb88f5b4dac8eb2c42482edbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 18:45:03 +00:00
Bill Yi
eec083c169
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ifa6d29ecf5518b91b6439055fa684e371c0dcc5f
2023-07-13 17:14:07 -07:00
Bill Yi
2764a59fac
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I77ce443619168d050a0da92c30f51199b412566d
2023-07-13 17:12:30 -07:00
Bill Yi
3d999ce533
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I731e98ceaf81340bfa91fa5d63a09e5f95a7cc56
2023-07-13 17:06:52 -07:00
Treehugger Robot
720f9d49f5
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into rvc-dev am: 6976a3137c
am: 4e41118949
-s ours am: 2291d2e8ea
-s ours am: acd1cc3ebf
-s ours am: c6bded5070
-s ours am: 78b208efc2
-s ours am: 23eb92c4ba
-s ours am: 06ac924785
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23541011
Change-Id: Ic234e54a97c99523b858662b58f02a56564fde01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 12:02:41 +00:00
Taran Singh
88bbba67ca
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0ee3b96e59
am: fc05ca8c35
-s ours am: 5a4bdbb9cf
-s ours am: 800f77c404
-s ours am: 6f90f9bcea
-s ours am: cdca52fc84
-s ours am: fa6de7b263
-s ours am: 3bcf0a8dd5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23541011
Change-Id: I2747f255f861db21feb58cc0fff399e89bf4fa65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 12:02:39 +00:00
Treehugger Robot
bd9783ca70
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into rvc-qpr-dev am: 6cf9c58fa5
-s ours am: 78d86e927c
-s ours am: a81ed851af
-s ours am: 34ea30a0d3
-s ours am: aa7349f210
-s ours am: deb426263d
-s ours am: 835ffd7e17
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23603846
Change-Id: I7378a33641be8d0b7a1a2b55f5ec30bb2f6e81c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 12:02:15 +00:00
Taran Singh
36eb51dac7
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0564ec25bb
-s ours am: c07555d438
-s ours am: 56c4d2a5a5
-s ours am: 045a9bfd32
-s ours am: 417c199efa
-s ours am: 675b4b3c62
-s ours am: d4f7fcb409
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23603846
Change-Id: Ie25d7a5fc02d574d31391944483f662e9c031e26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 12:02:13 +00:00
Treehugger Robot
036bf7ec0a
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-dev am: 9fa4b1e0a6
am: 3c039ca648
-s ours am: 2df32f537f
-s ours am: 4e7bbcce82
-s ours am: c36d4dd62b
-s ours am: 26c8ebc082
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545222
Change-Id: I2994c0b1e8b97d50953d15117475724140b8574e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 12:01:51 +00:00
Taran Singh
5d5c3516e6
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: cb2b753094
am: c362ee7dc2
-s ours am: a9488a71bc
-s ours am: ab11731a5b
-s ours am: cd7282da37
-s ours am: e199ee1b47
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545222
Change-Id: I54be4a31a9b623cea193a241d5f2a3d8bd70e02a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 12:01:49 +00:00