Commit Graph

90932 Commits

Author SHA1 Message Date
hoffc
b4831d9fde Settings: Fix FC when learn more textview help intent is NULL
Click the learn more textview in footer preference and trigger its help intent action. FC occurs when its help intent is NULL.

Add NULL check and hide the learn more textview if its help intent is not set.

Buganizer: 216401549

Change-Id: I3bad6814ef399d1ecd3003649edf42102478242b
Merged-In: I4e7a7c926205be1179d55d33ada345024c8a44ab
2022-01-27 06:08:19 +00:00
TreeHugger Robot
bcf447c371 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 4636172136 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I46d04c4185b62f87cdb3dd1ab315871f052655a3
2022-01-26 17:07:10 +00:00
TreeHugger Robot
4636172136 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-01-26 16:53:16 +00:00
TreeHugger Robot
c54ae54340 Merge changes from topic "presubmit-am-c45b2d983b9d4ec78289228420413054" into sc-v2-dev-plus-aosp
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2953e0c45f
  Import translations. DO NOT MERGE ANYWHERE
2022-01-26 16:53:16 +00:00
Bill Yi
acb6773c38 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4dab10d29f -s ours am: aa11fcd96f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idabfcd4e31707f1c52036f1af2d477bf1a6c7d95
2022-01-26 15:49:48 +00:00
Bill Yi
7c8beef704 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4dab10d29f -s ours am: 30ee2e7136 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If5dddd432bf6f9f56e8c3febcab1b204bcc8a80b
2022-01-26 15:42:27 +00:00
Bill Yi
aa11fcd96f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4dab10d29f -s ours
am skip reason: subject contains skip directive

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

Change-Id: If9823276258e918fa2721294a41fb31057a6b723
2022-01-26 15:36:41 +00:00
Bill Yi
30ee2e7136 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4dab10d29f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I62e3fe5f3d402d641b715ebf75420984f987d223
2022-01-26 15:36:35 +00:00
Bill Yi
ce7fdd781e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c556615f57 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I32b1cf2f17562e58b37a475de95e59aab1ba0d30
2022-01-26 15:34:58 +00:00
Etienne Ruffieux
865cad2665 Removed mocked BluetoothAdapter
Bluetooth adapter can not be mocked anymore, using config
resource instead.

Tag: #feature
Bug: 216422716
Test: robotest
Change-Id: I92e503cbceb8412031c7f3b08a3e1016d38da18c
2022-01-26 13:26:00 +00:00
Julia Reynolds
87d1db904e Update notification settings OWNERS
Change-Id: Ic69ea984ab439f1d2795daf82c516878aed420ce
2022-01-25 21:38:29 +00:00
Etienne Ruffieux
32c19cf335 Merge "Replaced use of Bluetooth resource by SystemApi" am: 49a9361062 am: 6f6f5e6b42 am: fe5b587245
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1939113

Change-Id: I96bcc99cc3eb5d1dab33246f1046bd646c72e119
2022-01-25 15:02:12 +00:00
Etienne Ruffieux
fe5b587245 Merge "Replaced use of Bluetooth resource by SystemApi" am: 49a9361062 am: 6f6f5e6b42
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1939113

Change-Id: Iacc8c75d24c864a55be7b32f4abe1cd09d76f045
2022-01-25 14:44:54 +00:00
Etienne Ruffieux
6f6f5e6b42 Merge "Replaced use of Bluetooth resource by SystemApi" am: 49a9361062
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1939113

Change-Id: Ieb884abbad772e2295f00aba59962472dec3de8d
2022-01-25 14:22:26 +00:00
Etienne Ruffieux
49a9361062 Merge "Replaced use of Bluetooth resource by SystemApi" 2022-01-25 14:00:08 +00:00
Bill Yi
c556615f57 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic56844c2efc174d299775ff03b2abc3f10d49de9
2022-01-25 06:32:40 +00:00
Bill Yi
4dab10d29f Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic26c56697a7c78fde677f39f63562fa8327d4b2d
2022-01-25 06:29:10 +00:00
Bill Yi
86cab2cd66 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e4ca28a0d0
Blank merge reason: commit message contains skip directive

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

Change-Id: If1bb4c3824bdba9640309da80b4b7168b32076f3
2022-01-25 06:25:53 +00:00
Bill Yi
e4ca28a0d0 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I09e6df9ed565dcd098d1b1a98c51786fe5d87785
2022-01-25 06:25:43 +00:00
Bill Yi
c7a1715bba [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2953e0c45f
Blank merge reason: commit message contains skip directive

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

Change-Id: I8b7853dcf3ca7a60f033306d29ad519fecd0941d
2022-01-25 06:18:22 +00:00
Bill Yi
2953e0c45f Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8e9c6c97c110158c929e9b80da1f105a6182644d
2022-01-25 06:18:14 +00:00
Xiao Ma
f621c4ba14 Fix EthernetManager.addListener dependency in Tethering settings.
Ethernet service related files are going to be moved into Connectivity
module. EthernetManager.addListener(listener, exectuor) will be exposed
out as module-lib API. Replace the current API usage with the one to be
exposed.

android.os.HandlerExecutor is a hidden API which isn't visible to modules,
try to replace HanlderExecutor class with Handler.post itself although
Setttings can still access this API.

Bug: 210586283
Test: m
Change-Id: I618b43769c68897f4724fae8213181be1cc770c6
2022-01-25 04:49:16 +00:00
Jack Yu
a579ca7554 Do not let guest user disable secure nfc
Bug: 209446496
Test: manual
Merged-In: I7253f7f08fde04e30400a30d9a0d24f1ceff04b0
Change-Id: I7253f7f08fde04e30400a30d9a0d24f1ceff04b0
(cherry picked from commit d9e3e6e4b1)
2022-01-22 07:56:25 +00:00
Joshua Mccloskey
80670f39c9 Merge "Added lottie animations for udfps side/tip" into sc-v2-dev am: 6a6fb6b78b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16440683

Change-Id: I2e39ea48ae3511e9111dacd09b9381386763d33d
2022-01-20 00:55:15 +00:00
Joshua Mccloskey
6a6fb6b78b Merge "Added lottie animations for udfps side/tip" into sc-v2-dev 2022-01-20 00:33:05 +00:00
Joshua Mccloskey
21a4342048 Added lottie animations for udfps side/tip
Bug: 209807883
Test: Verified animations show for multiple devices.
Change-Id: Ic63a0eca226309b92aa64cb4f80791ef179b8154
Merged-In: Ic63a0eca226309b92aa64cb4f80791ef179b8154
2022-01-19 20:47:42 +00:00
TreeHugger Robot
51e3455fb3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 572b59c465 -s ours am: e7e23fad18 -s ours am: 7f1e201765 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iabf003db6b4a69d391de7558ca0c2abedec339ab
2022-01-14 18:52:24 +00:00
Bill Yi
3f8aa72445 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a6f38c19f8 -s ours am: bbf27131c6 -s ours am: 9a7585cd87 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic4c3335464f421bdd11cd0b1eac33fd07635ab8c
2022-01-14 18:52:19 +00:00
TreeHugger Robot
38fcd6362d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 87e5157b5a -s ours am: 5714ee98e2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iee685c52023305cd1d7a3747533db5c03d4e396f
2022-01-14 18:52:03 +00:00
Bill Yi
ed8abb4c03 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d56130c5e -s ours am: 64c5aafe71 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iedc647606d100269f9695c445f028b13b2848d99
2022-01-14 18:51:30 +00:00
TreeHugger Robot
11b7ceed5f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 572b59c465 -s ours am: e7e23fad18 -s ours am: d24b5e76b7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I80702cc824b6bdbcaa1acf36abfda73d94f9f3f0
2022-01-14 18:44:21 +00:00
TreeHugger Robot
d24b5e76b7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 572b59c465 -s ours am: e7e23fad18 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5a498809155d4f5ec438dee622d1fd39bcf68a3f
2022-01-14 18:39:32 +00:00
Bill Yi
cef21b1f0d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a6f38c19f8 -s ours am: bbf27131c6 -s ours am: ed6a7764e0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0fb02bc94d4934244be9f896ed32ab7098880031
2022-01-14 18:37:32 +00:00
TreeHugger Robot
71a6671e1f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 87e5157b5a -s ours am: dc9cf72aab -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib053ea13cbf9ffd0760bdb28c8f70dcd8a5f19c8
2022-01-14 18:37:12 +00:00
Bill Yi
a8d53dc128 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d56130c5e -s ours am: 9af90ac95e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib7813deae837eb8512fa0e1ad4db436b0290477c
2022-01-14 18:36:10 +00:00
Bill Yi
0806182787 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0179fc901f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I34f5ffbd921cbd8676a96aa44cd3d8ec8b90498d
2022-01-14 18:35:42 +00:00
TreeHugger Robot
7f1e201765 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 572b59c465 -s ours am: e7e23fad18 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8795a29e447ba68fd1c08d93a8a89508103c8843
2022-01-14 18:34:39 +00:00
TreeHugger Robot
e7e23fad18 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 572b59c465 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2e677ef2a2c919b027b8c565e6b01be47d4724f4
2022-01-14 18:34:27 +00:00
Bill Yi
9a7585cd87 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a6f38c19f8 -s ours am: bbf27131c6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5d3a6241ee538a049846b802553435bdaf9a8698
2022-01-14 18:34:24 +00:00
TreeHugger Robot
5714ee98e2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 87e5157b5a -s ours
am skip reason: subject contains skip directive

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

Change-Id: If38c3dfceaa1a4b436a2ca7f61a6ae7a7b9d3d6f
2022-01-14 18:33:31 +00:00
Bill Yi
ed6a7764e0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a6f38c19f8 -s ours am: bbf27131c6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8669d09a173bce2a7f640dae6bf8a970d51f85dc
2022-01-14 18:33:23 +00:00
Bill Yi
bbf27131c6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a6f38c19f8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I36a0e9655821f97c5fade9d1890c3987202db953
2022-01-14 18:33:17 +00:00
TreeHugger Robot
dc9cf72aab [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 87e5157b5a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I905faea38be17bfb31c559f4a4757d41a1a49a9c
2022-01-14 18:33:11 +00:00
Bill Yi
9af90ac95e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d56130c5e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I75493e6cdc4f9e4d0a4b175e133d59d943b21f00
2022-01-14 18:32:41 +00:00
Bill Yi
64c5aafe71 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d56130c5e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I00652eaf0ba8ed71a916d0c6f074d33838f62a79
2022-01-14 18:32:39 +00:00
TreeHugger Robot
572b59c465 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2022-01-14 18:09:51 +00:00
TreeHugger Robot
87e5157b5a Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2022-01-14 18:09:47 +00:00
Bill Yi
0eab9c02b9 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I962c318f41adcf180b885f2052ce0ec4952edfb6
2022-01-14 09:22:25 +00:00
Bill Yi
a6f38c19f8 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib7868c5698aef46813818165545a388552033564
2022-01-14 09:18:54 +00:00
Bill Yi
9d56130c5e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ie7fde007b60291d37ac3283c0037c3717b2798be
2022-01-14 09:11:12 +00:00