TreeHugger Robot
2d72c0e67e
Merge "Fix More details not work on fingerprint" into tm-dev am: cb38753530 am: 3433f8a9b2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197508
Change-Id: I0a3fce15a10b5d7ee2ab2cc1efd98fc02b6c695c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:17:24 +00:00
Bill Yi
9825da46ff
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 7ada1a1b2e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214802
Change-Id: I1bfdae40e320f140b44a8a3879d64aed5a377de0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:15:33 +00:00
Bill Yi
b781b9c38d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 196ff79720 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214802
Change-Id: Iae86de36449cf9df242d79cec297cdab3d0596e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:15:18 +00:00
Bill Yi
059234f150
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 5898a6df49 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18210276
Change-Id: Icb037cd0b42f56367d8d909e7d8ebb39adeef567
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:14:59 +00:00
Bill Yi
72fbe398ca
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f4c7931e46 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18210276
Change-Id: I83543ee334f01915c02477444bc2222059f73df9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:14:46 +00:00
TreeHugger Robot
97b69588df
Merge changes from topic "tc_change_20" into tm-dev am: f1167898b7 am: 0c8f044705
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18184666
Change-Id: I2c1a1466175300be585c3920c6f9e43e63012a6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:05:19 +00:00
Bill Yi
1fcabe2452
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2a0680f979 am: 63c72a9193 -s ours am: d4631b0d42 -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: I54bc21e568474fa36f7537c5b4c31707ac7cad0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:05:07 +00:00
TreeHugger Robot
3433f8a9b2
Merge "Fix More details not work on fingerprint" into tm-dev am: cb38753530
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197508
Change-Id: I8827eff74dc89e58ac1b8c0e41bc2b1a44c20505
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 05:43:16 +00:00
Bill Yi
7ada1a1b2e
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-05-10 05:22:10 +00:00
Bill Yi
5898a6df49
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-05-10 05:22:10 +00:00
TreeHugger Robot
0c8f044705
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: I53c6086ae26936f7e182b692cb51d958d5e566a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 05:12:33 +00:00
Bill Yi
d4631b0d42
[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: I75fd6f3a5a0ce5180a987110c5c5e33eb54515b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 05:12:14 +00:00
TreeHugger Robot
cb38753530
Merge "Fix More details not work on fingerprint" into tm-dev
2022-05-10 02:09:51 +00: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
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
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
Julia Reynolds
c80fc1ba4d
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: I08f148210ade5545c070a88656909d4acb7becb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 20:40:45 +00:00
Julia Reynolds
23a85a1f96
Merge "Remove notification permission feature flag" into tm-dev
2022-05-09 20:16:09 +00:00
Raphael Kim
f14c2ff2da
Merge "Extract app label from component name in notification access confirmation UI" into tm-dev am: c6f7599158 am: a36c5894ba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18151002
Change-Id: I05d4cdd4ab311f09a73222496ad2ad52e4eaebb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 19:50:13 +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
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
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
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
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
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
Tom Hsu
855099c704
Merge "[Panlingual] Use feature flag to switch opt-in on/off" into tm-dev
2022-05-09 10:31:46 +00:00
TreeHugger Robot
036d6744dd
Merge "Ensure loading all apps once in ManageApplications" into tm-dev
2022-05-09 08:09:46 +00:00
Chaohui Wang
7a21c9ef1f
Merge "Fix Wi-Fi "Network usage" and "Privacy" drop down" into tm-dev
2022-05-09 08:02:58 +00:00
Kholoud Mohamed
155df044e5
Merge "Add missing settings strings." into tm-dev
2022-05-09 07:20:57 +00:00
Chaohui Wang
0e8acae9d1
Fix the device admin apps status not refreshed
...
This is caused by I7175c966fbbfbf5d6331f5ac26c06b60d59a4e0d.
updateList() should be called in updateState() to refresh the latest
app status.
Fix: 231113758
Test: manual visual test
Change-Id: I9dc082c829020841ccd76bc4787855c8301f1154
2022-05-09 15:15:40 +08:00
tom hsu
f35406c4b2
[Panlingual] Invisible TopIntroPreference under opt-out mode.
...
Bug: b/231889115
Test: local see b/231889115#2
Change-Id: I44c30f62caf10ab7c57e8ec7d0b2b06148c3fe5c
2022-05-09 06:58:20 +00:00