Commit Graph

103574 Commits

Author SHA1 Message Date
TreeHugger Robot
d017261dd6 Merge "Fix the work profile's deep link problem" into tm-dev am: 2b9dd10fa5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18482928

Change-Id: I88933010aabbbb0210d8833440f3d92ffbb2db37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:26:15 +00:00
SongFerngWang
f88f3aed7b The settings crash when it add the RTL mark on MEP message am: 7de5f99847
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18482929

Change-Id: Iddf37afabc69ce843c3f24f4dd563c38fa8a375f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:25:37 +00:00
Calvin Pan
75292dd212 Merge "Avoid getting app locale config for each app" into tm-dev am: 9d6cf4255d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18456663

Change-Id: I0703139669b9134c779ac60cdbf79a6390619837
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:24:59 +00:00
TreeHugger Robot
2b9dd10fa5 Merge "Fix the work profile's deep link problem" into tm-dev 2022-05-20 08:23:15 +00:00
SongFerngWang
7de5f99847 The settings crash when it add the RTL mark on MEP message
The MEP message string is one line, so it did not need to add more
RTL marks.
hsv: https://hsv.googleplex.com/5694452275347456

Bug: 233082642
Test: manually test and take the hsv.
Change-Id: Iad4d469eb6a74805f3c8d5fe5c7eacea1e7a25d3
2022-05-20 12:15:06 +08:00
Jason Chiu
26588fc2e5 Fix the work profile's deep link problem
- Settings shows the work Homepage while starting the work profile's
  icon, which is not allowed.
- Clicking work apps' App info plays an unsmooth window transition
  animation.

Fix: 233296965
Test: manual, robotest
Change-Id: I3d12f6c59692c4a4cc718ea7022b60be50235abb
2022-05-20 12:05:32 +08:00
Calvin Pan
9d6cf4255d Merge "Avoid getting app locale config for each app" into tm-dev 2022-05-20 01:52:46 +00:00
Bonian Chen
91ab43caae Merge "[Settings] Select RAT in between SIMs for Internet" into tm-dev am: 08b7f53383
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18426347

Change-Id: I75f8f3166166a30bb329920e3799c3fcf840cc14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 11:07:37 +00:00
Bonian Chen
bc36d8bfac Merge "[Settings] Stop network mode query when changing config" into tm-dev am: fccca65c0e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18402157

Change-Id: I14d4cc287c75cc40a1d872f67e6ee9dc8870f435
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 11:07:22 +00:00
Bonian Chen
08b7f53383 Merge "[Settings] Select RAT in between SIMs for Internet" into tm-dev 2022-05-19 10:28:21 +00:00
Bonian Chen
fccca65c0e Merge "[Settings] Stop network mode query when changing config" into tm-dev 2022-05-19 10:27:07 +00:00
Yi-Ling Chuang
33cad52af7 Merge "Guard against the NPE in getTransitionType()" into tm-dev am: 3bf578c73e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447100

Change-Id: I7eec8329791de225cd9ed236c1aa9f95a93079fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 08:43:21 +00:00
Yi-Ling Chuang
3bf578c73e Merge "Guard against the NPE in getTransitionType()" into tm-dev 2022-05-19 08:19:50 +00:00
Bill Yi
2e3963a753 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0aaa6d1154 -s ours am: 72642fa03d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I74ed0cb1ed734cd1a3577c7624311c71495d40ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 01:36:16 +00:00
Bill Yi
72642fa03d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0aaa6d1154 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I54834357925f5ceac577f25ac97c56716e996a2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 01:09:30 +00:00
Kate Montgomery
c99a03e749 Merge "Flag off stickiness of show/hide system setting." into tm-dev am: d79959bd7d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18399916

Change-Id: I6e5e1f64e82a0a6468f004c9c4ce7c49c5ac1424
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:15:31 +00:00
TreeHugger Robot
2937a50efb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c41e921e1c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie3031a2ef7d4a01150289c405cbf19dcaf82d3b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:08:41 +00:00
Bill Yi
6376db2aaf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff3c01f123 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1ae0789784fb7080dc2c346a45ae094dfe45fd8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:08:30 +00:00
TreeHugger Robot
5d509d1564 Merge "Update Spatial audio settings page" into tm-dev am: 6993aa86eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18456662

Change-Id: I613cfceb5bc8ae5f31d0563b84b0658f4826a350
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 21:14:03 +00:00
TreeHugger Robot
69fe472c92 Merge "Guard against the NPE in setPreferenceIcon()" into tm-dev am: cce3381ed4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447101

Change-Id: Id535a8262f3b78f6e65ec33054d4e677c4ad2a95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 21:13:49 +00:00
TreeHugger Robot
52a529c104 Merge "Fix incorrect battery icon showing on the recent apps" into tm-dev am: 1cf78b8b83
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447091

Change-Id: I8f4fcbc18c344d5fdf1283fe6cb84bef0a7cc068
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 21:13:40 +00:00
Bill Yi
1dfa58f5e6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6890a9fd64 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I25159f5a97489d6153aac445dbe0ac5abdddd434
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 21:13:28 +00:00
Arc Wang
7a534025bf Center apps Preference title when there is no summary am: 3cb8171f4f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18426345

Change-Id: I4e08a740115ab9b3888ba86dc7d526c0f6351227
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 21:13:22 +00:00
Chaohui Wang
fd98622f97 Fix flicker in Location page when location is off am: f9ebeadb33
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18402153

Change-Id: I7d1696ebc3f6d06d0b7fcc295b00966d82f44daa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 21:13:05 +00:00
Hugh Chen
4e0eaf1624 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 06139d3ffc am: c2bb599eeb -s ours am: 8ddd1d70b2 -s ours am: 22ce749aa6 -s ours am: 8ce854af29 -s ours am: 136af4e593 -s ours am: 40ed71c895 -s ours am: c4899bf019 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia3f60db4ca0884a5d6d10c5e8a6a93b0e80cbe3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 21:12:59 +00:00
Hugh Chen
5558b22a8c [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: c44b6fed73 am: d925f52768 -s ours am: 8d4a4b690f -s ours am: f13ceb8aea -s ours am: ddc8e16cd6 -s ours am: 0e568376a3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2af5b27734e676e22473645a2016e43bcc92dee2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 20:26:41 +00:00
Hugh Chen
f189662037 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 9399a699d7 -s ours am: 1e636ad03e -s ours am: dc1023e587 -s ours am: 3d0db8d34f -s ours am: e5d54e867c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7e7ecedd9935d7fd2414d8e1058d53d53351256e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 20:26:34 +00:00
Tom Hsu
b1a5167a8d Merge "[Panlingual] Fix the item clicked is not match target application" into tm-dev am: 45c60f8564
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356600

Change-Id: I91d7d5fce29f38fa94778b5c84f58e4c87cc5153
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 20:26:28 +00:00
TreeHugger Robot
132ffcade3 [automerger skipped] Merge "RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline" into sc-qpr1-dev am: 20457ad117 -s ours am: e26317b97c -s ours am: ce98ad58a5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic424d72d84c3a847f1f514ae30cae9264a45caed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 20:26:19 +00:00
Hugh Chen
501ff023cb [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 663066691e -s ours am: e178179a9e -s ours am: 97299b8c00 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I94b61d42c8365de5ef4efe20ed3e0d83842c7e47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 20:26:17 +00:00
Hugh Chen
6f866f150b [automerger skipped] [automerge] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline 2p: 1c4142e1ae am: 23ab123ba7 -s ours am: a2d6c9a087 -s ours am: eab5e61360 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ieddf63dccdfafead88a6216f4d31f7cef7c33944
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 20:26:09 +00:00
TreeHugger Robot
db2705999a [automerger skipped] Merge "RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline" into sc-v2-dev am: c8603dabf2 -s ours am: 04cc0c8073 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3d947d1317301c14daeca8390adf988ecaee092e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 20:26:02 +00:00
Hugh Chen
c2da472477 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 8bae222489 -s ours am: 6774dbbe03 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I696f30661049e04ced152785d7d4551f2a7d3986
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 20:26:01 +00:00
TreeHugger Robot
a60e8c0f03 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 12a30b9511 -s ours am: 7ab31e744a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie81c1d2094846b33db4ef09e4e4fbdeb6cc915fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 20:22:03 +00:00
Bill Yi
74bc2e20e4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d941a36042 -s ours am: 900e78b59d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5a26d126f265b445dfb89b34b5da388577888f1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 20:21:49 +00:00
Bill Yi
04f012f755 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c8b7a9fe8 -s ours am: 66ad02c375 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I68ecd2e9381df98fd1d5c5bfce54de06dc38c568
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 20:21:31 +00:00
Kate Montgomery
d79959bd7d Merge "Flag off stickiness of show/hide system setting." into tm-dev 2022-05-18 19:21:45 +00:00
TreeHugger Robot
c41e921e1c Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-05-18 14:56:12 +00:00
TreeHugger Robot
6993aa86eb Merge "Update Spatial audio settings page" into tm-dev 2022-05-18 14:43:08 +00:00
TreeHugger Robot
cce3381ed4 Merge "Guard against the NPE in setPreferenceIcon()" into tm-dev 2022-05-18 13:47:47 +00:00
Calvin Pan
1a253baae4 Avoid getting app locale config for each app
Getting app locale config will spend a lot of time. Removing the log
to prevent getting locale-config for each system app.

Bug: 232557302
Test: Saving about 80% under java stack tracing mode
Change-Id: I2e755286a4e493be7fd73028ade8d190f6571e46
2022-05-18 11:15:46 +00:00
TreeHugger Robot
1cf78b8b83 Merge "Fix incorrect battery icon showing on the recent apps" into tm-dev 2022-05-18 10:09:46 +00:00
Alan Huang
bb3f56fc02 Update Spatial audio settings page
Bug: 229048602
Test: local build and verify page
Change-Id: I096eae1bd0ca3acd52e6025963a08b0d60cb8d74
2022-05-18 09:21:01 +00:00
Jason Chiu
65d46ee179 Guard against the NPE in setPreferenceIcon()
Fix: 232902867
Test: robotest
Change-Id: I01f2a6aa8dab9c8e099588e440fc35ed1093592a
2022-05-18 17:07:26 +08:00
Yi-Ling Chuang
b64d3589c1 Guard against the NPE in getTransitionType()
Bug: 232852095
Test: Go to fingerprint enrolling page and see the transition stays the
same(sliding) after this change.

Change-Id: I259eb4362b273f6b297e94d59d6720a9d6bf6373
2022-05-18 16:53:37 +08:00
ykhung
eadeee54bb Fix incorrect battery icon showing on the recent apps
Bug: 232204674
Test: manual
Change-Id: I169a59a2cbdd5f20266235b5c70bd524f08ad454
2022-05-18 12:18:15 +08:00
Bill Yi
6890a9fd64 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic0f549f0b25dd8efcc2dacc5fac86f53bccbc68a
2022-05-17 16:37:48 -07:00
Bonian Chen
fa6c9f3a53 [Settings] Stop network mode query when changing config
Changing the configuration of network mode could take a long time.
In some cases, it blocks the query operation.
This is a change to stop query operation from execution during the time
when configuration is changing.

Bug: 227431634
Test: local
Change-Id: Ifeb16e7e9a0ec3de970fe588a1cce6d31fbba9cd
2022-05-17 15:25:12 +00:00
Kate Montgomery
dc67fb3283 Flag off stickiness of show/hide system setting.
Bug: 191503437
Test: atest SettingsRoboTests
Change-Id: I96e287cb870265e6ce379e64d01f134f8b3dde59
2022-05-17 14:24:41 +00:00
Bonian Chen
61a85eaee7 [Settings] Select RAT in between SIMs for Internet
The internet page RAT need to be selected based on default data SIM.

Bug: 230190055
Test: local
Change-Id: I87edd7a9ddadf877b9cc0c678e3bba423666125e
2022-05-17 18:40:06 +08:00