Commit Graph

104676 Commits

Author SHA1 Message Date
TreeHugger Robot
0c96f0b1ef [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: db7228fd26 -s ours am: 9464118bd1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic670219292b545d6a1bd1752181a9eb1da1be91b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 01:05:21 +00:00
Bill Yi
49861e43a5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 713df54284 -s ours am: 8a4fbdf998 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I83aa971bd79a3160c7f0c971d1d6cea031886781
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 01:05:19 +00:00
Bill Yi
3eb7acc0c5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 445dd2bd45 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I10f308d01fb42b1b7c8d7bf8b4f31b276d8258f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 00:51:11 +00:00
Bill Yi
d5ecf50de0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6a213caba0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8b666a2c66f78182088299d3e61dca7dfe7879f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 00:51:06 +00:00
Bill Yi
696ecc8c37 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 168e7677f7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I31ede2a691747e8a2eee534af12cdef7243b38ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 00:48:17 +00:00
Bill Yi
01fba6ace0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 15d7ac7c5b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib6834ad8e314b2912d48ae7c7e86be11c187cded
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 00:48:16 +00:00
Bill Yi
738e92a0fb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b9dd1a3a2d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I43a1bfc8f493004e16420725d037178f592851f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 00:40:48 +00:00
Bill Yi
9d63f65466 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: afa4a259d3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2979722889c7a3664c3730fc1f2343957c2df4d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 00:40:43 +00:00
Bill Yi
60f4209ad8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b9dd1a3a2d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibb4ad4dca96f0e7bd1edf5bec12ebd40ea806f69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 00:40:04 +00:00
Bill Yi
c8257fe175 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: afa4a259d3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I675c8781e005a859c7eddeac2b47c1d7c3697210
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 00:40:01 +00:00
TreeHugger Robot
d5f23afcc8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: db7228fd26 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I03063bc040ff8432f92639d7abd9d9c5436831e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 00:39:11 +00:00
Bill Yi
6c8a55e3a7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 713df54284 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1cf43b27d3698aad7231934b41a5e631e72e5a95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 00:39:10 +00:00
TreeHugger Robot
9464118bd1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: db7228fd26 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I47d43505d8efa6864b844451b283cdd56c241a97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 00:37:31 +00:00
Bill Yi
8a4fbdf998 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 713df54284 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I78d71958f5db6d902d26d6b6c543fcfb59fbc0f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 00:37:28 +00:00
Bill Yi
1feb4cf122 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-04-19 00:31:46 +00:00
TreeHugger Robot
5e88e4f1b9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 7a33306079 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If4e154a2995b83b452628d6797f0c8ba30c18782
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 00:27:57 +00:00
Bill Yi
e0d214cabd Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-04-19 00:26:14 +00:00
Bill Yi
445dd2bd45 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-04-19 00:25:12 +00:00
Bill Yi
b9dd1a3a2d Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-19 00:22:17 +00:00
Bill Yi
168e7677f7 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-04-19 00:20:30 +00:00
TreeHugger Robot
db7228fd26 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-19 00:17:15 +00:00
menghanli
7ae0b641dd Fix transparency seekbar is enabled while fade feature is disabled.
Root cause: Show default status until setting key changed. It does not
show latest status when created.
Solution: Update the status when created.

Bug: 229566130
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FloatingMenuTransparencyPreferenceControllerTest
Change-Id: Ia25fe5cec0444c1771e8ce31aae2a4cb3b0405a1
2022-04-19 08:15:28 +08:00
TreeHugger Robot
7a33306079 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-04-19 00:10:13 +00:00
TreeHugger Robot
213b0aa1f3 Merge changes from topic "presubmit-am-33fbb7edc9924936979cd0f60e0e4c8b"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 8156cb9555
  Import translations. DO NOT MERGE ANYWHERE
2022-04-19 00:10:13 +00:00
TreeHugger Robot
647f7e081f Merge "Update dream settings strings with sensible char limits." into tm-qpr-dev am: 455bf0c881
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17802107

Change-Id: Iefd89ab4ac8f439915d6caf5ce87cae63571a671
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 22:06:54 +00:00
TreeHugger Robot
455bf0c881 Merge "Update dream settings strings with sensible char limits." into tm-qpr-dev 2022-04-18 21:50:38 +00:00
Niklas Lindgren
8bc83ef615 Read CarrierConfig to get operator name
Config if operator name should be in status bar is now read
from carrier config. For dual sim devices we use data sim.

Bug: 116847905
Test: Add item for carrier in vendor.xml and swap sim cards
between ones that have the item enabled and disabled. We have
also tested to swap data sim cards on dual sim device.
Test: m RunSettingsRoboTests ROBOTEST_FILTER="ShowOperatorNamePreferenceControllerTest"

Change-Id: I03311b96ee660aed80ec867b05aa0a34cfc15f54
2022-04-18 21:34:57 +00:00
TreeHugger Robot
de3a095e2c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 5e411c38cb -s ours am: 467b85d088 -s ours am: 5734853d61 -s ours am: 7562644667 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3ce8b87654cd817a6578e67a61d876be80ebfc93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 20:04:31 +00:00
TreeHugger Robot
7562644667 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 5e411c38cb -s ours am: 467b85d088 -s ours am: 5734853d61 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I34f38474a562ff2a619da70bf00ecf387043eefc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 19:49:47 +00:00
TreeHugger Robot
8bf9454c95 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 5e411c38cb -s ours am: 467b85d088 -s ours am: 2902d67c16 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icc97df20000468212c749a05b96d0b2ee84c2b06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 19:49:25 +00:00
Joshua McCloskey
1dd4f54d58 SUW enrolls FP before Face
Test: During SUW verified Fingerprint enrollment
comes before face.
Test: During SUW enrolled multiple fingerprints than 1 face.
Test: Skipped and cancelled on every possible screen to ensure behavior
was correct.
Bug: 228607474

Change-Id: I4c50763a804fe4eb9d62451eb2f957545857723e
2022-04-18 19:42:35 +00:00
TreeHugger Robot
5734853d61 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 5e411c38cb -s ours am: 467b85d088 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I61575bf7aeb0e1bf99e275a3ece78d3f3db325d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 19:26:13 +00:00
TreeHugger Robot
2902d67c16 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 5e411c38cb -s ours am: 467b85d088 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5cc92c254bb91040742ce55df82ce3088e00ce30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 19:25:02 +00:00
TreeHugger Robot
467b85d088 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 5e411c38cb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4435f6f1918ce336ee104c933f7d040a165f2153
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:51:14 +00:00
TreeHugger Robot
0092201223 Merge changes from topic "presubmit-am-a6d51d83e79d4efb88a3610f5edefa60" into tm-dev am: aa1f86f18d am: 5bf683e8f5 am: 2972c8c462
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17801765

Change-Id: Ie28bdd8d56c9c67b41bb1a40747456da8a9fc5ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:46:59 +00:00
Bill Yi
a54851cb19 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d5de2ec5ae am: fb20f3183b -s ours am: 2631a9a4f1 -s ours am: fc6437b4fb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I44e8a035ff71d7aea69cc38b2165d7e819de2607
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:46:58 +00:00
TreeHugger Robot
425f72df0e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: e6a5247285 -s ours am: 4c32ec0371 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9d56cd0b5a82c6f3eee927a69537eb8e5d660d6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:46:49 +00:00
Bill Yi
3d077e5671 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f48173940 -s ours am: 8fda064295 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I98561c5475b8ecbd3834107081264f4471498c28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:46:47 +00:00
TreeHugger Robot
88527377b2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 8e461aef7b -s ours am: 74a36a7659 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7ca5094cbe2435bb2e837939e451dcf4b039f9aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:46:30 +00:00
Bill Yi
cba3a3003c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c9be756fd4 -s ours am: a719bfa0b3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I275b1f9f67500410bf3f52b5eb32a5008463eda9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:46:29 +00:00
Bill Yi
6d3ad361d8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc86f72e65 -s ours am: 6c46c20518 -s ours am: fa0b661076 -s ours am: c71203f16d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie2e87185cc108d4cc457d3090a38110e37c2a3ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:46:21 +00:00
Peiyong Lin
aab9e76cf6 Merge "Clean up extra app info." into tm-dev am: bd26c3c747 am: fceaaa80a0 am: fa6ecc7857
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17757962

Change-Id: Iee5900e38feb0c33658709370c7732a067b7b8ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:45:51 +00:00
TreeHugger Robot
2972c8c462 Merge changes from topic "presubmit-am-a6d51d83e79d4efb88a3610f5edefa60" into tm-dev am: aa1f86f18d am: 5bf683e8f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17801765

Change-Id: Ib848e8a84d113f56002f3a9d810da8eb0f32f99f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:45:29 +00:00
Bill Yi
fc6437b4fb [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d5de2ec5ae am: fb20f3183b -s ours am: 2631a9a4f1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I144dbdf1dda930056d54e64a69b3383166bd9a09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:45:28 +00:00
TreeHugger Robot
4c32ec0371 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: e6a5247285 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I77e12637a86224404abbc0b7b51e4f616e77b234
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:45:21 +00:00
Bill Yi
8fda064295 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f48173940 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5064b78c2ac8b2bfa8b05524d47324cf67673b67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:45:20 +00:00
TreeHugger Robot
74a36a7659 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 8e461aef7b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5a28499c697435d9b2d85ad7c94032bff4e90697
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:45:08 +00:00
Bill Yi
a719bfa0b3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c9be756fd4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I892b308850183401f240d915e6dd41f509bff424
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:44:57 +00:00
Bill Yi
c71203f16d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc86f72e65 -s ours am: 6c46c20518 -s ours am: fa0b661076 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie1afc461ae8f3561b19c88807d093bb7911ff557
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:44:51 +00:00
Peiyong Lin
fa6ecc7857 Merge "Clean up extra app info." into tm-dev am: bd26c3c747 am: fceaaa80a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17757962

Change-Id: Id490733f3fed747546e80d96031bc71508f32748
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:44:47 +00:00