Fan Zhang
6e65a32468
[automerger skipped] Merge "DO NOT MERGE Fix color_lint errors"
...
am: fcaf926dc1
2018-08-28 11:38:27 -07:00
Treehugger Robot
fcaf926dc1
Merge "DO NOT MERGE Fix color_lint errors"
2018-08-28 18:03:31 +00:00
Fan Zhang
516f6dd0d3
DO NOT MERGE Fix color_lint errors
...
Test: repo upload
Change-Id: I83abb69123e1365cf90db2ab0f60c3a6330f2828
2018-08-28 17:18:49 +00:00
Doris Ling
51a72d4c38
Merge "Fix crash in clicking Default Home gear icon."
...
am: 0c724f5181
2018-08-25 23:12:24 -07:00
Treehugger Robot
0c724f5181
Merge "Fix crash in clicking Default Home gear icon."
2018-08-24 23:58:31 +00:00
Doris Ling
72836a99d2
Fix crash in clicking Default Home gear icon.
...
- change the way that default home query the resolve activity to only
check for LAUNCHER activity.
Change-Id: Ib53154afe7951f4e2c7c3ab147be4c691113e0e7
Merged-In: Ib53154afe7951f4e2c7c3ab147be4c691113e0e7
Fixes: 112249115
Test: make RunSettingsRoboTests
2018-08-24 15:56:38 -07:00
Fan Zhang
5c6f6949bf
[automerger skipped] Merge "DO NOT MERGE Fix summary text for advanced button."
...
am: da38b41b9a
2018-08-23 11:08:32 -07:00
Treehugger Robot
da38b41b9a
Merge "DO NOT MERGE Fix summary text for advanced button."
2018-08-23 17:38:38 +00:00
Fan Zhang
2c9d9ce8de
DO NOT MERGE Fix summary text for advanced button.
...
- the resource for the summary text is in the support library. However,
the prebuilt version in the build does not contain the latest change for
the summary text. Add the overlay for the summary resource here with the
updated translation to remove the redundant summary prefix in the
advanced button.
Change-Id: Ib6db0c402d79a2d965e6060b1851d7b898ae3f94
Fixes: 112986476
Bug: 111195268
Test: manual
2018-08-23 16:27:46 +00:00
Hemant Gupta
ff985c6bc7
Merge "Bluetooth: PBAP not disconnected on disabling contact sharing"
...
am: 84bb2293ae
2018-08-17 12:11:27 -07:00
Treehugger Robot
84bb2293ae
Merge "Bluetooth: PBAP not disconnected on disabling contact sharing"
2018-08-17 18:05:21 +00:00
ChenChen Chen
0173130d73
Merge "Always show items in options menu for Wi-Fi Direct settings"
...
am: 1e160cc8bf
2018-08-16 17:39:00 -07:00
Treehugger Robot
1e160cc8bf
Merge "Always show items in options menu for Wi-Fi Direct settings"
2018-08-16 17:15:40 +00:00
ChenChen Chen
16d1bf0cde
Always show items in options menu for Wi-Fi Direct settings
...
Remove MenuItem.SHOW_AS_ACTION_IF_ROOM flag for menu items
to avoid showing truncated texts on action bar.
Bug: 112671955
Test: Manual
Change-Id: I1c9678321442169bc86d719e820d4af68261dee1
2018-08-16 15:13:33 +09:00
Jordan Liu
114cacf2a8
Merge "Refresh subscription info when subid changes"
...
am: 5226ac6110
2018-08-15 16:29:14 -07:00
Jordan Liu
5226ac6110
Merge "Refresh subscription info when subid changes"
2018-08-15 21:48:01 +00:00
Jordan Liu
b1facd2001
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
2018-08-15 11:37:24 -07:00
Jordan Liu
b951ba66e5
Merge "Reload APNs setting page when receive the intent ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED"
...
am: 5b7535d5b4
2018-08-14 20:09:31 -07:00
Jordan Liu
5b7535d5b4
Merge "Reload APNs setting page when receive the intent ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED"
2018-08-14 23:54:12 +00:00
irisykyang
40f4f799bb
Reload APNs setting page when receive the intent ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED
...
Bug: 77250264
Test: Manual testing
Change-Id: Ie28c67c89a2590425ff9c06153b53dac6cf141f0
Merged-In: Ie28c67c89a2590425ff9c06153b53dac6cf141f0
2018-08-14 15:55:43 -07:00
Xiangyu/Malcolm Chen
188272e12b
Merge "Use new SubscriptionInfo constructor"
...
am: e8e24e7e0b
2018-08-14 13:59:07 -07:00
Xiangyu/Malcolm Chen
e8e24e7e0b
Merge "Use new SubscriptionInfo constructor"
2018-08-14 18:58:25 +00:00
Malcolm Chen
b9a6c65a65
Use new SubscriptionInfo constructor
...
Bug: 92796390
Test: build
Change-Id: I5a90831b0050a0a201fce5b8f824fcb4c983a722
Merged-In: I5a90831b0050a0a201fce5b8f824fcb4c983a722
2018-08-13 20:26:38 -07:00
Xin Li
fbc7d27155
Merge stage-dr1-aosp-master into stage-aosp-master
...
Bug: 112535855
Change-Id: Ifd79dc537052cc78e7f5451316d637b24c9830ca
2018-08-13 13:01:18 -07:00
Zhaoyu Su
2c23e6ab75
Merge "Fix ACTION_NFC_SETTINGS doesn't show connection preference" am: 44360bc96a
...
am: b69559f882
2018-08-09 16:31:49 -07:00
Zhaoyu Su
b69559f882
Merge "Fix ACTION_NFC_SETTINGS doesn't show connection preference"
...
am: 44360bc96a
2018-08-09 16:20:45 -07:00
Treehugger Robot
44360bc96a
Merge "Fix ACTION_NFC_SETTINGS doesn't show connection preference"
2018-08-09 21:37:17 +00:00
Jordan Liu
efd3dd02b6
Merge "Preserve leading 0s in mcc mnc" am: 593d767e15
...
am: c2a5c47290
2018-08-08 15:50:24 -07:00
Jordan Liu
c2a5c47290
Merge "Preserve leading 0s in mcc mnc"
...
am: 593d767e15
2018-08-08 15:46:32 -07:00
Jordan Liu
593d767e15
Merge "Preserve leading 0s in mcc mnc"
2018-08-08 22:21:40 +00:00
Jordan Liu
f546b97db9
Preserve leading 0s in mcc mnc
...
Fixes: 79408450
Test: ApnEditorTest.java
Change-Id: Iad7ffe04f23b30857588e50d7f5f0dd307bd2c6e
Merged-In: Iad7ffe04f23b30857588e50d7f5f0dd307bd2c6e
2018-08-08 11:35:15 -07:00
Zhaoyu Su
0a9f87667f
Fix ACTION_NFC_SETTINGS doesn't show connection preference
...
NFC settings has been moved from "Device connection" to
"Connection preference". So ACTION_NFC_SETTINGS
should invoke "Connection preference" page.
Test: send intent with action "android.settings.NFC_SETTINGS"
Bug: 111424119
Change-Id: Iea9ddc876aa800f94585c434911be5dc8cedd550
2018-08-08 18:42:27 +09:00
Xin Li
ffc0419e4f
Merge "Merge Android Pie into master" am: eae6f13389
...
am: b745578205
2018-08-07 18:37:11 -07:00
Xin Li
b745578205
Merge "Merge Android Pie into master"
...
am: eae6f13389
2018-08-07 15:06:54 -07:00
Xin Li
eae6f13389
Merge "Merge Android Pie into master"
2018-08-07 16:51:28 +00:00
Xin Li
40a1c33e24
Merge Android Pie into master
...
Bug: 112104996
Change-Id: I4930d57cc584503a8e16e2b69549efb5780faad8
2018-08-06 16:51:22 -07:00
Bill Yi
16191b3408
[automerger skipped] Import translations. DO NOT MERGE
...
am: 000f97dcf9
2018-08-04 18:21:26 -07:00
Bill Yi
000f97dcf9
Import translations. DO NOT MERGE
...
Change-Id: I89c83219dfbf228054284db00548647b94fc398b
Auto-generated-cl: translation import
2018-08-04 07:43:29 -07:00
Dario Freni
1237373743
[automerger skipped] Merge "Include NOTICE file in /product partition." am: aa2ec5f239 -s ours
...
am: 1e56e69a46
2018-07-24 04:02:45 -07:00
Dario Freni
1e56e69a46
[automerger skipped] Merge "Include NOTICE file in /product partition."
...
am: aa2ec5f239
2018-07-24 03:58:08 -07:00
Treehugger Robot
aa2ec5f239
Merge "Include NOTICE file in /product partition."
2018-07-24 10:35:44 +00:00
Chalard Jean
92295f0953
Merge "Use the SSID of the network in the no internet dialog" am: 692f989b98 am: 9971303508
...
am: 28a2b521cf
2018-07-20 12:33:56 -07:00
Chalard Jean
28a2b521cf
Merge "Use the SSID of the network in the no internet dialog" am: 692f989b98
...
am: 9971303508
2018-07-20 12:29:46 -07:00
Chalard Jean
9971303508
Merge "Use the SSID of the network in the no internet dialog"
...
am: 692f989b98
2018-07-20 12:25:39 -07:00
Treehugger Robot
692f989b98
Merge "Use the SSID of the network in the no internet dialog"
2018-07-20 18:57:09 +00:00
Bill Yi
9551717c69
[automerger skipped] Import translations. DO NOT MERGE
...
am: 0a8de9d763
2018-07-20 11:33:55 -07:00
Xin Li
9652d9ec5b
Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master
...
am: e8858cc954
2018-07-19 23:45:48 -07:00
Bill Yi
0a8de9d763
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I26fa1f1f72571d0541556649bf104446c9522830
2018-07-19 19:35:10 -07:00
Xin Li
e8858cc954
Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master
...
Bug: 111615259
Change-Id: I0bbc44c97afd0ed6ff7799e866d4b36beee6c3be
2018-07-19 13:50:34 -07:00
Brad Ebinger
aca1e304bd
Merge "IMS: Use the slot based ImsManager factory reset API." am: 9e4ff6fca6
...
am: 15ca33865c
2018-07-16 13:55:25 -07:00
