Commit Graph

104218 Commits

Author SHA1 Message Date
Kholoud Mohamed
09e84417f9 Merge "Add missing settings strings." into tm-dev am: 155df044e5 am: d5a0ee6a90 am: b4117d0068
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944008

Change-Id: Iffb21c781017fa17cf206bec242db8dfbc7e8cc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 19:38:09 +00:00
Tom Hsu
a0f9356dfe Merge "[Panlingual] Use feature flag to switch opt-in on/off" into tm-dev am: 855099c704 am: 927b6c4f63 am: 8ab642f71d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181645

Change-Id: I9bb0eed4a093567fc4fa18a398325641b4381930
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 19:37:48 +00:00
Chaohui Wang
cd760beb21 Merge "Fix the device admin apps status not refreshed" into tm-dev am: 870dcb6949 am: 4859f6cfe1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18220099

Change-Id: I089526c78250c1d6023a5495644ef7a2f2e9a9f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 19:35:46 +00:00
Yuri Lin
b855cf5d12 Merge "Change zen mode schedules page rule handling" into tm-dev am: 9fb3262a1a am: e010ba619e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18189363

Change-Id: I4c592a292608c0305a8a420d74c34311850f778f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 19:21:56 +00:00
Raphael Kim
a36c5894ba Merge "Extract app label from component name in notification access confirmation UI" into tm-dev am: c6f7599158
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18151002

Change-Id: I4cabf15ab73a28f4c154a1ebe0b7383b5658c3ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 18:49:37 +00:00
Jason Chiu
bcf6dd1384 Merge "Reduce flickers of Injection" into tm-dev am: 6d9b155b20 am: ccf066c663
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186097

Change-Id: Iba7a7f7592368a38ea65b85ae3415c3ceaf62879
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 18:45:53 +00:00
Chaohui Wang
556d73bfe0 Merge "Fix the device admin apps status not refreshed" into tm-dev am: 870dcb6949 am: e33539d629
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18220099

Change-Id: Ic2868b424c425ef96629271fe8890deecae228fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 18:41:32 +00:00
Chaohui Wang
680dfaa421 Merge "Fix Wi-Fi "Network usage" and "Privacy" drop down" into tm-dev am: 7a21c9ef1f am: b09fcd145d am: 0c38840066
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186095

Change-Id: Icab722b6e45d43e862ee0528bb8f49b81ad87e64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 18:39:34 +00:00
Chaohui Wang
4859f6cfe1 Merge "Fix the device admin apps status not refreshed" into tm-dev am: 870dcb6949
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18220099

Change-Id: I11444e18e07dc8ee33c4d079f15c62dd1cb72c86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 18:35:26 +00:00
TreeHugger Robot
f084eecb4f Merge "Ensure loading all apps once in ManageApplications" into tm-dev am: 036d6744dd am: 4d7e960d65 am: 90f8dd0abd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18160674

Change-Id: I72ccf411a095df407a502526206c49898a5374f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 18:35:00 +00:00
Tom Hsu
9ac7f3d212 Merge "[Panlingual] Invisible TopIntroPreference under opt-out mode." into tm-dev am: e05d71b702 am: d3341895ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18220093

Change-Id: I20a01a207ec8dd9a6477b32ed87e5d5603b6edb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 18:27:57 +00:00
Jason Chiu
1e4edfd3e2 Merge "Reduce flickers of Injection" into tm-dev am: 6d9b155b20 am: 399093f82a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186097

Change-Id: I4c82eb41791c196efba07df8d79a732ba70851b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 18:15:01 +00:00
Chaohui Wang
42bd80b21c Merge "Fix Wi-Fi "Network usage" and "Privacy" drop down" into tm-dev am: 7a21c9ef1f am: 10f7493fe3 am: 91413daba0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186095

Change-Id: Id787c3cd49d94cae82937ddf4637da3103f66a05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 18:12:13 +00:00
Treehugger Robot
5b1b7d118e [automerger skipped] Merge "[Settings] Avoid from crash UI when querying data usage" am: 2da70f6385 am: 34ca30adc7 -s ours am: d91f702ad0 -s ours
am skip reason: Merged-In Id055fbd441936a9842b4acc978a894a855165bb7 with SHA-1 0f68faf996 is already in history

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

Change-Id: Ie46f25ab70dee6e0fcffe694ee9ae56dc8ae737e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 18:11:18 +00:00
Kholoud Mohamed
ba4721a171 Merge "Add missing settings strings." into tm-dev am: 155df044e5 am: e8aa31b017 am: 98ce84f65b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944008

Change-Id: I4f319b3315fbfca9730d5cb3e4c824052d62afa5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 18:10:33 +00:00
Tom Hsu
c02919a597 Merge "[Panlingual] Invisible TopIntroPreference under opt-out mode." into tm-dev am: e05d71b702 am: b0eabfb352
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18220093

Change-Id: Ib996f6dd1dbc2e96efbeabcfe2ee886afaf4b8cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 17:56:18 +00:00
Tom Hsu
c064ad98fa Merge "[Panlingual] Use feature flag to switch opt-in on/off" into tm-dev am: 855099c704 am: 6586310e62
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181645

Change-Id: I912e28a3b6803199ca5a1b50d25747a227b6db41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 17:56:08 +00:00
Raphael Kim
c6f7599158 Merge "Extract app label from component name in notification access confirmation UI" into tm-dev 2022-05-09 17:55:06 +00:00
Kholoud Mohamed
513023b2d9 Merge "Add missing settings strings." into tm-dev am: 155df044e5 am: d5a0ee6a90 am: 87fd72bbe1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944008

Change-Id: Ie4e0ede6234e03f7442cf887c65ad39d45b8625f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 17:55:03 +00:00
Jason Chiu
ccf066c663 Merge "Reduce flickers of Injection" into tm-dev am: 6d9b155b20
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186097

Change-Id: I37ce935f16618f31bca16615ab92d1903a9283c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 17:46:00 +00:00
TreeHugger Robot
e42176705b Merge "Ensure loading all apps once in ManageApplications" into tm-dev am: 036d6744dd am: 0cfa226653
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18160674

Change-Id: I16807d17cd07d160cf6bd3bbc7b3692d7f75108d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 17:43:28 +00:00
Tom Hsu
a58343f800 Merge "[Panlingual] Use feature flag to switch opt-in on/off" into tm-dev am: 855099c704 am: 927b6c4f63
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181645

Change-Id: I642d026f2c56a7e2a91cfec47a60ecfa486195ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 17:42:42 +00:00
TreeHugger Robot
8c30f1b644 Merge "Ensure loading all apps once in ManageApplications" into tm-dev am: 036d6744dd am: 4d7e960d65
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18160674

Change-Id: Ic6678f708e53efe8d9c8942c0d2622819b5e365f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 17:41:39 +00:00
Chaohui Wang
89fa491c6d Merge "Fix Wi-Fi "Network usage" and "Privacy" drop down" into tm-dev am: 7a21c9ef1f am: 10f7493fe3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186095

Change-Id: I2ddd366a1b0f1293e8dc702c4484c103017374db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 17:41:23 +00:00
Tom Hsu
d3341895ee Merge "[Panlingual] Invisible TopIntroPreference under opt-out mode." into tm-dev am: e05d71b702
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18220093

Change-Id: I6a4ecc8c4d96650aca4dc1d31dbc14ffc738b785
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 17:34:41 +00:00
Bonian Chen
e0f1081739 [Settings] IMS feature checking before accessing VT IMS API
Check IMS feature before accessing VT IMS API.o

Bug: 231248315
Test: local
Change-Id: I01b438cc79bb91ca05ba6bf57c7e38eb06e51a98
2022-05-10 01:32:31 +08:00
Kholoud Mohamed
b4117d0068 Merge "Add missing settings strings." into tm-dev am: 155df044e5 am: d5a0ee6a90
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944008

Change-Id: I6b426bb7e2e74e6ebf6894f893413c30389f6f88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 17:29:37 +00:00
Chaohui Wang
0c38840066 Merge "Fix Wi-Fi "Network usage" and "Privacy" drop down" into tm-dev am: 7a21c9ef1f am: b09fcd145d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186095

Change-Id: If97feba5b063e5bc69a905ed5b96ab4d62838dae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 17:15:08 +00:00
Kholoud Mohamed
98ce84f65b Merge "Add missing settings strings." into tm-dev am: 155df044e5 am: e8aa31b017
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944008

Change-Id: I63e5e4a2da6504aef9188a1bd9181d861c668f46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 17:06:12 +00:00
SongFerngWang
42aa247383 Reuse the active esim slot
If there is the active esim slot in SS mode, the settings should
reuse it and does not change the sim slot mapping.

Bug: 229803628
Test: manually test.
Change-Id: I6daa38f54abfaf67c7640d9dc8be0da02eb59554
2022-05-10 01:04:20 +08:00
Treehugger Robot
d91f702ad0 [automerger skipped] Merge "[Settings] Avoid from crash UI when querying data usage" am: 2da70f6385 am: 34ca30adc7 -s ours
am skip reason: Merged-In Id055fbd441936a9842b4acc978a894a855165bb7 with SHA-1 0f68faf996 is already in history

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

Change-Id: Ida4669176528ddfbdfc12c1dc4c7dfb00de3d692
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 16:59:10 +00:00
Tom Hsu
6586310e62 Merge "[Panlingual] Use feature flag to switch opt-in on/off" into tm-dev am: 855099c704
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181645

Change-Id: If3d7723dc8940bd56468fc9f0096d3e08b0d7d59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 16:46:28 +00:00
TreeHugger Robot
0cfa226653 Merge "Ensure loading all apps once in ManageApplications" into tm-dev am: 036d6744dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18160674

Change-Id: Id5fbd19d879c5dfb194ab51cf23da132e3eec8cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 16:43:39 +00:00
Chaohui Wang
b09fcd145d Merge "Fix Wi-Fi "Network usage" and "Privacy" drop down" into tm-dev am: 7a21c9ef1f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186095

Change-Id: Ib2bd1300cd59f3e85a49fea11de643f5fc7f268e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 16:42:27 +00:00
Treehugger Robot
34ca30adc7 Merge "[Settings] Avoid from crash UI when querying data usage" am: 2da70f6385
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2092023

Change-Id: I198290510e8adda1198663beb90e8501f785c6f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 16:22:13 +00:00
Treehugger Robot
2da70f6385 Merge "[Settings] Avoid from crash UI when querying data usage" 2022-05-09 15:46:46 +00:00
Yuri Lin
3bb0f67d1f Merge "Change zen mode schedules page rule handling" into tm-dev am: 9fb3262a1a am: e010ba619e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18189363

Change-Id: Iad024c7dd4d83546ba13727aaf17f28f01693ba5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 15:39:59 +00:00
Chaohui Wang
b215b96dfc Merge "Fix the device admin apps status not refreshed" into tm-dev am: 870dcb6949 am: e33539d629
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18220099

Change-Id: I932507daf32712323cd4108081aacea9c83f092c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 15:38:54 +00:00
Jason Chiu
99e01325bf Merge "Reduce flickers of Injection" into tm-dev am: 6d9b155b20 am: 399093f82a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186097

Change-Id: I2bd9f24f858a74a1f311681f522e12bd1c7fb0db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 15:33:27 +00:00
Tom Hsu
74d771a5e3 Merge "[Panlingual] Invisible TopIntroPreference under opt-out mode." into tm-dev am: e05d71b702 am: b0eabfb352
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18220093

Change-Id: Ic89d696c4ed4afe4431e9a1ae4c7a1387cd18a30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 15:32:12 +00:00
Yuri Lin
e010ba619e Merge "Change zen mode schedules page rule handling" into tm-dev am: 9fb3262a1a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18189363

Change-Id: I0bc4c2c71f364c813e9935d5b41343dabfbdd865
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 15:29:04 +00:00
Tom Hsu
8ab642f71d Merge "[Panlingual] Use feature flag to switch opt-in on/off" into tm-dev am: 855099c704 am: 927b6c4f63
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181645

Change-Id: Idfe3662ad408d5d7ff911df848a981bf75bd296c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 15:21:58 +00:00
TreeHugger Robot
90f8dd0abd Merge "Ensure loading all apps once in ManageApplications" into tm-dev am: 036d6744dd am: 4d7e960d65
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18160674

Change-Id: I53e0f9d7562d08c8dc0597c6b88335857b146d6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 15:20:11 +00:00
Chaohui Wang
91413daba0 Merge "Fix Wi-Fi "Network usage" and "Privacy" drop down" into tm-dev am: 7a21c9ef1f am: 10f7493fe3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186095

Change-Id: I9bcb51fcc57df333942d39ec976463f95c6bbb36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 15:19:56 +00:00
Kholoud Mohamed
e8aa31b017 Merge "Add missing settings strings." into tm-dev am: 155df044e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944008

Change-Id: Ia10c0e0d30ab654a9ad3759ba65887dcdd8ffb80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 15:19:17 +00:00
Kholoud Mohamed
87fd72bbe1 Merge "Add missing settings strings." into tm-dev am: 155df044e5 am: d5a0ee6a90
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944008

Change-Id: I003177da178c52bb6b9c1640765b1b93d450d5ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 15:12:07 +00:00
Yuri Lin
9fb3262a1a Merge "Change zen mode schedules page rule handling" into tm-dev 2022-05-09 14:56:13 +00:00
Chaohui Wang
e33539d629 Merge "Fix the device admin apps status not refreshed" into tm-dev am: 870dcb6949
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18220099

Change-Id: I04fc400f1ae52656e251c156596e0902b9c467ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 14:47:44 +00:00
Jason Chiu
399093f82a Merge "Reduce flickers of Injection" into tm-dev am: 6d9b155b20
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186097

Change-Id: I3f7a7bc01803dbc3d7eebfac46f6836ae9531025
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 14:46:09 +00:00
Tom Hsu
b0eabfb352 Merge "[Panlingual] Invisible TopIntroPreference under opt-out mode." into tm-dev am: e05d71b702
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18220093

Change-Id: I1cdc500fefaa06a6b915b825dd1c1bb5be71ed28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 14:44:40 +00:00