Treehugger Robot
1e160cc8bf
Merge "Always show items in options menu for Wi-Fi Direct settings"
2018-08-16 17:15:40 +00:00
android-build-team Robot
17087369fa
Merge cherrypicks of [4793640, 4793602, 4793603, 4793660, 4793604, 4793680, 4793681, 4793581, 4793582, 4793625, 4793626, 4793627, 4793628, 4793700, 4793701, 4793702, 4793703, 4793704, 4793705, 4793661, 4793720, 4793721, 4793722, 4793723, 4793724, 4793725, 4793726, 4793727, 4793728, 4793583, 4793740, 4793760, 4793662, 4793780, 4793729] into pi-release-2
...
Change-Id: I180086b49490ea5f28639e800e74a43371678a84
2018-08-16 16:41:28 +00:00
Doris Ling
af4c772b30
Disable changing lock when device is not provisioned.
...
When the device is not yet provisioned and settings is launched:
- disable the entry point for changing device lock
- remove the search panel from settings home page
- remove the search menu
Bug: 110034419
Test: make RunSettingsRoboTests
Change-Id: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
Merged-In: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
(cherry picked from commit 770f4abf9d
2018-08-16 16:40:13 +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
android-build-team Robot
73b36ef8f7
Merge cherrypicks of [4562103, 4560827, 4563998, 4563999, 4564000, 4564001, 4564351, 4564352, 4564333, 4564033, 4560455, 4564034, 4560674, 4560675, 4563620, 4561607, 4561062, 4561063] into pi-release
...
Change-Id: Ie308d644fd0a0f4f72fd54d7bf86c1cf63e720b7
2018-07-17 23:29:09 +00:00
Pavel Grafov
0844fb92d8
Use primary user's LOCK_SCREEN_SHOW_NOTIFICATIONS.
...
Only primary user can set LOCK_SCREEN_SHOW_NOTIFICATIONS,
profile can only set notifications to be redacted. When the
user changes notification settings for a work app, this class
is invoked from the profile, meaning it attempts to read
LOCK_SCREEN_SHOW_NOTIFICATIONS for the profile, which is not
there. As a result the function always returs 0 for work apps.
Bug: 111112011
Test: atest packages/apps/Settings/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java
Change-Id: Ifb50209ea8ea8fb6639f00ca8b7cf8a4295890ad
(cherry picked from commit f14de789f4
2018-07-17 23:28:34 +00:00
Lei Yu
1582ec3db7
Unrestrict app if it been set as device admin app
...
Bug: 110337989
Test: RunSettingsRoboTests
Change-Id: I8229bee97d970f8b16351193cfd99ca05ff041bf
Merged-In: I8229bee97d970f8b16351193cfd99ca05ff041bf
(cherry picked from commit f87897b84c
2018-07-17 23:28:31 +00: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
Brad Ebinger
15ca33865c
Merge "IMS: Use the slot based ImsManager factory reset API."
...
am: 9e4ff6fca6
2018-07-16 13:32:55 -07:00
Brad Ebinger
9e4ff6fca6
Merge "IMS: Use the slot based ImsManager factory reset API."
2018-07-16 19:57:31 +00:00
Doris Ling
ca9617ac6b
[automerger skipped] DO NOT MERGE Fix summary text for advanced button.
...
am: 20e7c9d0ba
2018-07-16 11:46:54 -07:00
Doris Ling
20e7c9d0ba
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: 111195268
Test: manual
2018-07-13 12:32:00 -07:00
Hall Liu
f9b76dfda1
Fix usage of SubscriptionInfo ctor
...
am: f0072b7345
2018-07-13 11:27:19 -07:00
Hall Liu
f0072b7345
Fix usage of SubscriptionInfo ctor
...
Use string arguments instead of ints for mcc/mnc
Bug: 35064313
Test: manual, unit
Change-Id: Ib460d6294d8fb86de7c2fee065defb0a890af15a
(cherry picked from commit 02c5f3c7ac
2018-07-13 10:13:46 -07:00
Hall Liu
1b3985010d
Fix usage of SubscriptionInfo ctor
...
Use string arguments instead of ints for mcc/mnc
Bug: 35064313
Test: manual, unit
Change-Id: Ib460d6294d8fb86de7c2fee065defb0a890af15a
(cherry picked from commit 02c5f3c7ac
2018-07-13 00:24:39 +00:00
