Commit Graph

107307 Commits

Author SHA1 Message Date
Tom Hsu
ec92776393 Merge "[Panlingual] Invisible TopIntroPreference under opt-out mode." into tm-dev am: e05d71b702 am: d3341895ee am: 9ac7f3d212 am: 0ee8f8a411
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18220093

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

Change-Id: I2bcc6d0b6406f96cc2c53e8134f3bd61b4b88fff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 02:58:46 +00:00
Treehugger Robot
175c89d0cd [automerger skipped] Merge "[Settings] Avoid from crash UI when querying data usage" am: 2da70f6385 am: 34ca30adc7 -s ours am: d91f702ad0 -s ours am: 5b1b7d118e -s ours am: 711e092b8a -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: I3f641fb60f9e7c224a0e6c89e0e69bde670a9902
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 02:58:38 +00:00
Tom Hsu
165fd751fe Merge "[Panlingual] Invisible TopIntroPreference under opt-out mode." into tm-dev am: e05d71b702 am: b0eabfb352 am: c02919a597 am: a07dbd1657
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18220093

Change-Id: Iac41ca71da30e2d84b650c9a03d1cc3109424922
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 02:58:25 +00:00
Chaohui Wang
9b28ecf9de Merge "Display TOO_SHORT_WHEN_ALL_NUMERIC" into tm-dev 2022-05-10 02:44:47 +00:00
Tom Hsu
2a287aa2f8 Merge "[Panlingual] Use feature flag to switch opt-in on/off" into tm-dev am: 855099c704 am: 6586310e62 am: c064ad98fa am: 7298a5ccda
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181645

Change-Id: I300faa1b28f1bd27c6ab78fbeb8b78be80968c53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 02:39:28 +00:00
Bonian Chen
bd971968e9 Merge "[Settings] IMS feature checking before accessing VT IMS API" into tm-dev 2022-05-10 02:25:51 +00:00
TreeHugger Robot
12f552f22e Merge changes from topic "tc_change_20" into tm-dev am: f1167898b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18184666

Change-Id: I02908155a6567d757b46901194f2633314da1543
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 02:12:05 +00:00
Bill Yi
3abfb845b6 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2a0680f979 am: 63c72a9193 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I94f24eb788a5336e4bedf83e21e9b3bb05f590b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 02:11:51 +00:00
TreeHugger Robot
cb38753530 Merge "Fix More details not work on fingerprint" into tm-dev 2022-05-10 02:09:51 +00:00
Yuri Lin
611fc28824 Merge "Change zen mode schedules page rule handling" into tm-dev am: 9fb3262a1a am: e010ba619e am: 3bb0f67d1f am: 45c53640ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18189363

Change-Id: I0cc2b3ee2cc3f9806477a4a8f2624789eb9e6e61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 02:01:36 +00:00
TreeHugger Robot
b646680de5 Merge changes from topic "tc_change_20" into tm-dev am: f1167898b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18184666

Change-Id: I702f43b19d20c57b202e103950e6aa7a0b9b5d15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 01:56:54 +00:00
Bill Yi
3d9777a011 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2a0680f979 am: 63c72a9193 -s ours
am skip reason: subject contains skip directive

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

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

Change-Id: I2d8d08ab3114373cd40a5ccd7878650d00fc579f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 01:41:24 +00:00
Julia Reynolds
6d35c24218 Merge "Remove notification permission feature flag" into tm-dev am: 23a85a1f96 am: 8e41734caf am: c92e89217f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18164272

Change-Id: Ifb83dd00a1cab592ba951c76067bc472054e637f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 01:36:12 +00:00
TreeHugger Robot
a0de6f937c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: d5ab43596e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I18c2e0bbd04dd7de98482d311526481f8a04a43d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 01:33:26 +00:00
Bill Yi
2f6bf8d723 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 21ad396435 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3634106b88997ec4ce823f2d29b91ae4d0ca9438
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 01:33:06 +00:00
TreeHugger Robot
5b0dc86f8f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 8ec0fc0931 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia015b0e6245277425437aa74b22aed5c7f35ce39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 01:32:54 +00:00
Bill Yi
605150d35d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ee8de09b57 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If1ba6b0c64657f3a82c42c420521b994aaf45fc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 01:32:36 +00:00
Bonian Chen
8b06c96fe9 [Settings] Hide some Preference entries when no mobile data support
Hide some Preference which requires mobile data on device didn't support
it.

Bug: 221999174
Test: local
Change-Id: I7dd6e13aea0ed4467c7c7edeada564e42ea78349
2022-05-10 01:12:23 +00:00
TreeHugger Robot
6919f0064b Merge "Ensure loading all apps once in ManageApplications" into tm-dev am: 036d6744dd am: 0cfa226653 am: e42176705b am: 6b6cdcc8d5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18160674

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

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

Change-Id: I72af1ed03ae7c708b09f79c88f2e4f5b5bd0d2c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 00:27:53 +00:00
Julia Reynolds
0e3dbbef3a Merge "Remove notification permission feature flag" into tm-dev am: 23a85a1f96 am: c80fc1ba4d am: f0ed87645c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18164272

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

Change-Id: I1574028ebbefea3d6aea11b003ed3cc4f886bd58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 00:03:27 +00:00
Julia Reynolds
c92e89217f Merge "Remove notification permission feature flag" into tm-dev am: 23a85a1f96 am: 8e41734caf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18164272

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

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

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

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

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

Change-Id: Ie42089e75d048ac575615c068047598ddc6afaef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 23:39:31 +00:00
Yuri Lin
0fe8746358 Merge "Change zen mode schedules page rule handling" into tm-dev am: 9fb3262a1a am: 475ee039ea am: 7ac6bb4d61
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18189363

Change-Id: Iaa06314aab10359b4d1c7371703d03ad50d55381
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 23:31:25 +00:00
Julia Reynolds
73b08f15b0 Merge "Remove notification permission feature flag" into tm-dev am: 23a85a1f96 am: c80fc1ba4d am: f5148fd0a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18164272

Change-Id: Icd76217fc4ee5059c9abbdc00cdbd8bd57937b38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 23:28:41 +00:00
Yanting Yang
ee0931f5ba Fix reset app preferences for work profile apps
In the past, Settings didn't support resetting the disable status of
work profile apps, it doesn’t follow the behavior that the reset dialog
mentioned.

To fix it, we are going to check apps by enabling user profiles and user
id. If the work profile is enabled, we will also reset them when users
select to reset app preferences.

Bug: 187387211
Test: manual
Change-Id: I25fd0129335539a23ed2ee0af57fdd9714eddf74
2022-05-10 07:06:14 +08:00
TreeHugger Robot
f1167898b7 Merge changes from topic "tc_change_20" into tm-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2a0680f979
  Import translations. DO NOT MERGE ANYWHERE
2022-05-09 23:02:43 +00:00
Raphael Kim
7f48922727 Merge "Extract app label from component name in notification access confirmation UI" into tm-dev am: c6f7599158 am: a36c5894ba am: 94355d5717
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18151002

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

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

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

Change-Id: Ifa6599f54d191244c2dc1af47ce9a673d00e3a90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 22:14:49 +00:00
Julia Reynolds
68aaf15888 Merge "Remove notification permission feature flag" into tm-dev am: 23a85a1f96 am: 73a0bada43
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18164272

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

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

Change-Id: I229b884ac4be926205215660c530e5d72a971dc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 21:53:51 +00:00
Julia Reynolds
8e41734caf Merge "Remove notification permission feature flag" into tm-dev am: 23a85a1f96
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18164272

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

Change-Id: I68b35f65069f853757790641637963e716263575
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 21:36:31 +00:00
TreeHugger Robot
d5ab43596e Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-05-09 21:35:14 +00:00
TreeHugger Robot
8ec0fc0931 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-05-09 21:35:14 +00:00
Yuri Lin
2bdba08adf Merge "Change zen mode schedules page rule handling" into tm-dev am: 9fb3262a1a am: e010ba619e am: b855cf5d12
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18189363

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

Change-Id: If4ab25a02c81b0c62d3c93cbfd13bb7814f95330
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 21:21:12 +00:00
Julia Reynolds
f0ed87645c Merge "Remove notification permission feature flag" into tm-dev am: 23a85a1f96 am: c80fc1ba4d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18164272

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

Change-Id: I52b0df9684ba75711814dcfaea92330e274e8f4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 21:17:48 +00:00