Fan Zhang
9fe69d724d
[automerger skipped] Merge "DO NOT MERGE Fix color_lint errors" am: fcaf926dc1 -s ours
...
am: 6e65a32468
2018-08-28 12:14:58 -07:00
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
Aurimas Liutikas
a290b873d0
Migrate Settings to androidx.
...
Test: make Settings
Bug: 76692459
Change-Id: I941dea40562170649bf056e675cc32e5163c0e39
Merged-In: I941dea40562170649bf056e675cc32e5163c0e39
2018-08-27 18:24:23 -07:00
Bill Yi
016843fa80
[automerger skipped] Import translations. DO NOT MERGE
...
am: 994ae82c34
2018-08-26 12:58:09 -07:00
Doris Ling
323e54ddf5
Merge "Fix crash in clicking Default Home gear icon." am: 0c724f5181
...
am: 51a72d4c38
2018-08-25 23:24:51 -07:00
Doris Ling
51a72d4c38
Merge "Fix crash in clicking Default Home gear icon."
...
am: 0c724f5181
2018-08-25 23:12:24 -07:00
Bill Yi
994ae82c34
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I3e4f6e468679eec2ad1d8b821115e686e5a4c19a
2018-08-25 16:44:47 -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
b984c81371
[automerger skipped] Merge "DO NOT MERGE Fix summary text for advanced button." am: da38b41b9a -s ours
...
am: 5c6f6949bf
2018-08-23 11:13:33 -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
Adrian Roos
c843167b3f
[automerger skipped] DO NOT MERGE leverage default_theme string for display_cutout_emulation_device_default
...
am: 12c9be1255
2018-08-21 16:43:39 -07: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
Adrian Roos
80c53bce68
Merge "Cutout emulation: string changes and ordering" into pi-dev
...
am: 8d82158036
2018-08-21 13:59:45 -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
Hemant Gupta
0c75671a5f
Merge "Bluetooth: PBAP not disconnected on disabling contact sharing" am: 84bb2293ae
...
am: ff985c6bc7
2018-08-17 12:57:33 -07:00
Hemant Gupta
ff985c6bc7
Merge "Bluetooth: PBAP not disconnected on disabling contact sharing"
...
am: 84bb2293ae
2018-08-17 12:11:27 -07:00
Fan Zhang
6136194c4d
Merge "Fix memory leaks in Settings" into pi-dev
...
am: be13e74deb
2018-08-17 11:34:53 -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
ChenChen Chen
c31869a940
Merge "Always show items in options menu for Wi-Fi Direct settings" am: 1e160cc8bf
...
am: 0173130d73
2018-08-16 20:29:49 -07: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
Matthew Fritze
e48cf70a96
Merge "Hide SettingsSlice provider" into pi-dev
...
am: 041bfbd2b6
2018-08-16 17:33:01 -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
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
611d824110
Merge "Refresh subscription info when subid changes" am: 5226ac6110
...
am: 114cacf2a8
2018-08-15 17:06:22 -07:00
Jordan Liu
114cacf2a8
Merge "Refresh subscription info when subid changes"
...
am: 5226ac6110
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
63910710ef
Merge "Reload APNs setting page when receive the intent ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED" am: 5b7535d5b4
...
am: b951ba66e5
2018-08-15 00:44:42 -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
d78a882bb1
Merge "Use new SubscriptionInfo constructor" am: e8e24e7e0b
...
am: 188272e12b
2018-08-14 15:06:16 -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
55ce535126
Merge stage-dr1-aosp-master into stage-aosp-master
...
am: fbc7d27155
2018-08-13 17:36:58 -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
d8ba38975b
Merge "Fix ACTION_NFC_SETTINGS doesn't show connection preference" am: 44360bc96a am: b69559f882
...
am: 2c23e6ab75
2018-08-09 16:44:57 -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
Doris Ling
b3ad03f0ba
[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
...
am: 8143665d70
2018-08-09 15:40:59 -07:00
