Commit Graph

65104 Commits

Author SHA1 Message Date
tim peng
a607a16c74 Merge "No feedback when attempting to transfer to an unpowered BT device" into rvc-dev am: 75c84f8e64 am: 030845ee3a am: b743aa9312 am: 1ef3a96239
Change-Id: I748353b823fc21d145952e8c57272ffc74f3bdaf
2020-04-06 08:35:22 +00:00
Toby Chuang
50edc49b0c Merge "[NFC] Add a picture under NFC settings to show NFC detection point." into rvc-dev am: 36b00c5e4f am: 88fd6fb1ae
Change-Id: Id7911a1e320eca39d37dfdba2c98b2192b063189
2020-04-06 08:34:17 +00:00
Toby Chuang
b882b03d87 Merge "[NFC] Add a picture under NFC settings to show NFC detection point." into rvc-dev am: 36b00c5e4f am: 3283bf4c82
Change-Id: If8433b74ed3889cab711235b216330c3a06fb43e
2020-04-06 08:34:09 +00:00
Toby Chuang
925f3c4876 Merge "[NFC] Add a picture under NFC settings to show NFC detection point." into rvc-dev am: 36b00c5e4f am: 88fd6fb1ae
Change-Id: I5a6e97de416b0b1bf41846ec7b7ccfdcb0161079
2020-04-06 08:33:29 +00:00
tim peng
11b3b02f70 Merge "No feedback when attempting to transfer to an unpowered BT device" into rvc-dev am: 75c84f8e64 am: cbf16337f4 am: 5850dd1944 am: eb8b8157bd
Change-Id: I9e10c03a7f40667e14ee65b7c117aa8d58920c40
2020-04-06 07:57:17 +00:00
tim peng
aa4de0dc52 Merge "No feedback when attempting to transfer to an unpowered BT device" into rvc-dev am: 75c84f8e64 am: 030845ee3a am: 6dd7b682ea am: 43ea067e3f
Change-Id: I6e594f39c29dbfa1f17459356f16ebbde0a1706f
2020-04-06 07:56:10 +00:00
tim peng
eb8b8157bd Merge "No feedback when attempting to transfer to an unpowered BT device" into rvc-dev am: 75c84f8e64 am: cbf16337f4 am: 5850dd1944
Change-Id: I92de264b22efcc8ae36ce11f541d2c7a3eaefada
2020-04-06 07:46:33 +00:00
tim peng
43ea067e3f Merge "No feedback when attempting to transfer to an unpowered BT device" into rvc-dev am: 75c84f8e64 am: 030845ee3a am: 6dd7b682ea
Change-Id: Ia3694594bf9878dd0f2fddfcdca4d9f8f0e5fe89
2020-04-06 07:45:54 +00:00
tim peng
1ef3a96239 Merge "No feedback when attempting to transfer to an unpowered BT device" into rvc-dev am: 75c84f8e64 am: 030845ee3a am: b743aa9312
Change-Id: I7354ba9b19e16106b0e72e34e50edd2bd92d064a
2020-04-06 07:45:18 +00:00
Toby Chuang
3283bf4c82 Merge "[NFC] Add a picture under NFC settings to show NFC detection point." into rvc-dev am: 36b00c5e4f
Change-Id: Ifd7e71e8dfe85c1e81780e59380041888f95559b
2020-04-06 07:43:13 +00:00
Toby Chuang
88fd6fb1ae Merge "[NFC] Add a picture under NFC settings to show NFC detection point." into rvc-dev am: 36b00c5e4f
Change-Id: I61911efcb9041c9ced1659e593a35d1bd98edd0f
2020-04-06 07:42:53 +00:00
Jason Hsu
feccbccafe Merge "Add accessibility timeout help resources to link to existing help page." into rvc-dev am: eb11b5113c am: ebff648e69 am: 9ae3751972 am: 9e7ec44613 am: 5c36a5ce46
Change-Id: Ife3e0dd19fe17d19fea0eb043d9bee14cdf177d1
2020-04-06 07:33:49 +00:00
tim peng
5850dd1944 Merge "No feedback when attempting to transfer to an unpowered BT device" into rvc-dev am: 75c84f8e64 am: cbf16337f4
Change-Id: I4e65a5c8215d0dc331846aea852ebed8a3eab6d6
2020-04-06 07:28:20 +00:00
tim peng
b743aa9312 Merge "No feedback when attempting to transfer to an unpowered BT device" into rvc-dev am: 75c84f8e64 am: 030845ee3a
Change-Id: Ibb8ccdc60c3046b6a80fad92eb65ae60c12d4091
2020-04-06 07:28:01 +00:00
Toby Chuang
36b00c5e4f Merge "[NFC] Add a picture under NFC settings to show NFC detection point." into rvc-dev 2020-04-06 07:28:00 +00:00
tim peng
6dd7b682ea Merge "No feedback when attempting to transfer to an unpowered BT device" into rvc-dev am: 75c84f8e64 am: 030845ee3a
Change-Id: Ibe89b323ea16390164611b587b42e90886c8f087
2020-04-06 07:26:58 +00:00
Jason Hsu
5c36a5ce46 Merge "Add accessibility timeout help resources to link to existing help page." into rvc-dev am: eb11b5113c am: ebff648e69 am: 9ae3751972 am: 9e7ec44613
Change-Id: I274548a7b424a4e6d949804faab395ab600728f5
2020-04-06 07:14:55 +00:00
tim peng
030845ee3a Merge "No feedback when attempting to transfer to an unpowered BT device" into rvc-dev am: 75c84f8e64
Change-Id: I19cafa9e4f74298f647af7045d6254bad43b9c02
2020-04-06 07:14:09 +00:00
tim peng
cbf16337f4 Merge "No feedback when attempting to transfer to an unpowered BT device" into rvc-dev am: 75c84f8e64
Change-Id: I2167996ca2d0fac7aafc664d5a45dfcb0c2c752e
2020-04-06 07:06:57 +00:00
tim peng
75c84f8e64 Merge "No feedback when attempting to transfer to an unpowered BT device" into rvc-dev 2020-04-06 07:06:03 +00:00
Automerger Merge Worker
de1047d99e Merge "Merge "Add accessibility timeout help resources to link to existing help page." into rvc-dev am: eb11b5113c am: 69d43f7426" into rvc-d1-dev-plus-aosp am: 727d66960c am: de294f74f3
Change-Id: I0a563eb067044dd3581b14f317108d97d1537726
2020-04-06 07:03:22 +00:00
Jason Hsu
9b686cb30c Merge "Add accessibility timeout help resources to link to existing help page." into rvc-dev am: eb11b5113c am: ebff648e69 am: ea81cc24fe am: 1bc930b242
Change-Id: Iccc965b1a7a6df7c98c92625b0387d26cf81a164
2020-04-06 07:03:09 +00:00
Jason Hsu
9e7ec44613 Merge "Add accessibility timeout help resources to link to existing help page." into rvc-dev am: eb11b5113c am: ebff648e69 am: 9ae3751972
Change-Id: If64f551e2dd1cb03a4d95e4e798f38bf944a29dd
2020-04-06 06:53:44 +00:00
Automerger Merge Worker
de294f74f3 Merge "Merge "Add accessibility timeout help resources to link to existing help page." into rvc-dev am: eb11b5113c am: 69d43f7426" into rvc-d1-dev-plus-aosp am: 727d66960c
Change-Id: I737711e3099cdf6a5b73c5d272173495f77f3899
2020-04-06 06:50:44 +00:00
Jason Hsu
1bc930b242 Merge "Add accessibility timeout help resources to link to existing help page." into rvc-dev am: eb11b5113c am: ebff648e69 am: ea81cc24fe
Change-Id: Icd028d41c7f18bf23a31426b3909aedc5e30a3c7
2020-04-06 06:50:30 +00:00
Automerger Merge Worker
727d66960c Merge "Merge "Add accessibility timeout help resources to link to existing help page." into rvc-dev am: eb11b5113c am: 69d43f7426" into rvc-d1-dev-plus-aosp 2020-04-06 06:35:01 +00:00
Jason Hsu
aaddedbf11 Merge "Add accessibility timeout help resources to link to existing help page." into rvc-dev am: eb11b5113c am: 69d43f7426
Change-Id: Ifae39e213753214ea5f7509fa6ab336b05247db4
2020-04-06 06:34:57 +00:00
Jason Hsu
ea81cc24fe Merge "Add accessibility timeout help resources to link to existing help page." into rvc-dev am: eb11b5113c am: ebff648e69
Change-Id: I3ffaf67d885b13241208794ff2e59ee665fcd820
2020-04-06 06:34:53 +00:00
Jason Hsu
9ae3751972 Merge "Add accessibility timeout help resources to link to existing help page." into rvc-dev am: eb11b5113c am: ebff648e69
Change-Id: Ia9c69515c1e4ed77b20c5de04bac9ca0404f21da
2020-04-06 06:34:47 +00:00
TreeHugger Robot
c8e470451e Merge "Update permission summary when permission changing." into rvc-dev am: d81224b7d4 am: bf57fc64e2 am: c193222b18 am: f47b2ddae6 am: 7e100e8eab
Change-Id: I3b819b78685b3fb4361591e432423552bef1076e
2020-04-06 06:25:58 +00:00
TreeHugger Robot
7e100e8eab Merge "Update permission summary when permission changing." into rvc-dev am: d81224b7d4 am: bf57fc64e2 am: c193222b18 am: f47b2ddae6
Change-Id: Ia22c6c84a629784351ea61793350460f463c09a1
2020-04-06 06:18:09 +00:00
Jason Hsu
69d43f7426 Merge "Add accessibility timeout help resources to link to existing help page." into rvc-dev am: eb11b5113c
Change-Id: Ia718f9ffbb78184ba23dc69e13bfdfb064fdec70
2020-04-06 06:17:32 +00:00
Automerger Merge Worker
dee9aff46c Merge "Merge "Update permission summary when permission changing." into rvc-dev am: d81224b7d4 am: 8482a5396a" into rvc-d1-dev-plus-aosp am: b733061311 am: 6eb74846d3
Change-Id: I513f00a71baa6c5acd9d84fe7aa48d61505d8944
2020-04-06 06:17:29 +00:00
TreeHugger Robot
4af2946272 Merge "Update permission summary when permission changing." into rvc-dev am: d81224b7d4 am: bf57fc64e2 am: feb1b3547a am: a9e7353473
Change-Id: I7949f81b65919939f4cc8c63bc3d68a6c4bfc636
2020-04-06 06:17:15 +00:00
Jason Hsu
ebff648e69 Merge "Add accessibility timeout help resources to link to existing help page." into rvc-dev am: eb11b5113c
Change-Id: I09ed471e8c28bd803134ed40a9e9876608f2b337
2020-04-06 06:17:10 +00:00
TreeHugger Robot
f47b2ddae6 Merge "Update permission summary when permission changing." into rvc-dev am: d81224b7d4 am: bf57fc64e2 am: c193222b18
Change-Id: I7fa7df9cae00eb53d7a8eb385684ab1f7007fcc5
2020-04-06 06:05:33 +00:00
Automerger Merge Worker
6eb74846d3 Merge "Merge "Update permission summary when permission changing." into rvc-dev am: d81224b7d4 am: 8482a5396a" into rvc-d1-dev-plus-aosp am: b733061311
Change-Id: I2350ff47b47a088d381968ebf3b0e10bfc859760
2020-04-06 06:05:25 +00:00
TreeHugger Robot
a9e7353473 Merge "Update permission summary when permission changing." into rvc-dev am: d81224b7d4 am: bf57fc64e2 am: feb1b3547a
Change-Id: Ibbb3242a0e4e8c5c68791505fe645e2c3f153eda
2020-04-06 06:05:16 +00:00
Jason Hsu
eb11b5113c Merge "Add accessibility timeout help resources to link to existing help page." into rvc-dev 2020-04-06 05:56:18 +00:00
Automerger Merge Worker
b733061311 Merge "Merge "Update permission summary when permission changing." into rvc-dev am: d81224b7d4 am: 8482a5396a" into rvc-d1-dev-plus-aosp 2020-04-06 05:49:56 +00:00
TreeHugger Robot
610c4486be Merge "Update permission summary when permission changing." into rvc-dev am: d81224b7d4 am: 8482a5396a
Change-Id: Id5c991732e85b45bd492ae7263f6798a12d0137b
2020-04-06 05:49:52 +00:00
TreeHugger Robot
feb1b3547a Merge "Update permission summary when permission changing." into rvc-dev am: d81224b7d4 am: bf57fc64e2
Change-Id: I11ae2175b744ad2dcf33164bfae8b9c99ec6cf5d
2020-04-06 05:49:50 +00:00
TreeHugger Robot
c193222b18 Merge "Update permission summary when permission changing." into rvc-dev am: d81224b7d4 am: bf57fc64e2
Change-Id: I82098553d60f60eb4bdd0e1eaaa7343981c02755
2020-04-06 05:49:46 +00:00
TreeHugger Robot
b27a20a968 [automerger skipped] Merge "Hide unprovisioned MDN (phone number) at select profile dialog" into qt-qpr1-dev am: 9643b9c727 -s ours am: f1418dc437 -s ours am: 6e187d076b -s ours am: 0e0119d83a -s ours am: e48b6a0539 -s ours am: e1a9e9bb78 -s ours
am skip reason: Change-Id If84600cc426fefcdd219c4a44a5510b8db5c0a89 with SHA-1 6758ca661e is in history

Change-Id: Icce5e2ebfb147c25bcd2b0dda7f797ebbde995e8
2020-04-06 05:39:08 +00:00
TreeHugger Robot
8482a5396a Merge "Update permission summary when permission changing." into rvc-dev am: d81224b7d4
Change-Id: Icbba62d578e37990f69b319c689365aea14527d4
2020-04-06 05:38:51 +00:00
Mark Chien
ec8f27fd15 Merge "Ethernet tethering: change char limit to NONE" into rvc-dev am: e0399b18ba am: b4f3d54445 am: c24bd8b0f8 am: e27e788970 am: 387b6bb2ff
Change-Id: Ic95582784580f2e6de08350eff08a0740fa0cd5f
2020-04-06 05:38:46 +00:00
TreeHugger Robot
bf57fc64e2 Merge "Update permission summary when permission changing." into rvc-dev am: d81224b7d4
Change-Id: I3de538d7575f4691e0aa09538bbbee19ec326493
2020-04-06 05:38:35 +00:00
Toby Chuang
204fa8a420 [NFC] Add a picture under NFC settings to show NFC detection point.
Each smartphone has a different NFC antenna detection point,
users would confuse where the NFC antenna is and how to place the
smartphone close to the card reader/equipment.

Starting from Android R device, we move NFC antenna position from
top area to middle center of the phone.

From the OEMs perspective, they could implement their own picture
to indicate the best NFC detection point.Hence, we propose to
show NFC antenna position under NFC setting.

Bug: 142230563
Test: build pass
Change-Id: Ib3cd7fc3ea299be1667aba0aeebaa148fb49015f
2020-04-06 13:37:31 +08:00
TreeHugger Robot
d81224b7d4 Merge "Update permission summary when permission changing." into rvc-dev 2020-04-06 05:22:01 +00:00
TreeHugger Robot
e1a9e9bb78 [automerger skipped] Merge "Hide unprovisioned MDN (phone number) at select profile dialog" into qt-qpr1-dev am: 9643b9c727 -s ours am: f1418dc437 -s ours am: 6e187d076b -s ours am: 0e0119d83a -s ours am: e48b6a0539 -s ours
am skip reason: Change-Id If84600cc426fefcdd219c4a44a5510b8db5c0a89 with SHA-1 6758ca661e is in history

Change-Id: Ia5683f05e7f0d1c06f1b53d40ecfd8af5194b33a
2020-04-06 05:21:38 +00:00