Commit Graph

103488 Commits

Author SHA1 Message Date
Bill Yi
24e53cf988 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b81da264a8 -s ours am: e0da5747da -s ours am: 1a4297414e -s ours am: c0bf62368b -s ours am: 490f9dd7f4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5e819224dc59ff3e132ed4898b48fee99dbc5caa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 18:49:16 +00:00
Bill Yi
221146e0b0 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aedbfeb8b8 am: bf87406634 -s ours am: 53993399da -s ours am: 44f1eb9246 -s ours am: a01a68689f -s ours am: 06e71cc9c4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I07552578b28c7d2b073c569e65d0dc7b4ac64bbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 18:49:08 +00:00
Lucas Silva
d58d7aa5df Merge "Update dream settings logic to keep the customize button unselected." into tm-dev am: dc44eb1feb am: d7e5195565 am: ce24de4631
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18095768

Change-Id: I2666f5a835f99adaf3f1ffea68066b3a74ff582b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 18:45:06 +00:00
Joshua Mccloskey
d9987e0e0f [automerger skipped] Merge "Fix final UDFPS enrollment haptic." into tm-dev am: 8f463f5c88 -s ours am: d7855afb3e -s ours am: 2dbdde4582 -s ours
am skip reason: Merged-In I8623771016b9819d4211d07a19b50291a8b06cd9 with SHA-1 d3001a1a01 is already in history

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

Change-Id: Ie1665ad48f4fa7349ee26d9da5b1d0588dfad0e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 18:24:44 +00:00
Joshua McCloskey
19cc020f09 [automerger skipped] Fix final UDFPS enrollment haptic. am: b7f3001cea -s ours am: 8495275d81 -s ours am: e63e2c4483 -s ours
am skip reason: Merged-In I8623771016b9819d4211d07a19b50291a8b06cd9 with SHA-1 d3001a1a01 is already in history

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

Change-Id: I0000c9542a5773d6280538f2886ee5c3ee8f70d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 18:24:43 +00:00
Bonian Chen
0d3883baa4 Merge "[Settings] Avoid from crash UI when querying data usage" into tm-dev am: 5ef52de6b2 am: b32415b955 am: 907156d04f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950069

Change-Id: I8eef3e243eb49e64e643434e905df89776e1cd2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 18:24:28 +00:00
Bonian Chen
409e87760d Merge "[Settings] Rename title of SIM UI when changed" into tm-dev am: 7bdf717410 am: 01e97e371e am: 2718dea3f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17983870

Change-Id: If8ce6c139883e916dcf2eb24b8d3ead696910785
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 18:24:22 +00:00
TreeHugger Robot
fbcb6198ae Merge "Show restricted message in Wi-Fi Direct summary" into tm-dev am: 38989c9c6a am: d1c67e389d am: 5c851b28f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062823

Change-Id: I60a6f7a864c6ff6c58f8b1324a37b70cb32f0f85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 18:24:15 +00:00
Jan Tomljanovic
e228d4e72d Merge "Update the SafetyCenter icon" into tm-dev am: 297028ea69 am: 3c357dec8a am: 1ef1f750e8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18029249

Change-Id: I3a8c0ca91cff947b9d72f886711a526d9240804b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 18:24:09 +00:00
TreeHugger Robot
3d4ffc67d0 Merge "Show restricted message in Wi-Fi hotspot summary" into tm-dev am: 30bba3bbdb am: 1c16e6b314 am: 431c7ede2b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062822

Change-Id: I5281124b59ca849f24061e7e9bd3bc335fb05bc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 18:24:02 +00:00
TreeHugger Robot
070850b528 Merge "Remove tab symbol for app pinning strings" into tm-dev am: 5d31a69d65 am: 7d1f75839d am: 5ed72fae84
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030885

Change-Id: Id64b57ba7f8bee085a600b1084a264653a8bf8d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 18:23:55 +00:00
Chaohui Wang
f75897acd0 Merge "Fix flicker for Mobile data & Wi-Fi page" into tm-dev am: 71e03076cd am: 19356dae5d am: 74030a5bc5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18013070

Change-Id: I1810f41e7a794321431c1c70f098b10f5ba2e2d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 18:23:49 +00:00
Tom Hsu
71b96c18e1 Merge "[Panlingual] Avoid activity restart during rotation" into tm-dev am: 1d0f85a3d6 am: 169517aacc am: 3521d0420c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030882

Change-Id: I077dd683b7227ed306e0d0fc5e65030f64f0ab18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 18:23:42 +00:00
Arc Wang
2c4a835b27 Merge "Prevent side channel package installation enumeration" into tm-dev am: a3c7f8482a am: 7a530c79ec am: 3af1d90a43
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944167

Change-Id: I04bebb3b2c3a8b723439c44f4d9b0975786f63ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 18:19:03 +00:00
Julia Reynolds
a7c0ce5cae Merge "Move REVIEW_PERMISSIONS_NOTIFICATION_STATE to Global from Secure" into tm-dev am: 312de956ec am: 1f912cbfe3 am: d9d09bf112
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17871961

Change-Id: Idd1d83b656de88b496fedd469b1890fc3adebbed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 17:38:33 +00:00
TreeHugger Robot
a00a24bace Merge "Hide running time information for "Android System" entry" into tm-dev am: fc6cb73d29 am: 6708570e2c am: d266df1531
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062824

Change-Id: I489c8a73f9dbafd5f5f38b06b2549d1af780976d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 17:38:03 +00:00
Calvin Pan
3e087ae99d Merge "Add unit test for AppLocalePickerActivity" into tm-dev am: 8ad2642b5f am: 38fac79ee6 am: 492fdaf058
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903006

Change-Id: If6a666918f920db2ecab3ad5a2bcae51f1148cf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 17:37:54 +00:00
Betty Chang
8ed506d860 Merge "[LE] Launch the MediaOutputBroadcastDialog when the current device is broadcasting" into tm-dev am: 7711207ba5 am: ec17c47421 am: 3ea06f174e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944166

Change-Id: Ib0420578c42e6c9e78370e776ac2624981fbd32f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 17:37:16 +00:00
Vadim Caen
fd7c4691aa Merge "Add Settings for back animation developer option DO NOT MERGE" into tm-dev am: 0be85b0811 am: 7acb9238f8 am: 615b7cf8ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17622557

Change-Id: Iaad5a8ec3b100503d98c358df464bd9d5b8dabd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 15:11:13 +00:00
Vadim Caen
44e41aa4e6 Add Settings for back animation developer option DO NOT MERGE am: d268b11e85 am: 47ff8119f2 am: 2e067e8150
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17622557

Change-Id: I6e40c85b595533f7905244cadf27459371ecf626
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 15:11:07 +00:00
Vadim Caen
b4d2715387 Merge "Add Settings for back animation developer option DO NOT MERGE" into tm-dev am: 0be85b0811 am: 4f14fd577d am: 74d2c5e3e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17622557

Change-Id: Ia7b135702d048b930b5635ffae8f01fc22292133
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 15:09:13 +00:00
Vadim Caen
3aadb6f2b1 Add Settings for back animation developer option DO NOT MERGE am: d268b11e85 am: ae9ed5fdbc am: f272d41840
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17622557

Change-Id: I5a9c3de63357df450fb879df8a6a613d3ade8321
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 15:09:06 +00:00
Victor Chang
fbad0f3ca9 Merge "Titlecasing time zone summary" am: 1d6e9cfdf2 am: 16aca1db9f am: e12caf5c9b am: 09a7871c30
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2077567

Change-Id: I7d8725c0010ec50450cc12e9216dc28cc6cd40d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 14:45:43 +00:00
Vadim Caen
615b7cf8ac Merge "Add Settings for back animation developer option DO NOT MERGE" into tm-dev am: 0be85b0811 am: 7acb9238f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17622557

Change-Id: Iea0a7a11e0419a3bff6655a0c46d26b2f0bf1c4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 14:43:28 +00:00
Vadim Caen
2e067e8150 Add Settings for back animation developer option DO NOT MERGE am: d268b11e85 am: 47ff8119f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17622557

Change-Id: I48312e373563856975f703212f96c478a1b17b26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 14:43:24 +00:00
Vadim Caen
74d2c5e3e7 Merge "Add Settings for back animation developer option DO NOT MERGE" into tm-dev am: 0be85b0811 am: 4f14fd577d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17622557

Change-Id: I22da33381cb7b749f839523c4d46c55834718019
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 14:42:03 +00:00
Vadim Caen
f272d41840 Add Settings for back animation developer option DO NOT MERGE am: d268b11e85 am: ae9ed5fdbc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17622557

Change-Id: Ibaef0d6525ddc7dd72996972ea9d7b932ffe0e10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 14:42:01 +00:00
Vadim Caen
4f14fd577d Merge "Add Settings for back animation developer option DO NOT MERGE" into tm-dev am: 0be85b0811
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17622557

Change-Id: I47209f2db1dcd605880feecb8ec2bcf75dd6f6c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 14:17:40 +00:00
Vadim Caen
ae9ed5fdbc Add Settings for back animation developer option DO NOT MERGE am: d268b11e85
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17622557

Change-Id: I190a1cbcb0513efff5180d1fa79fa8fe7baef1ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 14:17:38 +00:00
Vadim Caen
7acb9238f8 Merge "Add Settings for back animation developer option DO NOT MERGE" into tm-dev am: 0be85b0811
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17622557

Change-Id: I3a34eb81f5c4f8e1bc14c623481504028b3b2bd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 14:17:27 +00:00
Vadim Caen
47ff8119f2 Add Settings for back animation developer option DO NOT MERGE am: d268b11e85
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17622557

Change-Id: Iaa035592fa20b3bd3f29a0f7fab782a66d7e75c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 14:17:25 +00:00
Victor Chang
09a7871c30 Merge "Titlecasing time zone summary" am: 1d6e9cfdf2 am: 16aca1db9f am: e12caf5c9b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2077567

Change-Id: Id21cf24c3006b91f7518a580100b6fb1868ad6db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 14:15:59 +00:00
Vadim Caen
0be85b0811 Merge "Add Settings for back animation developer option DO NOT MERGE" into tm-dev 2022-05-03 14:13:56 +00:00
Bonian Chen
a980f1b92f Merge "[Settings] Fix missing part for refactor" into tm-dev am: e83d2a5e0e am: cf9ca3fbe6 am: 9ea2bfeb9a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18123662

Change-Id: I3a0630cbb18ea926612cfb239a2b98f81f2c4f24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 14:06:19 +00:00
Bonian Chen
e977eb8100 Merge "[Settings] Preferred network mode appears during in-call" into tm-dev am: 55d722c2b0 am: d4440db4bf am: 54d8d163c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18121902

Change-Id: Ie8045ad3b03c7dd31697513bc03f2a105c6322d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 14:06:12 +00:00
Bonian Chen
6e0eca36fa Merge "[Settings] Fix missing part for refactor" into tm-dev am: e83d2a5e0e am: 35913be5b4 am: 9e5ec54ab8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18123662

Change-Id: I50e3b7b26d6624b8af3f4cd69535bbb32fe47f6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 14:06:05 +00:00
Bonian Chen
854a251602 Merge "[Settings] Preferred network mode appears during in-call" into tm-dev am: 55d722c2b0 am: 260871d57f am: 5e1c22ad19
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18121902

Change-Id: I0403ba03221ea83c6e63a6fe455b0473f2252d7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 14:04:52 +00:00
Victor Chang
e12caf5c9b Merge "Titlecasing time zone summary" am: 1d6e9cfdf2 am: 16aca1db9f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2077567

Change-Id: I03fa697dd0ff7197852b6c8aee1256e549ca52d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 13:57:43 +00:00
Bonian Chen
9ea2bfeb9a Merge "[Settings] Fix missing part for refactor" into tm-dev am: e83d2a5e0e am: cf9ca3fbe6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18123662

Change-Id: Ie1a5d4a2a105a1162398b9d99e7d572319aa7e6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 13:43:15 +00:00
Bonian Chen
54d8d163c9 Merge "[Settings] Preferred network mode appears during in-call" into tm-dev am: 55d722c2b0 am: d4440db4bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18121902

Change-Id: Ieb67fb55701c141d8f44e88f07a8cc71db39a455
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 13:43:08 +00:00
Bonian Chen
9e5ec54ab8 Merge "[Settings] Fix missing part for refactor" into tm-dev am: e83d2a5e0e am: 35913be5b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18123662

Change-Id: Ida65eaa888a1dc39537426516a26763d4ea2d2b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 13:42:49 +00:00
Bonian Chen
5e1c22ad19 Merge "[Settings] Preferred network mode appears during in-call" into tm-dev am: 55d722c2b0 am: 260871d57f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18121902

Change-Id: I6a738bc71f4c0f8b05691974f8d1bb6843d6b194
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 13:42:27 +00:00
Victor Chang
16aca1db9f Merge "Titlecasing time zone summary" am: 1d6e9cfdf2
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2077567

Change-Id: If1ab5d3f0934a3803ae81b45aedbcfa41bcc8590
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 13:32:43 +00:00
Bonian Chen
35913be5b4 Merge "[Settings] Fix missing part for refactor" into tm-dev am: e83d2a5e0e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18123662

Change-Id: Ic93714fee975bccfb00c686ae6d99d932f681f34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 13:26:16 +00:00
Bonian Chen
cf9ca3fbe6 Merge "[Settings] Fix missing part for refactor" into tm-dev am: e83d2a5e0e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18123662

Change-Id: I2dd55f7ccac5fc66518c24f51ed8943ae3a8719b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 13:25:26 +00:00
Bonian Chen
260871d57f Merge "[Settings] Preferred network mode appears during in-call" into tm-dev am: 55d722c2b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18121902

Change-Id: I310ec2cf32fa57ed984836c66f3930baf641d1dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 13:24:32 +00:00
Bonian Chen
d4440db4bf Merge "[Settings] Preferred network mode appears during in-call" into tm-dev am: 55d722c2b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18121902

Change-Id: Iaf30815c9394744995289d44eb097340663b992b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 13:23:53 +00:00
Bonian Chen
e83d2a5e0e Merge "[Settings] Fix missing part for refactor" into tm-dev 2022-05-03 12:33:36 +00:00
Victor Chang
1d6e9cfdf2 Merge "Titlecasing time zone summary" 2022-05-03 11:10:20 +00:00
Bonian Chen
55d722c2b0 Merge "[Settings] Preferred network mode appears during in-call" into tm-dev 2022-05-03 09:46:47 +00:00