Lorenzo Colitti
6181c64279
[automerger skipped] Merge "Add Ethernet Tethering settings" am: 526741a2f2
am: 2b54956856
-s ours
...
am skip reason: Change-Id Ia4f365ddc1a53a926d716046db3e6ac463c978b9 with SHA-1 557e457278
is in history
Change-Id: I65c4a2add8ac4dd8cb9cc81d28726f35eb37e833
2020-04-06 15:48:56 +00:00
Lorenzo Colitti
2b54956856
Merge "Add Ethernet Tethering settings" am: 526741a2f2
...
Change-Id: I475283b47906ae6fa2fba6fd4ddb506a266c398c
2020-04-06 15:28:41 +00:00
Lorenzo Colitti
526741a2f2
Merge "Add Ethernet Tethering settings"
2020-04-06 15:11:31 +00:00
Treehugger Robot
36055efcaf
Merge "Usb preference title changed when rotating" am: fb2690102b
am: b2c2d6e968
am: ff9a2901f6
...
Change-Id: If80476f05262bc2738fc5eea0215b47a480cbe3a
2020-04-06 14:18:05 +00:00
Julia Reynolds
0d89715e0a
Merge "Update history flow" into rvc-dev am: cb7fbe0faa
am: 221cdd5d7e
...
Change-Id: I67d170d5e71e1f0e4b848538ac7f2e00e1543dba
2020-04-06 14:17:31 +00:00
Treehugger Robot
ff9a2901f6
Merge "Usb preference title changed when rotating" am: fb2690102b
am: b2c2d6e968
...
Change-Id: If0734764d1859e72edd2056c55a800a3742c5761
2020-04-06 14:16:52 +00:00
Julia Reynolds
dd6ce8335b
Merge "Update history flow" into rvc-dev am: cb7fbe0faa
am: dffd1ba351
...
Change-Id: I72383db82a8cbbbee6f8ed4c38a24418743fa8b3
2020-04-06 14:16:39 +00:00
Bonian Chen
1b36fda316
[Settings] mSubId should not be overridden in TelephonyBasePreferenceController
...
mSubId is a protected member provided by parent class.
Overriding mSubId should be avoided.
Bug: 150535296
Test: manual
Merged-In: I391b034c9badd43094ab52b8b6488bca07ef3c86
Change-Id: I65fda30d1e699695315eb57d8930a27fdebb5a46
2020-04-06 22:01:13 +08:00
Julia Reynolds
dffd1ba351
Merge "Update history flow" into rvc-dev am: cb7fbe0faa
...
Change-Id: I19e879f61ff9259a0a4d021d35d9c96648bc8705
2020-04-06 13:55:17 +00:00
Julia Reynolds
221cdd5d7e
Merge "Update history flow" into rvc-dev am: cb7fbe0faa
...
Change-Id: Iffad2fc3b6981fa086fdf191c7e404918fc5ad79
2020-04-06 13:55:05 +00:00
Treehugger Robot
b2c2d6e968
Merge "Usb preference title changed when rotating" am: fb2690102b
...
Change-Id: Iba767119b8b098ba4aa38beda885775edf35274f
2020-04-06 13:55:01 +00:00
Julia Reynolds
ae9060246b
Add a developer setting for conversation enforcement
...
Test: Robo tests
Fixes: 152907434
Change-Id: I4e16faf817349993a98955601829d1ad22fa3921
2020-04-06 09:53:31 -04:00
Bonian Chen
5ab1c6cb61
[Settings] Changes for supporting replacing ImsManager
...
Wrap IMS related APIs in order to support replacing ImsManager.
Bug: 140542283
Test: build pass
Merged-In: I10aff50b6f3fc50b2f336ee320740f9f4a81e256
Change-Id: Ibc8c1c36fe031a3d845b99f878ef45ce5db7de28
2020-04-06 21:43:05 +08:00
Treehugger Robot
fb2690102b
Merge "Usb preference title changed when rotating"
2020-04-06 13:39:56 +00:00
Julia Reynolds
cb7fbe0faa
Merge "Update history flow" into rvc-dev
2020-04-06 13:37:33 +00:00
Bill Yi
a03995505f
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I0ee248806b1d77ca266c5ee47cc1420adfa465e6
2020-04-06 05:48:37 -07:00
Bill Yi
3aacc4e59a
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: If158e0aa6e1832b4d72901bb3fead8e1db4272c4
2020-04-06 05:16:34 -07:00
TreeHugger Robot
ac9656953e
Merge "[Wi-Fi] Fix EntityHeader signal strength icon invisible problem" into rvc-dev am: 8efea18ca2
am: 6f6e197af7
...
Change-Id: I00228b5addf5c27587903c7d36c0929bd6cbb46e
2020-04-06 12:01:21 +00:00
TreeHugger Robot
6deed59468
Merge "[Wi-Fi] Fix EntityHeader signal strength icon invisible problem" into rvc-dev am: 8efea18ca2
am: 1bff922997
...
Change-Id: I0a060f85dbcd830b15fdd6e24d23616abd43f331
2020-04-06 12:00:24 +00:00
TreeHugger Robot
6f6e197af7
Merge "[Wi-Fi] Fix EntityHeader signal strength icon invisible problem" into rvc-dev am: 8efea18ca2
...
Change-Id: I12cec44de49244db52de730fd8915966bd9c6918
2020-04-06 11:41:15 +00:00
TreeHugger Robot
1bff922997
Merge "[Wi-Fi] Fix EntityHeader signal strength icon invisible problem" into rvc-dev am: 8efea18ca2
...
Change-Id: If3729a013ffcead7ab339cce0a99edb30b6177d4
2020-04-06 11:41:07 +00:00
TreeHugger Robot
8efea18ca2
Merge "[Wi-Fi] Fix EntityHeader signal strength icon invisible problem" into rvc-dev
2020-04-06 11:29:05 +00:00
Arc Wang
62e3a8276e
[Wi-Fi] Fix EntityHeader signal strength icon invisible problem
...
WifiDetailPreferenceController2#onUpdated() triggers each controller
to displayPreference(PreferenceScreen screen) for visibility
updating. However, WifiDetailPreferenceController2 is a much
complex controller which should controll it's components visibility
by itself.
Bug: 152886237
Test: manual visual
Observe EntityHeader signal strength icon UI display.
Change-Id: I80a8341ae051f21410070a81e01716eb49d2c8da
2020-04-06 17:24:01 +08: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
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
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
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
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
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
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
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
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
8482a5396a
Merge "Update permission summary when permission changing." into rvc-dev am: d81224b7d4
...
Change-Id: Icbba62d578e37990f69b319c689365aea14527d4
2020-04-06 05:38:51 +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
e61629a352
[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: 6d4ac39033
-s ours
...
am skip reason: Change-Id If84600cc426fefcdd219c4a44a5510b8db5c0a89 with SHA-1 6758ca661e
is in history
Change-Id: Ida0739d05c8d32426ea28e967ad4517892e39030
2020-04-06 04:39:55 +00:00
Mark Chien
82d1bb8aba
Merge "Ethernet tethering: change char limit to NONE" into rvc-dev am: e0399b18ba
am: 6803712526
...
Change-Id: I8b06b6f5130aa53fa349f5db2b434d5626f45457
2020-04-06 04:39:45 +00:00
TreeHugger Robot
e2a959f025
[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 skip reason: Change-Id If84600cc426fefcdd219c4a44a5510b8db5c0a89 with SHA-1 2fa2d083c7
is in history
Change-Id: Ic52b45ee084813098c233a776f7ea8838f3f63a7
2020-04-06 04:38:55 +00:00
Mark Chien
c161952940
Merge "Ethernet tethering: change char limit to NONE" into rvc-dev am: e0399b18ba
am: b4f3d54445
...
Change-Id: I6d8d190e919e0d637089c66f53b815113a30331a
2020-04-06 04:38:46 +00:00