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
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
