Commit Graph

46029 Commits

Author SHA1 Message Date
Leon Liao
09385137e3 Merge "Rename isConnectable()"
am: ec65174f11

Change-Id: Ibfc536ba78a118bc33890e52efa6650b21bff62e
2018-09-26 05:59:20 -07:00
Leon Liao
ec65174f11 Merge "Rename isConnectable()" 2018-09-25 23:06:20 +00:00
Youming Ye
31576aae7c Merge "Wrong Carrier Config values are used in ApnSettings for Multi SIM device"
am: b7e3552b83

Change-Id: I14a7f51ace0637a6248fe13f9a4dc46ee4b9c0a1
2018-09-25 10:20:06 -07:00
Youming Ye
b7e3552b83 Merge "Wrong Carrier Config values are used in ApnSettings for Multi SIM device" 2018-09-25 17:04:10 +00:00
Torbjorn Eklund
db353e2c4a Merge "ApnEditor: Consider subId when reading carrier config"
am: f6f7079709

Change-Id: I8d49e7f38528da4f5fc0cd18eecfd59854b7505f
2018-09-24 10:48:00 -07:00
Treehugger Robot
f6f7079709 Merge "ApnEditor: Consider subId when reading carrier config" 2018-09-24 17:24:03 +00:00
Rick Yiu
0732628bf7 Add null check for vrManager
If VrManagerService is not started, vrManager will be null. Need
add check for it.

Test: robotests
Bug: 116427118
Change-Id: I899337bb5a996efffe82970fa690f2c5d59c1bb5
Merged-In: I899337bb5a996efffe82970fa690f2c5d59c1bb5
2018-09-24 04:45:59 +00:00
Bill Yi
5a4269d21e Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I4317549e4010bb2cf75b07ade3cb8d54ba6dc708
2018-09-22 11:38:37 -07:00
Lei Yu
dbc26b576c Merge "Fix incorrect API invoke for BT profiles"
am: 625c1eeaa9

Change-Id: I1a7f98b25cae2695d8f5895c8f6e03072ef4600f
2018-09-21 13:13:39 -07:00
Lei Yu
625c1eeaa9 Merge "Fix incorrect API invoke for BT profiles" 2018-09-21 19:50:45 +00:00
jackqdyulei
c7a83b2552 Fix incorrect API invoke for BT profiles
When hearing aid device has been set active, we shouldn't invoke
1. a2dpProfile.setActiveDevice()
2. hfpProfile.setActiveDevice()

Change-Id: Ie13dea041dd98d0cb9d913e1f28574b300095db9
Merged-In: Ie13dea041dd98d0cb9d913e1f28574b300095db9
Fixes: 113625278
Test: RunSettingsRoboTests
2018-09-20 12:38:26 -07:00
Torbjorn Eklund
ae8e62f4d0 ApnEditor: Consider subId when reading carrier config
Considers subId when reading carrier config values
KEY_READ_ONLY_APN_TYPES_STRING_ARRAY and
KEY_READ_ONLY_APN_FIELDS_STRING_ARRAY.

This ensures that the APN will be editable or non-editable correctly
when using dual sim.

Bug: 112929355
Test: Manual
Change-Id: I2186dd5e1f71ca5361309a7314f84cf4fa2d3937
2018-09-20 13:12:54 +00:00
Leon Liao
6786e32a73 Rename isConnectable()
LocalBluetoothProfile.isConnectable() checks whether the user can initiate a connection
for a specific profile, not really whether the profile is connectable.

Change-Id: If6c6cd1554acf35db2460ea6ddb65148a7e86e45
Bug: 79982487
Test: atest tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java
2018-09-20 09:23:30 +08:00
Sandeep Gutta
fe6ddaec99 Fix error message shown when SIM PIN enable/disable fails
Current code fails to pass the 3GPP spec test case 27.14.3
'Disabling the PIN'.

An Incorrect toast error message is displayed, when enable/disable
SIM PIN operation fails without checking the error code.

Fix: Display appropriate toast error message based on the SIM PIN
enable/disable error code.

Bug: 73080305
Change-Id: I4219c68c7ebcf450a2f779b2d1f1ce881440753b
2018-09-18 12:21:51 +05:30
Bill Yi
1a84e070b3 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I0c4b9cded799380c969e2acf1aac3c5a785dc81f
2018-09-17 12:35:35 -07:00
Fan Zhang
b371dea0cb Merge "Clean up: delete unused methods"
am: 41f9566da8

Change-Id: I973b289c688c04c00f70a6c0ba15a5b205d6633a
2018-09-12 17:12:54 -07:00
Fan Zhang
41f9566da8 Merge "Clean up: delete unused methods" 2018-09-12 23:46:31 +00:00
Fan Zhang
97cb71e978 Merge "Changes on Settings UI for a better user experience"
am: 7737b64159

Change-Id: I591b6eac611109bd903c99f79ecd63d37ca59511
2018-09-12 16:13:08 -07:00
Fan Zhang
7737b64159 Merge "Changes on Settings UI for a better user experience" 2018-09-12 22:44:39 +00:00
Fan Zhang
409a5f8c98 Clean up: delete unused methods
Test: rebuild
Change-Id: I144ebbdaf137ee091af949a9e38f68d02941f705
2018-09-12 13:08:15 -07:00
Jin Dong
c085694cc2 Changes on Settings UI for a better user experience
Oem can change the left padding and right padding of main text
in below screens by overlay the relative dimens:
 - "Network settings reset"
 - "Factory data reset"
 - "Screen pinning"

Bug: 113607004
Test: manual
Change-Id: Ief1afd6ee05b9723874866a06f1748d9d9987333
2018-09-12 12:26:18 -07:00
Bill Yi
85c82c5681 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I6f84ca21470e0f9224b2c038b25757f70ff25c8a
2018-09-12 12:07:42 -07:00
Fan Zhang
2e2e1e243d Merge "Fix a crash when launching app detail for bad package name"
am: ada1a39ffb

Change-Id: Ia96ca4a889e9005da4e685b8e04ae2d6b78eff85
2018-09-11 18:28:08 -07:00
Treehugger Robot
ada1a39ffb Merge "Fix a crash when launching app detail for bad package name" 2018-09-12 00:57:40 +00:00
Jordan Liu
efbe93ab5c Refresh subscription info when subid changes
We store the initial subId and check if it has changed so that we always
have the updated subscription info in fillList().

Fixes: 111731641
Test: manually verify that swapping the SIM loads new APNs
Change-Id: I3475915f2c380fb67b2e56436423d491e489d91e
Merged-In: I29492ef016c8ca9836ecf28c787e441629cfecb0
2018-09-11 15:27:11 -07:00
Fan Zhang
13d2551156 Fix a crash when launching app detail for bad package name
Change-Id: I3bfb5f8e003b810c09d295bc89f4a59af186a121
Fixes: 78779901
Test: robotests
2018-09-11 15:12:16 -07:00
Fan Zhang
4e8e6c3e67 [automerger skipped] Merge "Add config to disable app tray preview in display size."
am: 98a1ebedcd  -s ours

Change-Id: I36fb69986ab30b14f3040de35cbd9aaa6d7969b1
2018-09-11 13:13:33 -07:00
Fan Zhang
98a1ebedcd Merge "Add config to disable app tray preview in display size." 2018-09-11 16:27:57 +00:00
Fan Zhang
18eecb1e67 Add config to disable app tray preview in display size.
Also move some files

Change-Id: I4636fcd81425991acadede0b703e09513c82543c
Merged-In: I4636fcd81425991acadede0b703e09513c82543c
Fixes: 113374067
Test: robotests
2018-09-10 19:01:35 -07:00
android-build-team Robot
c645a99a8b Merge cherrypicks of [4986743, 4986744, 4987539, 4987168, 4986376, 4986377, 4986378, 4986889, 4986745, 4986746, 4986747, 4986748, 4986749, 4986750, 4986773, 4987169, 4987170, 4987611, 4987631, 4987632, 4987633, 4987634, 4986890, 4987612, 4987651, 4987598, 4987613, 4987614, 4987615, 4987599, 4986379, 4986380, 4987652, 4987653, 4987691, 4986774] into pi-qpr1-release
Change-Id: I9ffc062718d9e2cd9b06ef489f9a05b44339e500
2018-09-10 23:21:24 +00:00
jackqdyulei
0f52a07037 Update PBAP info for all pairing dialogs. DO NOT MERGE
This is a bug from ag/4210612, in which it only update PBAP info
for USER_ENTRY_DIALOG. So in other kind of dialogs it never upload
correct PBAP info to bluetooth backend.

This CL fix it by updating PBAP for all dialogs.

Change-Id: Ia39eee1acaece555e8e5a305ec2c803294d7efbd
Bug: 109842273
Bug: 72872376
Test: RunSettingsRoboTests
(cherry picked from commit 7015e20a55)
(cherry picked from commit 77b62b24c6)
2018-09-10 23:20:15 +00:00
Fan Zhang
86e0ae5b6a [automerger skipped] Merge "DO NOT MERGE Import clean up."
am: 8a2c9e79b0  -s ours

Change-Id: Id958f79e2c26f0276a02714b5b4d3ec9b8c2327a
2018-09-10 09:27:07 -07:00
Fan Zhang
8a2c9e79b0 Merge "DO NOT MERGE Import clean up." 2018-09-10 15:58:34 +00:00
Bill Yi
22360f9706 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I77779e462781ec27ccf1122e7dcac6fd170cad5f
2018-09-08 18:11:46 -07:00
jackqdyulei
6ec0b21544 [automerger skipped] Update PBAP info for all pairing dialogs. DO NOT MERGE am: ff171eff8e am: 618b808b61
am: c05958ecdd  -s ours

Change-Id: I57dfe29eff8188f32d64d003781d4b63b4d151ad
2018-09-07 10:51:10 -07:00
jackqdyulei
c05958ecdd Update PBAP info for all pairing dialogs. DO NOT MERGE am: ff171eff8e
am: 618b808b61

Change-Id: Id92a02a67661e0b7707564b7d83a7ff7f27854e1
2018-09-07 10:46:08 -07:00
jackqdyulei
618b808b61 Update PBAP info for all pairing dialogs. DO NOT MERGE
am: ff171eff8e

Change-Id: I21d048a1ad2d0e37870d380c30e95ee8e3a48091
2018-09-07 10:42:16 -07:00
android-build-team Robot
e0908da459 Merge cherrypicks of [4963114, 4963471, 4963115, 4962921, 4963491] into pi-qpr1-release
Change-Id: Icbb8916d8a497c8507844f55bca7677958ee6f81
2018-09-07 01:09:10 +00:00
Fan Zhang
3dba0abc61 Move safety & regulatory manual closer to legal settings
Bug: 113788849
Test: visual
Change-Id: Ie9a706bad9a4c65ff06c2350171ad55f46dd8386
Merged-In: Ie9a706bad9a4c65ff06c2350171ad55f46dd8386
(cherry picked from commit f5ccd33567)
2018-09-07 01:08:56 +00:00
TreeHugger Robot
f81ec88024 Merge "Move safety & regulatory manual closer to legal settings" into pi-dev 2018-09-07 01:05:45 +00:00
jackqdyulei
ff171eff8e Update PBAP info for all pairing dialogs. DO NOT MERGE
This is a bug from ag/4210612, in which it only update PBAP info
for USER_ENTRY_DIALOG. So in other kind of dialogs it never upload
correct PBAP info to bluetooth backend.

This CL fix it by updating PBAP for all dialogs.

Change-Id: Ia39eee1acaece555e8e5a305ec2c803294d7efbd
Merged-In: Ia39eee1acaece555e8e5a305ec2c803294d7efbd
Bug: 109842273
Bug: 72872376
Test: RunSettingsRoboTests
(cherry picked from commit 7015e20a55)
2018-09-06 16:35:58 -07:00
Fan Zhang
f5ccd33567 Move safety & regulatory manual closer to legal settings
Bug: 113788849
Test: visual
Change-Id: Ie9a706bad9a4c65ff06c2350171ad55f46dd8386
Merged-In: Ie9a706bad9a4c65ff06c2350171ad55f46dd8386
2018-09-06 22:50:32 +00:00
TreeHugger Robot
205479c25d Merge "Update PBAP info for all pairing dialogs. DO NOT MERGE" into pi-dev 2018-09-06 20:00:37 +00:00
Fan Zhang
de117046ad DO NOT MERGE Import clean up.
Reordered all imports according to Android codestyle.

Test: rebuild
Change-Id: I750f01f70f2114d51838bf652833aebdc4065c98
2018-09-04 13:54:46 -07:00
tiansiming [田思明]
662e59e628 Merge "Update string for message of DirectBootWarnDialog"
am: b0cc3a6c7d

Change-Id: Ie04be9cf61a87fcc2b866d4effd0d27ca21064db
2018-09-04 12:55:11 -07:00
Treehugger Robot
b0cc3a6c7d Merge "Update string for message of DirectBootWarnDialog" 2018-09-04 19:46:18 +00:00
tiansiming [田思明]
e8dfb36df2 Update string for message of DirectBootWarnDialog
Some users feedback to us that they are not very clear of the
meaning of the string 'direct_boot_unaware_dialog_message'.
The updated one may be more clear.

Bug: https://partnerissuetracker.corp.google.com/u/0/issues/72197006
Test: manual test. Go to the Available virtual keyboard interface,
turn on a 3rd party ime keyboard and check the message.

Change-Id: Ib3a999601fa40f678956550d8941b7cb1db8a9af
Signed-off-by: tiansiming [田思明] <tiansiming@xiaomi.com>
2018-09-04 17:02:07 +00:00
Bill Yi
94fdfc4a44 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I6b44e763661339eab9182743abd1e3cb4d8bdbcd
2018-08-30 19:02:59 -07:00
Youming Ye
7c4b70c6e5 Merge "Fix the Wifi Calling back button goes to wrong screen"
am: 903d2610dd

Change-Id: I41466f3f6e77c66f77550900193320b48a123d21
2018-08-30 15:28:44 -07:00
Youming Ye
903d2610dd Merge "Fix the Wifi Calling back button goes to wrong screen" 2018-08-30 22:03:06 +00:00