Commit Graph

46062 Commits

Author SHA1 Message Date
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  -s ours

Change-Id: I1dadf9bcd016e61ea04fe5b851e6430b1d63574d
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
Yuchen Dong
20fb65fb84 Wrong Carrier Config values are used in ApnSettings for Multi SIM device
In ApnSettings, it always uses Carrier Config values of default subId.
So, wrong carrier config values are used for non-default subId.
To resolve this issue, read Carrier Config values based on subId.

Test: manual - Check Carrier Config values are read based on subId.
Bug: 111172301

Change-Id: I87e4cbb2e8020198fa03c2c84ef9bd10d5970341
2018-08-23 21:14:07 +09:00
jackqdyulei
77b62b24c6 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)
2018-08-22 03:23:26 +00:00
android-build-team Robot
aa58fc861a Snap for 4969136 from 12c9be1255 to pi-qpr1-release
Change-Id: Ia3120e8abaa9051294ad4aacacb455c8f45aebd3
2018-08-22 03:05:49 +00:00
Adrian Roos
12c9be1255 DO NOT MERGE leverage default_theme string for display_cutout_emulation_device_default
Bug: 112876936
Test: manual
Change-Id: I1a41b96f9f19a5d5854eb1cce214616e303ca4f9
2018-08-21 15:00:57 -07:00
TreeHugger Robot
8d82158036 Merge "Cutout emulation: string changes and ordering" into pi-dev 2018-08-21 20:49:37 +00:00
Adrian Roos
57fcb2f1f1 Cutout emulation: string changes and ordering
Updates strings according to spec. Also ensures
that the emulation overlays are shown in the
order of their priority.

Bug: 112876936
Test: Open developer options, go to "display cutout", verify strings.
Change-Id: If2d05595d02a277896202ab2a6262c99508a3a17
Merged-In: If2d05595d02a277896202ab2a6262c99508a3a17
2018-08-21 17:36:47 +00:00
android-build-team Robot
ea89efd98a Snap for 4963492 from be13e74deb to pi-qpr1-release
Change-Id: I8a70600f563b461a5ac53a583f326f10c75f8c67
2018-08-20 03:09:09 +00:00
Hemant Gupta
ff985c6bc7 Merge "Bluetooth: PBAP not disconnected on disabling contact sharing"
am: 84bb2293ae

Change-Id: Ief10c8b5b3cdae90ba37a6349528f85e59562dc9
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
TreeHugger Robot
be13e74deb Merge "Fix memory leaks in Settings" into pi-dev 2018-08-17 18:04:44 +00:00
android-build-team Robot
9855bf9197 Snap for 4959688 from 041bfbd2b6 to pi-qpr1-release
Change-Id: Ia3e62128c390758ea4f54305933f7b0f6642663c
2018-08-17 03:06:10 +00:00
ChenChen Chen
0173130d73 Merge "Always show items in options menu for Wi-Fi Direct settings"
am: 1e160cc8bf

Change-Id: Ie1edf750d2f205be97b07c84429e2c1468aa6c58
2018-08-16 17:39:00 -07:00
TreeHugger Robot
041bfbd2b6 Merge "Hide SettingsSlice provider" into pi-dev 2018-08-16 21:23:17 +00:00
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

Change-Id: I874fb7e8f3d3146cb614de3ee088e93c1863a592
2018-08-15 16:29:14 -07:00
Matthew Fritze
6409cf5c94 Hide SettingsSlice provider
Explicitly set the Settings SliceBroadcastReceiver to
be non-exported and remove the intent-filter.

Add a second provider: SliceRelayReceiver to receive
broadcasts from SysUI to alert Settings to potential
changes to bound Settings Slices. The new receiver is
exported, but only notifies changes to Settings, and
doesn't make any changes itself.

Change-Id: I422c0b07a61efa8996e9fdfa398eee84bbc1796f
Merged-In: I80d070f7636614135ebe4f57a16f12a3eb6dee81
Fixes: 111330641
Test: boot, robolectric, Slicebrowser
2018-08-15 15:09:34 -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

Change-Id: I7b1f6e53c521c0f17d17199de2f185eb64fd3c59
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

Change-Id: I1e51d7951cc3594685c9dd2e0b4c0e2aedb3e84f
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
android-build-team Robot
9d54cdbac0 Snap for 4945494 from 8143665d70 to pi-qpr1-release
Change-Id: Iacc373bf13a5e57e3c4febb8690c9d70f2f27341
2018-08-10 03:14:56 +00:00
Zhaoyu Su
2c23e6ab75 Merge "Fix ACTION_NFC_SETTINGS doesn't show connection preference" am: 44360bc96a
am: b69559f882

Change-Id: Ia7b74d284a1385dc401eb168d82fc9cb8756192f
2018-08-09 16:31:49 -07:00
Zhaoyu Su
b69559f882 Merge "Fix ACTION_NFC_SETTINGS doesn't show connection preference"
am: 44360bc96a

Change-Id: I6975c5213f74d4b9df343cae82d93f654774d1c3
2018-08-09 16:20:45 -07:00
Doris Ling
8143665d70 [automerger skipped] Merge "DO NOT MERGE Disable changing lock when device is not provisioned." into oc-dev am: 62158f0943 -s ours am: 2ef0e15b66 -s ours
am: bea56da7d6  -s ours

Change-Id: I60cf60a6158d8c498b6b1f2a67b88c10ebb7e072
2018-08-09 15:32:03 -07:00
Doris Ling
bea56da7d6 [automerger skipped] Merge "DO NOT MERGE Disable changing lock when device is not provisioned." into oc-dev am: 62158f0943 -s ours
am: 2ef0e15b66  -s ours

Change-Id: I3c13ee22f6e19d1ba45dd9fc34489d45c887ef35
2018-08-09 15:26:36 -07:00
Doris Ling
2ef0e15b66 [automerger skipped] Merge "DO NOT MERGE Disable changing lock when device is not provisioned." into oc-dev
am: 62158f0943  -s ours

Change-Id: I892834c6c0655f40954ee94d98b29ac271b3de4c
2018-08-09 15:19:19 -07:00
TreeHugger Robot
62158f0943 Merge "DO NOT MERGE Disable changing lock when device is not provisioned." into oc-dev 2018-08-09 21:51:32 +00:00
Treehugger Robot
44360bc96a Merge "Fix ACTION_NFC_SETTINGS doesn't show connection preference" 2018-08-09 21:37:17 +00:00
Doris Ling
8c84949c84 [automerger skipped] Merge "Disable changing lock when device is not provisioned." into oc-mr1-dev
am: 38b9504a41  -s ours

Change-Id: I4b2ec56d290a83730e111012dd5ab02855860c27
2018-08-09 13:08:34 -07:00
TreeHugger Robot
38b9504a41 Merge "Disable changing lock when device is not provisioned." into oc-mr1-dev 2018-08-09 19:47:07 +00:00
Doris Ling
ce02bdc0cd Merge changes from topic "am-c29676a7-0c49-4630-a71f-e8774428272f-nyc-mr1-dev" into oc-dev am: 197a10b053 am: 9245b98d0f
am: 4a6da68af7

Change-Id: Iaa83729685f24a2504b9142c17f87452ac1d9d85
2018-08-09 12:14:46 -07:00
Doris Ling
ad04140966 Merge changes from topic "am-cffdd762-a2a7-44ac-bcee-f8a14942d37e" into oc-dev am: 528be61eeb am: 78a7ee2f10
am: d1146af517

Change-Id: Ic63e27409f0e1b5fe3c4cb9d152c50d9f1cef351
2018-08-09 12:13:30 -07:00
Doris Ling
cfcfc6a677 [automerger skipped] DO NOT MERGE Disable changing lock when device is not provisioned. skipped: 94ea2dad5b am: 3672a1fe7f am: cff5200146
am: 0f0147213e  -s ours

Change-Id: I65bcaaf997de93f005d331a1df0e396792906ff0
2018-08-09 12:11:59 -07:00
Doris Ling
4a6da68af7 Merge changes from topic "am-c29676a7-0c49-4630-a71f-e8774428272f-nyc-mr1-dev" into oc-dev am: 197a10b053
am: 9245b98d0f

Change-Id: Ia674ef3fc7eb8042c58ca3da03ecb8b08df91eed
2018-08-09 12:06:31 -07:00
Doris Ling
d1146af517 Merge changes from topic "am-cffdd762-a2a7-44ac-bcee-f8a14942d37e" into oc-dev am: 528be61eeb
am: 78a7ee2f10

Change-Id: I82960fb637152698cb676fae82862408b1a2db75
2018-08-09 12:05:08 -07:00
Doris Ling
0f0147213e [automerger skipped] DO NOT MERGE Disable changing lock when device is not provisioned. skipped: 94ea2dad5b am: 3672a1fe7f
am: cff5200146

Change-Id: I44df485b49098b69371d1248067e51559dcd4964
2018-08-09 12:03:48 -07:00
Doris Ling
9245b98d0f Merge changes from topic "am-c29676a7-0c49-4630-a71f-e8774428272f-nyc-mr1-dev" into oc-dev
am: 197a10b053

Change-Id: I398a80b0e514f9c2439b3852996a4190b0d32b96
2018-08-09 12:02:34 -07:00