Commit Graph

45495 Commits

Author SHA1 Message Date
Fan Zhang
4e8e6c3e67 [automerger skipped] Merge "Add config to disable app tray preview in display size."
am: 98a1ebedcd  -s ours

Change-Id: I36fb69986ab30b14f3040de35cbd9aaa6d7969b1
2018-09-11 13:13:33 -07:00
Fan Zhang
98a1ebedcd Merge "Add config to disable app tray preview in display size." 2018-09-11 16:27:57 +00:00
Fan Zhang
18eecb1e67 Add config to disable app tray preview in display size.
Also move some files

Change-Id: I4636fcd81425991acadede0b703e09513c82543c
Merged-In: I4636fcd81425991acadede0b703e09513c82543c
Fixes: 113374067
Test: robotests
2018-09-10 19:01:35 -07:00
Fan Zhang
86e0ae5b6a [automerger skipped] Merge "DO NOT MERGE Import clean up."
am: 8a2c9e79b0  -s ours

Change-Id: Id958f79e2c26f0276a02714b5b4d3ec9b8c2327a
2018-09-10 09:27:07 -07:00
Fan Zhang
8a2c9e79b0 Merge "DO NOT MERGE Import clean up." 2018-09-10 15:58:34 +00:00
Fan Zhang
de117046ad DO NOT MERGE Import clean up.
Reordered all imports according to Android codestyle.

Test: rebuild
Change-Id: I750f01f70f2114d51838bf652833aebdc4065c98
2018-09-04 13:54:46 -07:00
tiansiming [田思明]
662e59e628 Merge "Update string for message of DirectBootWarnDialog"
am: b0cc3a6c7d

Change-Id: Ie04be9cf61a87fcc2b866d4effd0d27ca21064db
2018-09-04 12:55:11 -07:00
Treehugger Robot
b0cc3a6c7d Merge "Update string for message of DirectBootWarnDialog" 2018-09-04 19:46:18 +00:00
tiansiming [田思明]
e8dfb36df2 Update string for message of DirectBootWarnDialog
Some users feedback to us that they are not very clear of the
meaning of the string 'direct_boot_unaware_dialog_message'.
The updated one may be more clear.

Bug: https://partnerissuetracker.corp.google.com/u/0/issues/72197006
Test: manual test. Go to the Available virtual keyboard interface,
turn on a 3rd party ime keyboard and check the message.

Change-Id: Ib3a999601fa40f678956550d8941b7cb1db8a9af
Signed-off-by: tiansiming [田思明] <tiansiming@xiaomi.com>
2018-09-04 17:02:07 +00:00
Youming Ye
7c4b70c6e5 Merge "Fix the Wifi Calling back button goes to wrong screen"
am: 903d2610dd

Change-Id: I41466f3f6e77c66f77550900193320b48a123d21
2018-08-30 15:28:44 -07:00
Youming Ye
903d2610dd Merge "Fix the Wifi Calling back button goes to wrong screen" 2018-08-30 22:03:06 +00:00
Youming Ye
4f6e4bfa4f Fix the Wifi Calling back button goes to wrong screen
The Wifi Calling activitis had Settings as it's parent activity.
Remove the parent declaration to navigate Wifi Calling screen back
to previous activity or fragment correctly.

Bug: 111818398
Test: Manual
Change-Id: I95168785936aeea0740dbb8e26280eaa8417c015
2018-08-29 18:28:01 -07:00
Aurimas Liutikas
2b0960c2d1 [automerger skipped] Merge "Migrate Settings to androidx."
am: a544f17b99  -s ours

Change-Id: I507cbff22f0daa46c9aaac05646f23698f86d861
2018-08-29 12:00:24 -07:00
Treehugger Robot
a544f17b99 Merge "Migrate Settings to androidx." 2018-08-29 18:31:08 +00:00
Aurimas Liutikas
03fcde338b Migrate Settings to androidx.
Test: make Settings
Bug: 76692459
Change-Id: I941dea40562170649bf056e675cc32e5163c0e39
Merged-In: I941dea40562170649bf056e675cc32e5163c0e39
(cherry picked from commit a290b873d0)
(cherry picked from commit b1af85d155)
2018-08-28 16:35:52 -07:00
hjchangliao
e89bf878c6 [automerger skipped] Merge "DO NOT MERGE: Cherry-pick misc fixes to AOSP"
am: 6e2db2c34b  -s ours

Change-Id: I3e0340030a240a2e51209deeed0915ac62a1dcda
2018-08-28 15:07:13 -07:00
Treehugger Robot
6e2db2c34b Merge "DO NOT MERGE: Cherry-pick misc fixes to AOSP" 2018-08-28 21:54:01 +00:00
Colin Cross
048f11d0a9 Merge "Migrate Settings to androidx." into stage-aosp-master 2018-08-28 21:42:48 +00:00
Fan Zhang
0e05005d8d [automerger skipped] Merge "DO NOT MERGE: Cherry-pick a bunch fixes to AOSP"
am: 56cc4986df  -s ours

Change-Id: Iff1f6e189feae17f1166990de31d6f64f920734e
2018-08-28 14:41:43 -07:00
Treehugger Robot
56cc4986df Merge "DO NOT MERGE: Cherry-pick a bunch fixes to AOSP" 2018-08-28 21:29:05 +00:00
hjchangliao
bc7b20b419 DO NOT MERGE: Cherry-pick misc fixes to AOSP
Remove wrapper for LocationManager

Remove LocationManagerWrapper from SettingsLib

Bug: 76167422
Test: RunSettingsRoboTests

Remove OverlayManagerWrapper class out from Settings

Remove OverlayManagerWrapper and use IOverlayManager instead. Based on
comment from reviewer to refactor ThemePreferenceController.

Bug: 76167422
Test: RunSettingsRoboTests
Change-Id: I13a7997b5e21a16ffb723971d267132fbf65e4a6
2018-08-28 13:38:21 -07:00
Fan Zhang
07e55d97ca DO NOT MERGE: Cherry-pick a bunch fixes to AOSP
Task affinity updates

- Remove task affinity for AppDrawOver Settings
- Remove task affinity for ConfigNotificationSettings

The task affinity is messing with the back stack for this activity when
launched externally

Fixes: 80281932
Fixes: 80290571
Test: manual

Disable uninstall update option for secondary users.

Fixes: 110249550
Test: manual

Suppress some gesture search when there is no hardware

Fixes: 110250839
Test: robotests

Check wifi password length by byte, not char.

Change-Id: Ic25ef766886507211c3de8764c1cffef2b27a025
Fixes: 79209073
Test: robotest
2018-08-28 12:17:03 -07:00
Aurimas Liutikas
b1af85d155 Migrate Settings to androidx.
Test: make Settings
Bug: 76692459
Change-Id: I941dea40562170649bf056e675cc32e5163c0e39
Merged-In: I941dea40562170649bf056e675cc32e5163c0e39
(cherry picked from commit a290b873d0)
2018-08-28 11:48:56 -07:00
Fan Zhang
6e65a32468 [automerger skipped] Merge "DO NOT MERGE Fix color_lint errors"
am: fcaf926dc1  -s ours

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

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

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

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
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
Treehugger Robot
44360bc96a Merge "Fix ACTION_NFC_SETTINGS doesn't show connection preference" 2018-08-09 21:37:17 +00:00