Commit Graph

89967 Commits

Author SHA1 Message Date
TreeHugger Robot
2fc75eba80 Merge "Disable combined controller only if all modalities require consent" into sc-v2-dev am: b84b7d586a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16265888

Change-Id: Idb41f923cdbe1ebc251a1c033d8066404898f768
2021-11-18 03:41:27 +00:00
TreeHugger Robot
b84b7d586a Merge "Disable combined controller only if all modalities require consent" into sc-v2-dev 2021-11-18 03:25:05 +00:00
Makoto Onuki
0fefda6870 Merge "Use different exceptions for different crash reasons" into sc-v2-dev am: fcb067b577
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16276438

Change-Id: I8629b6ad36ffc18364a09f859497fecd93368b98
2021-11-17 18:05:05 +00:00
Makoto Onuki
fcb067b577 Merge "Use different exceptions for different crash reasons" into sc-v2-dev 2021-11-17 17:52:56 +00:00
TreeHugger Robot
6274ca81fa Merge "[DO NOT MERGE] Allow a settings override for double-line clock" into sc-v2-dev am: b13b2fd8ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16276359

Change-Id: I243c8725d48e167e32785ab08ce40864588f1746
2021-11-17 17:41:28 +00:00
Matt Pietal
d8ca5298ec [DO NOT MERGE] Allow a settings override for double-line clock am: cb4836b486
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16276359

Change-Id: Ic95e5a3863b64a2fda813500335ac04db8d6ae56
2021-11-17 17:41:24 +00:00
TreeHugger Robot
b13b2fd8ee Merge "[DO NOT MERGE] Allow a settings override for double-line clock" into sc-v2-dev 2021-11-17 17:12:37 +00:00
ykhung
b84a0ed81a Update "Mobile network standby" attribute label into "Mobile network" am: 13a52a081e am: 938a8bbd26
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16279909

Change-Id: I522a6d7cf980aa12cfd1362c6b901470001ade6c
2021-11-17 14:31:09 +00:00
ykhung
394a0c96fb Update "Mobile network standby" attribute label into "Mobile network" am: 13a52a081e am: 3c1da6b2af
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16279909

Change-Id: I8ded2a15907927eaf5efb90e59405cd22d885ee8
2021-11-17 14:29:25 +00:00
ykhung
938a8bbd26 Update "Mobile network standby" attribute label into "Mobile network" am: 13a52a081e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16279909

Change-Id: Id3d70a338b081edd45c8ca6c1f7fc7e4e41707e9
2021-11-17 14:19:23 +00:00
ykhung
3c1da6b2af Update "Mobile network standby" attribute label into "Mobile network" am: 13a52a081e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16279909

Change-Id: I7588c48981e0a4f351302fd1b38f8c943509375a
2021-11-17 14:19:22 +00:00
Matt Pietal
cb4836b486 [DO NOT MERGE] Allow a settings override for double-line clock
This setting allows users to always show a single-line format clock,
regardless of notification status.

Fixes: 194905512
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display
Change-Id: I94ade1b2d968e5783750e7a98a9a5d28cc22b659
2021-11-17 13:34:36 +00:00
ykhung
13a52a081e Update "Mobile network standby" attribute label into "Mobile network"
Bug: 205051643
Test: make SettingsRoboTests
Change-Id: Ia8f5c3e76d72ffa6fd0601c58b1b3d157b711b30
(cherry picked from commit 22dc875ba7)
2021-11-17 12:35:23 +00:00
TreeHugger Robot
e837096e38 Merge "Fix the CtsVerifier issue" into sc-v2-dev am: 0d96dc50b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16241533

Change-Id: I87216a56ee6cd70ccf6af2318ccafec50642161a
2021-11-17 09:15:06 +00:00
TreeHugger Robot
0d96dc50b5 Merge "Fix the CtsVerifier issue" into sc-v2-dev 2021-11-17 08:58:43 +00:00
SongFerng Wang
9a7f3aaf0e Merge "Lost the registered cellinfo item after the aggregation" into sc-v2-dev am: f0a3348ceb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16262279

Change-Id: I38ea72134e9f0bf453d6125763e4d6af6f323487
2021-11-17 06:55:17 +00:00
SongFerng Wang
f0a3348ceb Merge "Lost the registered cellinfo item after the aggregation" into sc-v2-dev 2021-11-17 06:42:29 +00:00
Bonian Chen
a77928c6f4 Merge "[Settings] Avoid from dialog disappear when click outside" into sc-v2-dev am: fd6ddcd050
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16278918

Change-Id: I80c2ae9f28c8b34579dd883f1976116ac47c47de
2021-11-17 05:55:21 +00:00
Bonian Chen
fd6ddcd050 Merge "[Settings] Avoid from dialog disappear when click outside" into sc-v2-dev 2021-11-17 05:28:34 +00:00
SongFerng Wang
df8cc34945 Merge "Device do network scan after user rotates NetworkSelection page" into sc-v2-dev am: 6b81329fc2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16259258

Change-Id: Iea2dd1448309721f3a57cba3c8c04a0dbae6b4a5
2021-11-17 05:06:07 +00:00
SongFerng Wang
6b81329fc2 Merge "Device do network scan after user rotates NetworkSelection page" into sc-v2-dev 2021-11-17 04:56:04 +00:00
TreeHugger Robot
579723b4b4 Merge "Fix suw display size flicker problem" into sc-v2-dev am: 943d68127c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16234666

Change-Id: Iad78a38a429be9a353176c4fcc529d34ec1023bc
2021-11-17 02:08:45 +00:00
Bonian Chen
7dff8c7210 [Settings] Avoid from dialog disappear when click outside
Avoid dialog from unexpected close when click out of dialog area.
This create better user experience since user might not click to the
correct area all the time.

Bug: 204020202
Test: local
Change-Id: Ice5cde73eb849f3e5722ab778be41615746210c0
(cherry picked from commit 3cb6a7a705)
2021-11-17 02:01:42 +00:00
TreeHugger Robot
943d68127c Merge "Fix suw display size flicker problem" into sc-v2-dev 2021-11-17 01:51:52 +00:00
Gary Jian
782506f61c Merge "Added KEY_VONR_ENABLED_BOOL to obtain VoNR availability status" into sc-v2-dev am: 7f809bda12
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16259269

Change-Id: I1de09d91f66438c4ac521ac7624eae41e9b54b34
2021-11-17 01:46:25 +00:00
Gary Jian
7f809bda12 Merge "Added KEY_VONR_ENABLED_BOOL to obtain VoNR availability status" into sc-v2-dev 2021-11-17 01:34:29 +00:00
Kevin Chyn
156db33a56 Disable combined controller only if all modalities require consent
Additionally, ensure that consent is only requested for modalities
that have not been previously consented to. We retrieve the consent
requirement (which come from DPM) in onActivityResult instead of
onCreate, since the signal may not be ready immediately.

Fixes: 196060286
Fixes: 204592495
Test: make -j56 RunSettingsRoboTests ROBOTEST_FILTER=CombinedBiometricStatusPreferenceControllerTest

Change-Id: I984e61f28ffbf957c16cac4ea84f40b6ad7d8ae9
2021-11-16 12:32:56 -08:00
Makoto Onuki
baacfd7985 Use different exceptions for different crash reasons
Always throwing RemoteServiceException would make it impossible to
tell the cause of a crash without the string message.

Let's use a different exception type so developers can cluster crashes
without the exception message.

Bug: 124137635
Test: Treehugger
Change-Id: Ibae57bdb1b8965241c41249a89c728d224e4e995
2021-11-16 11:59:05 -08:00
Jason Chiu
a6cd1fee05 Merge "Support highlighting the menu entry for Search results" into sc-v2-dev am: c144f7bb89
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16234663

Change-Id: I95ab4ae7fa4c8217d8dfef8ae1a07976681815ee
2021-11-16 07:40:47 +00:00
Jason Chiu
c144f7bb89 Merge "Support highlighting the menu entry for Search results" into sc-v2-dev 2021-11-16 07:28:32 +00:00
TreeHugger Robot
24d2a7e110 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 36ae9f88a2 -s ours am: 868cb753cc -s ours am: 18346ea63d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id262432f3b9e29c8a23a022b1867f3cb535da648
2021-11-16 07:15:15 +00:00
TreeHugger Robot
e8ef94d5b7 Merge changes from topic "presubmit-am-e5fc2544993e448c8c4f747f05252491" into sc-qpr1-dev am: 0bbc6e224f am: 5cd61aab24
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231358

Change-Id: Id90bcdd0ff0e580322c49e49fca66d8e89fc4e6a
2021-11-16 07:14:58 +00:00
Bill Yi
35872d705c [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b546c8aa3e am: 1246b8bc86 -s ours am: 84ac5a3cc4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I31bb907641b260fa735e4a21f50bb0ae8ca3bcae
2021-11-16 07:14:55 +00:00
TreeHugger Robot
e1dcef06bc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 36ae9f88a2 -s ours am: 868cb753cc -s ours am: 0bbf5438d0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia42c8cea48ee57a1c273398ebfe63cfb7947082a
2021-11-16 07:13:36 +00:00
TreeHugger Robot
93c9001958 Merge changes from topic "presubmit-am-e5fc2544993e448c8c4f747f05252491" into sc-qpr1-dev am: 0bbc6e224f am: ed43498d71
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231358

Change-Id: I06561e4fe03390fae22c3027604ef93f1f020502
2021-11-16 07:13:06 +00:00
Bill Yi
0c6c527eac [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b546c8aa3e am: 1246b8bc86 -s ours am: 1ab9266897 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I19f3c4824d9554bf1388496df85bc326c1884824
2021-11-16 07:13:05 +00:00
TreeHugger Robot
0bbf5438d0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 36ae9f88a2 -s ours am: 868cb753cc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I356b281608f37db8d3683a20840bd274e4c5f26d
2021-11-16 06:57:13 +00:00
TreeHugger Robot
18346ea63d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 36ae9f88a2 -s ours am: 868cb753cc -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia8202a8c93f6c61e9c46918b4a51c857d6de6369
2021-11-16 06:57:09 +00:00
TreeHugger Robot
ed43498d71 Merge changes from topic "presubmit-am-e5fc2544993e448c8c4f747f05252491" into sc-qpr1-dev am: 0bbc6e224f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231358

Change-Id: Id969ace896b3a93fc3b3f60a442b65fa445f2a2c
2021-11-16 06:56:52 +00:00
TreeHugger Robot
5cd61aab24 Merge changes from topic "presubmit-am-e5fc2544993e448c8c4f747f05252491" into sc-qpr1-dev am: 0bbc6e224f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231358

Change-Id: I0f1fc30af470911b608ede9ddf9da71911d6e922
2021-11-16 06:56:50 +00:00
Bill Yi
1ab9266897 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b546c8aa3e am: 1246b8bc86 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If64647c33ee377a6bd91099bc6fc81c33ecb9dba
2021-11-16 06:56:50 +00:00
Bill Yi
84ac5a3cc4 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b546c8aa3e am: 1246b8bc86 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2f3b09cf7200c7e1cbeca72ecfeff47575f08c49
2021-11-16 06:56:49 +00:00
TreeHugger Robot
868cb753cc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 36ae9f88a2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I55e9911e89da1f596826b485f21db1b943a60b35
2021-11-16 06:56:46 +00:00
TreeHugger Robot
0bbc6e224f Merge changes from topic "presubmit-am-e5fc2544993e448c8c4f747f05252491" into sc-qpr1-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b546c8aa3e
  Import translations. DO NOT MERGE ANYWHERE
2021-11-16 06:45:14 +00:00
TreeHugger Robot
36ae9f88a2 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-11-16 06:45:14 +00:00
Gary Jian
68b861930a Added KEY_VONR_ENABLED_BOOL to obtain VoNR availability status
Bug: 205809218
Test: atest NrAdvancedCallingPreferenceControllerTest
Change-Id: I45ac1e95d669801c2d37f49943d7c16cfb7adae3
2021-11-16 04:40:08 +00:00
SongFerngWang
4d00bce2b2 Lost the registered cellinfo item after the aggregation
Bug: 204384218
Test: atest NetworkSelectSettingsTest
Change-Id: I8a1af6eadd5852788a5455dd637e1c63316bb802
Merged-In: I163ab8e966de57ddff7939a46fc47b05bea029e3
2021-11-16 11:38:22 +08:00
TreeHugger Robot
b9e7e27808 Merge "Revert "Revert "Update animation for fingerprint edu page""" into sc-v2-dev am: c0cca5c474
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16183660

Change-Id: Id40079bcd0dfc07725fd4a3fb5201cae93f6135a
2021-11-15 19:58:30 +00:00
TreeHugger Robot
c0cca5c474 Merge "Revert "Revert "Update animation for fingerprint edu page""" into sc-v2-dev 2021-11-15 19:46:19 +00:00
Bill Yi
a582a5892b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b9dbf91cc7 -s ours am: 73bedcdd7d -s ours am: c2cdc020d3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I14c49baa21f1b7585c11a1f8a026870f2dea0f72
2021-11-15 17:34:51 +00:00