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
1ec36569da
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: I509db9fd641d6fae51491d9b805605bf633dda6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 17:37:05 +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
Tom Hsu
d0a8b7a9e8
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: Id2305fc16b50a984d0b1269d7e432f127927cbf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 17:24:34 +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
TreeHugger Robot
ebd59fd0c3
Merge "Ensure loading all apps once in ManageApplications" into tm-dev am: 036d6744dd
am: e3bd4b4b10
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18160674
Change-Id: Icdb3bfa32e8aeb4c27dae17b68f79b34ce1b0f7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 17:05:47 +00: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
Chaohui Wang
d59315e7f8
Merge "Fix Wi-Fi "Network usage" and "Privacy" drop down" into tm-dev am: 7a21c9ef1f
am: 1bf9ab501c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186095
Change-Id: I3f6167d6091cda111074d64eb7d6a0a4d90c8b72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 16:35:17 +00:00
Kholoud Mohamed
7bc2a481f8
Merge "Add missing settings strings." into tm-dev am: 155df044e5
am: 2e143c6324
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944008
Change-Id: I54d30e2139abb3f4468d98c59058125a17bf28b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 16:22:38 +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
e3bd4b4b10
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: I3570970ca4854c254ea3602bf0955e1421133990
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 15:53:46 +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
Chaohui Wang
1bf9ab501c
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: I519f6cc11af819d5dd82dd8e9d61b2e3c0a4ba41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 14:59:37 +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
Bill Yi
63c72a9193
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2a0680f979
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18184666
Change-Id: Ic316839a5663622539d95371af34951c4d46a6ff
2022-05-09 14:42:08 +00:00
Tom Hsu
927b6c4f63
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: Id378ceaedaf5a49821ca34dfae74e8c235902519
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 14:40:00 +00:00
Kholoud Mohamed
2e143c6324
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: I1e10e95975520b883f3a96e83c4cddf76feb654c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 14:38:17 +00:00
TreeHugger Robot
4d7e960d65
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: Iebce77b67ac04ba66446c602795f2d6d2340754a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 14:28:13 +00:00
Chaohui Wang
10f7493fe3
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: Ib0c189760733640d4e6f98918e0865e02c36f4a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 14:27:54 +00:00
Kholoud Mohamed
d5a0ee6a90
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: I705df4c090815fab9abfbe75bffbe5cb18202b6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 14:19:33 +00:00
Milton Wu
13c91159a2
Fix More details not work on fingerprint
...
FooterPreference doesn't support linkify in order to have better
accessibility. So we need to separate original 1 Footer into 2 Footers
in Fingerprint settings.
Bug: 230625178
Test: test fingerprint setting footer links with admin mode or non-admin
mode
Change-Id: I07263a1faaf7dddf79ba96dd9fcb4fce4cf8981b
2022-05-09 11:39:56 +00:00
Chaohui Wang
870dcb6949
Merge "Fix the device admin apps status not refreshed" into tm-dev
2022-05-09 11:22:18 +00:00
Jason Chiu
6d9b155b20
Merge "Reduce flickers of Injection" into tm-dev
2022-05-09 11:04:20 +00:00
Tom Hsu
e05d71b702
Merge "[Panlingual] Invisible TopIntroPreference under opt-out mode." into tm-dev
2022-05-09 10:32:58 +00:00