Fan Zhang
4e8e6c3e67
[automerger skipped] Merge "Add config to disable app tray preview in display size."
...
am: 98a1ebedcd
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
6097b78d62
[automerger skipped] Merge "DO NOT MERGE Import clean up." am: 8a2c9e79b0 -s ours
...
am: 86e0ae5b6a
2018-09-10 09:31:09 -07:00
Fan Zhang
86e0ae5b6a
[automerger skipped] Merge "DO NOT MERGE Import clean up."
...
am: 8a2c9e79b0
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
Bill Yi
803b260bda
[automerger skipped] Import translations. DO NOT MERGE
...
am: 22360f9706
2018-09-08 21:21:36 -07:00
Bill Yi
22360f9706
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I77779e462781ec27ccf1122e7dcac6fd170cad5f
2018-09-08 18:11:46 -07:00
jackqdyulei
d81c0c4c44
[automerger skipped] Update PBAP info for all pairing dialogs. DO NOT MERGE am: ff171eff8e am: 618b808b61 am: c05958ecdd -s ours
...
am: 6ec0b21544
2018-09-07 10:56:57 -07:00
jackqdyulei
6ec0b21544
[automerger skipped] Update PBAP info for all pairing dialogs. DO NOT MERGE am: ff171eff8e am: 618b808b61
...
am: c05958ecdd
2018-09-07 10:51:10 -07:00
jackqdyulei
c05958ecdd
Update PBAP info for all pairing dialogs. DO NOT MERGE am: ff171eff8e
...
am: 618b808b61
2018-09-07 10:46:08 -07:00
jackqdyulei
618b808b61
Update PBAP info for all pairing dialogs. DO NOT MERGE
...
am: ff171eff8e
2018-09-07 10:42:16 -07:00
Dan Willemsen
831768fffe
Fix imports on pi-dev-plus-aosp to fix build
...
Change-Id: Ifa467eef0f9264348d657ceb8372990313b42fed
Merged-In: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
2018-09-06 21:13:57 -07:00
Fan Zhang
d735f982d2
Merge "Move safety & regulatory manual closer to legal settings" into pi-dev
...
am: f81ec88024
2018-09-06 18:33:30 -07:00
TreeHugger Robot
f81ec88024
Merge "Move safety & regulatory manual closer to legal settings" into pi-dev
2018-09-07 01:05:45 +00:00
jackqdyulei
ff171eff8e
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
Merged-In: Ia39eee1acaece555e8e5a305ec2c803294d7efbd
Bug: 109842273
Bug: 72872376
Test: RunSettingsRoboTests
(cherry picked from commit 7015e20a55
2018-09-06 16:35:58 -07:00
Fan Zhang
f5ccd33567
Move safety & regulatory manual closer to legal settings
...
Bug: 113788849
Test: visual
Change-Id: Ie9a706bad9a4c65ff06c2350171ad55f46dd8386
Merged-In: Ie9a706bad9a4c65ff06c2350171ad55f46dd8386
2018-09-06 22:50:32 +00:00
jackqdyulei
04e48eae76
Merge "Update PBAP info for all pairing dialogs. DO NOT MERGE" into pi-dev
...
am: 205479c25d
2018-09-06 13:14:18 -07:00
TreeHugger Robot
205479c25d
Merge "Update PBAP info for all pairing dialogs. DO NOT MERGE" into pi-dev
2018-09-06 20:00:37 +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 [田思明]
792ed7ffaf
Merge "Update string for message of DirectBootWarnDialog" am: b0cc3a6c7d
...
am: 662e59e628
2018-09-04 13:05:10 -07:00
tiansiming [田思明]
662e59e628
Merge "Update string for message of DirectBootWarnDialog"
...
am: b0cc3a6c7d
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
Bill Yi
05cd61956a
[automerger skipped] Import translations. DO NOT MERGE
...
am: 94fdfc4a44
2018-08-31 08:56:23 -07:00
Bill Yi
94fdfc4a44
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I6b44e763661339eab9182743abd1e3cb4d8bdbcd
2018-08-30 19:02:59 -07:00
Youming Ye
05281b8d4b
Merge "Fix the Wifi Calling back button goes to wrong screen" am: 903d2610dd
...
am: 7c4b70c6e5
2018-08-30 15:47:05 -07:00
Youming Ye
7c4b70c6e5
Merge "Fix the Wifi Calling back button goes to wrong screen"
...
am: 903d2610dd
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
77d2f1f8ab
[automerger skipped] Merge "Migrate Settings to androidx." am: a544f17b99 -s ours
...
am: 2b0960c2d1
2018-08-29 12:14:32 -07:00
Aurimas Liutikas
2b0960c2d1
[automerger skipped] Merge "Migrate Settings to androidx."
...
am: a544f17b99
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 a290b873d0b1af85d155
2018-08-28 16:35:52 -07:00
hjchangliao
77e838e451
[automerger skipped] Merge "DO NOT MERGE: Cherry-pick misc fixes to AOSP" am: 6e2db2c34b -s ours
...
am: e89bf878c6
2018-08-28 15:15:25 -07:00
hjchangliao
e89bf878c6
[automerger skipped] Merge "DO NOT MERGE: Cherry-pick misc fixes to AOSP"
...
am: 6e2db2c34b
2018-08-28 15:07:13 -07:00
Colin Cross
90184808c1
[automerger skipped] Merge "Migrate Settings to androidx." into stage-aosp-master
...
am: 048f11d0a9
2018-08-28 15:03:29 -07:00
Aurimas Liutikas
44593b7bac
[automerger skipped] Migrate Settings to androidx.
...
am: b1af85d155
2018-08-28 14:59:45 -07:00
Treehugger Robot
6e2db2c34b
Merge "DO NOT MERGE: Cherry-pick misc fixes to AOSP"
2018-08-28 21:54:01 +00:00
Fan Zhang
e8bf02f256
[automerger skipped] Merge "DO NOT MERGE: Cherry-pick a bunch fixes to AOSP" am: 56cc4986df -s ours
...
am: 0e05005d8d
2018-08-28 14:45:42 -07: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
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
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
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
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
