Jordan Liu
ff1e05840f
Merge "Refresh subscription info when subid changes" into pi-dev
...
am: c07bb01f75
2018-09-28 12:17:49 -07:00
TreeHugger Robot
c07bb01f75
Merge "Refresh subscription info when subid changes" into pi-dev
2018-09-28 19:00:35 +00:00
Fan Zhang
eb43cc70c8
Clean up task affinity.
...
am: ff3652e0a3
2018-09-26 15:23:11 -07:00
Fan Zhang
ff3652e0a3
Clean up task affinity.
...
If activity is launched through external intent, back button should just
go back to previous screen.
Change-Id: I5b2e57d2751f5ed7c17140d3eb8d54736b78053c
Merged-In: I5b2e57d2751f5ed7c17140d3eb8d54736b78053c
Bug: 112254258
Fixes: 111864355
Test: manual
2018-09-26 17:53:05 +00:00
Leon Liao
af7aed6d79
Merge "Rename isConnectable()" am: ec65174f11
...
am: 09385137e3
2018-09-26 06:14:55 -07:00
Leon Liao
09385137e3
Merge "Rename isConnectable()"
...
am: ec65174f11
2018-09-26 05:59:20 -07:00
Leon Liao
ec65174f11
Merge "Rename isConnectable()"
2018-09-25 23:06:20 +00:00
Youming Ye
d976002dea
Merge "Wrong Carrier Config values are used in ApnSettings for Multi SIM device" am: b7e3552b83
...
am: 31576aae7c
2018-09-25 10:27:22 -07:00
Youming Ye
31576aae7c
Merge "Wrong Carrier Config values are used in ApnSettings for Multi SIM device"
...
am: b7e3552b83
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
bfe80e39f2
Merge "ApnEditor: Consider subId when reading carrier config" am: f6f7079709
...
am: db353e2c4a
2018-09-24 10:57:37 -07:00
Torbjorn Eklund
db353e2c4a
Merge "ApnEditor: Consider subId when reading carrier config"
...
am: f6f7079709
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
Bill Yi
a553a09700
[automerger skipped] Import translations. DO NOT MERGE
...
am: 5a4269d21e
2018-09-22 16:02:30 -07: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
6ef05a6c23
Merge "Fix incorrect API invoke for BT profiles" am: 625c1eeaa9
...
am: dbc26b576c
2018-09-21 13:20:16 -07:00
Lei Yu
dbc26b576c
Merge "Fix incorrect API invoke for BT profiles"
...
am: 625c1eeaa9
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
Bill Yi
7c6679fac0
[automerger skipped] Import translations. DO NOT MERGE
...
am: 1a84e070b3
2018-09-17 14:51:52 -07:00
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
88cbe51f27
Merge "Clean up: delete unused methods" am: 41f9566da8
...
am: b371dea0cb
2018-09-12 17:39:21 -07:00
Fan Zhang
b371dea0cb
Merge "Clean up: delete unused methods"
...
am: 41f9566da8
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
309d86f613
Merge "Changes on Settings UI for a better user experience" am: 7737b64159
...
am: 97cb71e978
2018-09-12 16:25:12 -07:00
Fan Zhang
97cb71e978
Merge "Changes on Settings UI for a better user experience"
...
am: 7737b64159
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
Bill Yi
a0bfe20b35
[automerger skipped] Import translations. DO NOT MERGE
...
am: 85c82c5681
2018-09-12 15:30:03 -07: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
59cd5abb96
Merge "Fix a crash when launching app detail for bad package name" am: ada1a39ffb
...
am: 2e2e1e243d
2018-09-11 18:49:12 -07:00
Fan Zhang
2e2e1e243d
Merge "Fix a crash when launching app detail for bad package name"
...
am: ada1a39ffb
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
8a25b25da1
[automerger skipped] Merge "Add config to disable app tray preview in display size." am: 98a1ebedcd -s ours
...
am: 4e8e6c3e67
2018-09-11 13:27:34 -07:00
Fan Zhang
4e8e6c3e67
[automerger skipped] Merge "Add config to disable app tray preview in display size."
...
am: 98a1ebedcd
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
Fan Zhang
6097b78d62
[automerger skipped] Merge "DO NOT MERGE Import clean up." am: 8a2c9e79b0 -s ours
...
am: 86e0ae5b6a
2018-09-10 09:31:09 -07:00
Fan Zhang
86e0ae5b6a
[automerger skipped] Merge "DO NOT MERGE Import clean up."
...
am: 8a2c9e79b0
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
803b260bda
[automerger skipped] Import translations. DO NOT MERGE
...
am: 22360f9706
2018-09-08 21:21:36 -07: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
d81c0c4c44
[automerger skipped] Update PBAP info for all pairing dialogs. DO NOT MERGE am: ff171eff8e am: 618b808b61 am: c05958ecdd -s ours
...
am: 6ec0b21544
2018-09-07 10:56:57 -07:00
jackqdyulei
6ec0b21544
[automerger skipped] Update PBAP info for all pairing dialogs. DO NOT MERGE am: ff171eff8e am: 618b808b61
...
am: c05958ecdd
2018-09-07 10:51:10 -07:00
jackqdyulei
c05958ecdd
Update PBAP info for all pairing dialogs. DO NOT MERGE am: ff171eff8e
...
am: 618b808b61
2018-09-07 10:46:08 -07:00
