Commit Graph

44038 Commits

Author SHA1 Message Date
TreeHugger Robot
07cb063579 Merge "Simplify the duplicate click checker logic" into tm-dev am: 02d3965634
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515216

Change-Id: I470de9e89f9b36b2797a8260d7617e96712c52da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 10:51:57 +00:00
SongFerngWang
0167a4d8a6 [LE unicast] Disable the "phone calls" when LE is enabled
The "phone calls" uses the Headset profile, not HFP profile. The ui
uses the wrong profile. It causes the "phone calls" is always enabled
when LE is enabled.

Bug: 231511825
Test: build pass
Change-Id: Ib507352107c0d825b8c7a9605713bc9083259fbd
Merged-In: Ib507352107c0d825b8c7a9605713bc9083259fbd
2022-05-23 17:34:48 +08:00
Håkan Kvist
6f1b6e3693 Call CardDatabaseHelper.getInstance() when used and not in onCreate
Providers can be created before onCreate is called on the application.
Calling CardDatabaseHelper.getInstance() too early will cause
ContextualCardLoader to call getAppllicationContext before application
has been fully started.

Postpone calling CardDatabaseHelper.getInstance() until database is
accessed.

Test: Start device with sim card inserted and Pin enabled on sim.
  Wait some time before entering sim pin. After entering pin, open
  settings. Verify that settings does not crash.
  Verify that there is no contentProvider exceptions from settings in log.
Bug: 154076590
Change-Id: Id0b6294ca2aeebdc71076299928c4dea5145ba33
2022-05-23 09:08:30 +02:00
Angela Wang
35387d3d4c Merge "Add a button to the accessibility button tutorial dialog that links directly to the settings page." 2022-05-23 07:00:33 +00:00
Jason Chiu
5bc2dc4ae9 Simplify the duplicate click checker logic
Test: manual
Bug: 215267159
Change-Id: I7724883b351d360525c51d31714b7e31855a6c82
2022-05-23 12:57:19 +08:00
Chaohui Wang
008b8fdb5d Merge "Fix Conversation page flickers when back" into tm-dev am: 0dc89bc85c am: 0d6569d199 am: 456a27bee3 am: 3fdd89556e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490674

Change-Id: Iaee1a5e9407ff497682a3f0d79cb3851c24e04ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-21 03:05:19 +00:00
Chaohui Wang
3fdd89556e Merge "Fix Conversation page flickers when back" into tm-dev am: 0dc89bc85c am: 0d6569d199 am: 456a27bee3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490674

Change-Id: I98d0c3ab385539d258baad72beb048aa0c563e43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-21 02:44:42 +00:00
Chaohui Wang
456a27bee3 Merge "Fix Conversation page flickers when back" into tm-dev am: 0dc89bc85c am: 0d6569d199
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490674

Change-Id: I3b9ae5d0e02db28f8965d158d97937b8b2603433
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-21 02:28:32 +00:00
Chaohui Wang
52507eb518 Merge "Fix Conversation page flickers when back" into tm-dev am: 0dc89bc85c am: f61254af3c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490674

Change-Id: I54efb9201eb76f49297a86ce9aac430c2fbd7989
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-21 02:28:27 +00:00
Chaohui Wang
f61254af3c Merge "Fix Conversation page flickers when back" into tm-dev am: 0dc89bc85c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490674

Change-Id: I59fbcd9e9646f2a7fab8fd0410768b08b06f6512
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-21 02:10:18 +00:00
Chaohui Wang
0d6569d199 Merge "Fix Conversation page flickers when back" into tm-dev am: 0dc89bc85c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490674

Change-Id: I911dc4f729e7d6eeb0fda8b12f16d8a153cb6bc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-21 02:08:39 +00:00
Chaohui Wang
0dc89bc85c Merge "Fix Conversation page flickers when back" into tm-dev 2022-05-21 01:54:27 +00:00
Edgar Wang
8691006c5c Merge "Update learn more string of FooterPrefernce" into tm-dev am: 24654a3d61 am: eaa0a1cf5c am: 21ddf79998 am: b9a06a9f34
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356903

Change-Id: I74b97b4b7d7a009af0dd20fe9f1a24717fffd3f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-21 00:28:03 +00:00
Edgar Wang
b9a06a9f34 Merge "Update learn more string of FooterPrefernce" into tm-dev am: 24654a3d61 am: eaa0a1cf5c am: 21ddf79998
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356903

Change-Id: I2f7ce317b7bb9d355fbb1e5f0fc2aacb1da7f8d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-21 00:02:22 +00:00
Edgar Wang
42704ba27c Merge "Update learn more string of FooterPrefernce" into tm-dev am: 24654a3d61 am: 4d371adf7f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356903

Change-Id: I70547c9094cdd200f1fa2a77272affbcbe308a34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 23:52:43 +00:00
Edgar Wang
21ddf79998 Merge "Update learn more string of FooterPrefernce" into tm-dev am: 24654a3d61 am: eaa0a1cf5c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356903

Change-Id: If0fba8bf4c69645bf8cc6a153580ed7cda57610d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 23:51:54 +00:00
Edgar Wang
4d371adf7f Merge "Update learn more string of FooterPrefernce" into tm-dev am: 24654a3d61
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356903

Change-Id: Id0599efcfd1a61b12e4e759afb76259f14fdd5ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 23:25:32 +00:00
Edgar Wang
eaa0a1cf5c Merge "Update learn more string of FooterPrefernce" into tm-dev am: 24654a3d61
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356903

Change-Id: I10a24e8723d555c9bf81ee0efff9dea9d56bf736
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 23:24:36 +00:00
Edgar Wang
24654a3d61 Merge "Update learn more string of FooterPrefernce" into tm-dev 2022-05-20 23:13:07 +00:00
TreeHugger Robot
5149074245 Merge "Filter out the duplicate click event on menu page" into tm-dev am: baa2c48575 am: f36d767679 am: 12cc3aeae0 am: 8734e549a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486285

Change-Id: Ibd6a252dcbbcf15b7cba7c3770876422c2b29827
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 20:14:01 +00:00
TreeHugger Robot
8734e549a0 Merge "Filter out the duplicate click event on menu page" into tm-dev am: baa2c48575 am: f36d767679 am: 12cc3aeae0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486285

Change-Id: Ib2aafb5ccca14534c30a6d3b555bc9fdec8e9879
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 19:54:16 +00:00
TreeHugger Robot
12cc3aeae0 Merge "Filter out the duplicate click event on menu page" into tm-dev am: baa2c48575 am: f36d767679
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486285

Change-Id: I468f2cce8f5d67055addc01ef4749b1cf98b5896
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 19:33:43 +00:00
TreeHugger Robot
ef922caf2e Merge "Filter out the duplicate click event on menu page" into tm-dev am: baa2c48575 am: 96d31478ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486285

Change-Id: I72bbadfe8be1d2710704dc5c85d54c0d7d6ff6f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 19:24:51 +00:00
TreeHugger Robot
f36d767679 Merge "Filter out the duplicate click event on menu page" into tm-dev am: baa2c48575
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486285

Change-Id: I2a4e530320564961901f96af333e47dd019aa226
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 19:14:12 +00:00
TreeHugger Robot
96d31478ab Merge "Filter out the duplicate click event on menu page" into tm-dev am: baa2c48575
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486285

Change-Id: Ife6c05fc69d672a15d1bbbb8e06ba87e2f3a3ef9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 18:58:15 +00:00
TreeHugger Robot
baa2c48575 Merge "Filter out the duplicate click event on menu page" into tm-dev 2022-05-20 18:18:58 +00:00
Hank Sheng
f01376e612 Merge "Apply the glifv3 theme when the theme string in intentExtra is glifv4." into tm-dev am: 841964c02b am: 37c36d0c63 am: 9fb34ae376 am: ac59647901
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18492029

Change-Id: I1275208f464e76aa24d6058620fb271f02c80c1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 17:49:13 +00:00
Hank Sheng
ac59647901 Merge "Apply the glifv3 theme when the theme string in intentExtra is glifv4." into tm-dev am: 841964c02b am: 37c36d0c63 am: 9fb34ae376
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18492029

Change-Id: Ib2ecd69665ad7e35c7f8c15823388e9ad75d721f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 17:22:38 +00:00
Hank Sheng
033a744c95 Merge "Apply the glifv3 theme when the theme string in intentExtra is glifv4." into tm-dev am: 841964c02b am: 434e728bce
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18492029

Change-Id: Iac318ff0b836ac2148c1c08f28298655f8596fb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 17:06:50 +00:00
Hank Sheng
9fb34ae376 Merge "Apply the glifv3 theme when the theme string in intentExtra is glifv4." into tm-dev am: 841964c02b am: 37c36d0c63
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18492029

Change-Id: I4aa2af07a568f4a67e47d52959f74004f4c8990c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 17:06:48 +00:00
Hank Sheng
37c36d0c63 Merge "Apply the glifv3 theme when the theme string in intentExtra is glifv4." into tm-dev am: 841964c02b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18492029

Change-Id: I155d06cf2e6c0adf93426d35075b8ebeb71b84be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 16:49:13 +00:00
Hank Sheng
434e728bce Merge "Apply the glifv3 theme when the theme string in intentExtra is glifv4." into tm-dev am: 841964c02b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18492029

Change-Id: I11fd085f1798f2ebaab2b14951716038379e2848
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 16:47:41 +00:00
Hank Sheng
841964c02b Merge "Apply the glifv3 theme when the theme string in intentExtra is glifv4." into tm-dev 2022-05-20 16:27:56 +00:00
Jason Chiu
e04dfaa29e Filter out the duplicate click event on menu page
Whenever the highlighted item is clicked, Settings shouldn't start the
second-layer page again even if the user goes to its child page.
Ex. When the user goes to the Tethering page, clicking on the menu
entry "Network & Internet" should not switch to the page.

Exception: in the deep link case, allow the first click event on the
highlighted item to launch the second-layer page when the page is not
the same as the one on the right pane.

Fix: 215267159
Test: manual, robotest
Change-Id: I2315e0069facc4867cb157752b1a3144716b7d17
2022-05-20 15:01:31 +00:00
TreeHugger Robot
9701c991ee Merge "Revert "Show previous query upon configuration change"" into tm-dev am: fea570f524 am: 4ffd6caf54 am: 420b448fd1 am: 8329fa64cc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486386

Change-Id: I0f7a0d1c0e8e69bf0849fc3105c15018a05d6449
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:56:58 +00:00
TreeHugger Robot
00ef8da5f4 Merge "Show mobile data icon with carrier Wi-Fi level in Settings" into tm-dev am: f16c90f91d am: dd1ad333a8 am: 2b09ae4f4e am: facd82dd9f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18467044

Change-Id: I897e405bb5874ec8d3f956d9bf312a3e8c924f8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:55:49 +00:00
Chaohui Wang
2cf9780748 Merge "Add the jank detection to Settings toggles" into tm-dev am: a47f9bb17f am: ca86110548 am: c41f9a953a am: 0f1658d013
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18212942

Change-Id: I298b0de2dcfe6a914cb74bc9947bd5780a48cca5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:44:18 +00:00
TreeHugger Robot
db44776759 Merge "Fix the work profile's deep link problem" into tm-dev am: 2b9dd10fa5 am: 9bfff8cb94 am: a1c0813203 am: fb834c0eb7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18482928

Change-Id: I96805fd3ed1890ccf7c2899229113f2465473828
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:25:25 +00:00
SongFerngWang
5031a2b55a The settings crash when it add the RTL mark on MEP message am: 7de5f99847 am: ee2536f3f5 am: 4b1585ebe7 am: 11ea0c10e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18482929

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

Change-Id: I338747caf6721db96102f1f5a266dde8f1ebfdd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:24:18 +00:00
SongFerng Wang
9782c4093c Merge "[LE unicast] Disable the "phone calls" when LE is enabled" am: 27b4578002 am: d28816fcc3 am: db328a03fb am: 50ca1ab7fd am: b9973caf84
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2100870

Change-Id: Ie97ebf38b61e71004ed270f485f974c63b6bc7a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:15:07 +00:00
TreeHugger Robot
8329fa64cc Merge "Revert "Show previous query upon configuration change"" into tm-dev am: fea570f524 am: 4ffd6caf54 am: 420b448fd1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486386

Change-Id: I6e4dd7854a850464c619869b13e3ec0712246512
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:11:22 +00:00
TreeHugger Robot
facd82dd9f Merge "Show mobile data icon with carrier Wi-Fi level in Settings" into tm-dev am: f16c90f91d am: dd1ad333a8 am: 2b09ae4f4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18467044

Change-Id: I05d8dde18618c2448348c67696c1fe81a49d401d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:11:15 +00:00
Chaohui Wang
0f1658d013 Merge "Add the jank detection to Settings toggles" into tm-dev am: a47f9bb17f am: ca86110548 am: c41f9a953a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18212942

Change-Id: Ic3efbb187a24fba979eb16d6b1445d89a3f60cfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:07:24 +00:00
TreeHugger Robot
6a2136b93a Merge "Revert "Show previous query upon configuration change"" into tm-dev am: fea570f524 am: 4ffd6caf54
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486386

Change-Id: I0c4ea8367b14a7ac81867587cddb97a1152f61ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:05:57 +00:00
TreeHugger Robot
7a8d582874 Merge "Show mobile data icon with carrier Wi-Fi level in Settings" into tm-dev am: f16c90f91d am: dd1ad333a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18467044

Change-Id: I4848c74965cff5d2b192d3ae90027fcdfbff818e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:05:39 +00:00
TreeHugger Robot
420b448fd1 Merge "Revert "Show previous query upon configuration change"" into tm-dev am: fea570f524 am: 4ffd6caf54
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486386

Change-Id: I1735fdce61730866db7122abbb7260cff78e0688
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:56:58 +00:00
TreeHugger Robot
2b09ae4f4e Merge "Show mobile data icon with carrier Wi-Fi level in Settings" into tm-dev am: f16c90f91d am: dd1ad333a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18467044

Change-Id: Ib5725637f0f6aac6f358c1d9126ca879abc50776
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:56:35 +00:00
TreeHugger Robot
fb834c0eb7 Merge "Fix the work profile's deep link problem" into tm-dev am: 2b9dd10fa5 am: 9bfff8cb94 am: a1c0813203
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18482928

Change-Id: Ica593ef828869f76eb1da304b6e60c38178d36da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:55:34 +00:00
Chaohui Wang
c41f9a953a Merge "Add the jank detection to Settings toggles" into tm-dev am: a47f9bb17f am: ca86110548
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18212942

Change-Id: I940d194f592ab6f9b7ea43e4e078c0914078418c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:55:13 +00:00