Malcolm Chen
e99f20cd95
Merge "Rename setDataEnabled to setUserDataEnabled." am: 43b1b97e3e
...
am: 5e90d8ea7a
2018-01-10 00:07:09 +00:00
Malcolm Chen
5e90d8ea7a
Merge "Rename setDataEnabled to setUserDataEnabled."
...
am: 43b1b97e3e
2018-01-09 23:56:14 +00:00
Treehugger Robot
43b1b97e3e
Merge "Rename setDataEnabled to setUserDataEnabled."
2018-01-09 23:46:55 +00:00
Malcolm Chen
3aaf94b518
Rename setDataEnabled to setUserDataEnabled.
...
Test: unittest
Bug: 69814555
Change-Id: I1d43dc1d2f720383a2f0be18560fc0fd4ff349fd
Merged-In: I1d43dc1d2f720383a2f0be18560fc0fd4ff349fd
2018-01-08 18:08:01 -08:00
Jack He
dc9b879ef9
Merge "Bluetooth: Use "Disable" in-band ringing instead of "Enable"" am: 80c0656ca6
...
am: e34375b88c
2018-01-08 20:20:47 +00:00
Jack He
e34375b88c
Merge "Bluetooth: Use "Disable" in-band ringing instead of "Enable""
...
am: 80c0656ca6
2018-01-06 17:33:02 +00:00
Treehugger Robot
80c0656ca6
Merge "Bluetooth: Use "Disable" in-band ringing instead of "Enable""
2018-01-05 20:41:01 +00:00
Jack He
7d563bd1de
Bluetooth: Use "Disable" in-band ringing instead of "Enable"
...
* Given that in-band ringing is enabled by default on supported devices,
the corresponding development settings should be rephrased from
"Enable in-band ringing" to "Disable in-band ringing" to hint that it
is enabled by default
* This also gets rid of special logic to check that option in
initialization
* Add strings to reflect this change as well
Bug: 65383086
Test: make, try toggling the preference and verify whether in-band
ringing works or not
Change-Id: I29f91c7d12c725b12452ec163b75051ff28f500d
Merged-In: I29f91c7d12c725b12452ec163b75051ff28f500d
2018-01-04 17:23:57 -08:00
Akiya Utsumi
9dffb28afd
Merge "Fix the format of wifi_carrier_content string" am: 985b432fc0
...
am: 47ba3b400c
2017-12-27 21:45:58 +00:00
Akiya Utsumi
47ba3b400c
Merge "Fix the format of wifi_carrier_content string"
...
am: 985b432fc0
2017-12-27 21:43:20 +00:00
Treehugger Robot
985b432fc0
Merge "Fix the format of wifi_carrier_content string"
2017-12-27 21:36:40 +00:00
Akiya Utsumi
28fcc97d1b
Fix the format of wifi_carrier_content string
...
Carrier name is not displayed on the dialog due to the
incorrect format "%1%s". This should be "%1$s".
Test: String change, manually verified
Bug: 70814622
Change-Id: Ie30b8d1eb85d390e4023e0a251e1f1c7fa6deec0
2017-12-22 05:38:12 +00:00
Fan Zhang
c1ecf35052
Merge "DO NOT MERGE: Fix test failure in CodeInspectionTest" am: 7c46a79a00 -s ours
...
am: 7e3fdede58
2017-12-22 01:22:59 +00:00
Fan Zhang
7e3fdede58
Merge "DO NOT MERGE: Fix test failure in CodeInspectionTest"
...
am: 7c46a79a00
2017-12-22 01:13:32 +00:00
Treehugger Robot
7c46a79a00
Merge "DO NOT MERGE: Fix test failure in CodeInspectionTest"
2017-12-22 01:01:41 +00:00
Fan Zhang
6be8dfc9b7
DO NOT MERGE: Fix test failure in CodeInspectionTest
...
Change-Id: I74fbd30261fa66636c915936270d873e7612cbc6
Fixes: 70496869
Test: robotests
2017-12-21 15:42:41 -08:00
goneil
50f5d8cf66
Merge "Set EDITED column to USER_EDITED when editing APN" am: 90d284cab7
...
am: 1b0c8335e3
2017-12-20 00:41:52 +00:00
goneil
1b0c8335e3
Merge "Set EDITED column to USER_EDITED when editing APN"
...
am: 90d284cab7
2017-12-20 00:39:32 +00:00
Treehugger Robot
90d284cab7
Merge "Set EDITED column to USER_EDITED when editing APN"
2017-12-20 00:36:53 +00:00
Bill Yi
5855abd505
Import translations. DO NOT MERGE am: 596de5e45c -s ours
...
am: 1f229d3710
2017-12-19 18:26:45 +00:00
Bill Yi
1f229d3710
Import translations. DO NOT MERGE
...
am: 596de5e45c
2017-12-19 18:24:44 +00:00
Bill Yi
d704c83a85
Import translations. DO NOT MERGE
...
am: 1e9183e0c0
2017-12-19 18:24:12 +00:00
Bill Yi
596de5e45c
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ie62b3a6c465b7d0f011cfdc5e51fb3f195ed4306
2017-12-18 20:43:20 -08:00
Bill Yi
1e9183e0c0
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ib8ace3f2052b60e0623095c5647b9c9c3b2c199c
2017-12-18 20:37:58 -08:00
rongrong.x.gao
fbc9e954d7
Merge "Launch new Home app when selecting Home app in Settings" am: f05fc290b7
...
am: b0ab6da4e3
2017-12-18 22:19:28 +00:00
rongrong.x.gao
b0ab6da4e3
Merge "Launch new Home app when selecting Home app in Settings"
...
am: f05fc290b7
2017-12-18 22:16:32 +00:00
Treehugger Robot
f05fc290b7
Merge "Launch new Home app when selecting Home app in Settings"
2017-12-18 22:09:25 +00:00
rongrong.x.gao
b573e23b48
Launch new Home app when selecting Home app in Settings
...
Launches the newly selected Home app when it has been selected in
Default Home app settings. This CL makes the change take effect
immediately, instead of when the Home button is pressed.
Bug: 70697830
Test: make RunSettingsRoboTests
Test: Manual - Change default home app in Settings
Change-Id: If7e2956bc6f8ddba0a7e8da48a0d38e3936c57e9
2017-12-16 12:44:01 +09:00
tiansiming
576e159641
Merge "Fix NPE when press ttsEngines settings icon" am: 4b6e1b0758
...
am: 57b9039750
2017-12-15 22:38:29 +00:00
tiansiming
57b9039750
Merge "Fix NPE when press ttsEngines settings icon"
...
am: 4b6e1b0758
2017-12-15 22:35:52 +00:00
Treehugger Robot
4b6e1b0758
Merge "Fix NPE when press ttsEngines settings icon"
2017-12-15 22:30:04 +00:00
goneil
a05db0fac9
Set EDITED column to USER_EDITED when editing APN
...
TelephonyProvider switched from defaulting EDITED to USER_EDITED and now
defaults to CARRIER_EDITED in https://android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/570244 .
Therefore, when the user edits the APN, we can no longer rely on the
default implementation
Bug: 67750905
Test: None
Change-Id: I4996b24da94f7c1883c3c802b8edd5e23db580b2
2017-12-15 21:54:25 +00:00
Philip P. Moltmann
e360d51476
Merge "Switch to modern ArgumentMatchers" am: b8bf3bbc72
...
am: ced2263d48
2017-12-15 11:04:48 +00:00
Philip P. Moltmann
ced2263d48
Merge "Switch to modern ArgumentMatchers"
...
am: b8bf3bbc72
2017-12-15 10:48:38 +00:00
Treehugger Robot
b8bf3bbc72
Merge "Switch to modern ArgumentMatchers"
2017-12-15 10:33:13 +00:00
Philip P. Moltmann
a56f6c5bdb
Switch to modern ArgumentMatchers
...
Test: adb shell am instrument -w -e class com.android.settings.vpn2.PreferenceListTest com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner
Change-Id: Id2e4684f6d3048cfb60fee1f747d0796c157a3da
2017-12-14 09:48:33 -08:00
Robin Lee
df5053e85b
Merge "Handle getActiveAdmins() == null safely." am: d46153c3d3
...
am: 70a6dfd647
2017-12-13 17:28:34 +00:00
Robin Lee
70a6dfd647
Merge "Handle getActiveAdmins() == null safely."
...
am: d46153c3d3
2017-12-13 17:24:00 +00:00
Treehugger Robot
d46153c3d3
Merge "Handle getActiveAdmins() == null safely."
2017-12-13 17:16:38 +00:00
Android Build Merger (Role)
937902f2f5
Merge "Import translations. DO NOT MERGE am: 1d6d60f251 -s ours" into oc-mr1-dev
...
am: ad44ea442b
2017-12-13 13:23:07 +00:00
Bill Yi
b63129a388
Import translations. DO NOT MERGE
...
am: e30af484ff
2017-12-13 13:22:04 +00:00
Android Build Merger (Role)
ad44ea442b
Merge "Import translations. DO NOT MERGE am: 1d6d60f251 -s ours" into oc-mr1-dev
2017-12-13 13:19:40 +00:00
Bill Yi
ae0da91c1c
Import translations. DO NOT MERGE
...
am: 1d6d60f251
2017-12-13 13:19:06 +00:00
Hemant Gupta
40069b5ee2
Merge "Bluetooth: Add support for PBAP UI preference" am: f689d1aaa7
...
am: 0b4c0ebbe4
2017-12-13 01:57:51 +00:00
Wang wenrui
9b3b72f6b2
Merge "Fix screen freeze when changing display size in Multi-Window mode" am: 2051822bb9
...
am: b2a6489139
2017-12-13 01:56:50 +00:00
Hemant Gupta
0b4c0ebbe4
Merge "Bluetooth: Add support for PBAP UI preference"
...
am: f689d1aaa7
2017-12-13 01:27:46 +00:00
Wang wenrui
b2a6489139
Merge "Fix screen freeze when changing display size in Multi-Window mode"
...
am: 2051822bb9
2017-12-13 01:26:52 +00:00
Treehugger Robot
f689d1aaa7
Merge "Bluetooth: Add support for PBAP UI preference"
2017-12-13 00:30:42 +00:00
Bill Yi
1d6d60f251
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: If249fffda6df063fd39ec95e4ba04b412a1ea9e1
2017-12-12 16:25:18 -08:00
Bill Yi
e30af484ff
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I37fb135ddf373093ede9b1d56bf6452ea52ef093
2017-12-12 16:19:14 -08:00
