Lei Yu
499013b05e
Revert "call getName() from CachedBluetoothDevice, not CachedBluetoothDeviceManager"
...
This reverts commit 3029efc5f7
2018-09-17 22:15:14 +00:00
timhypeng
3029efc5f7
call getName() from CachedBluetoothDevice, not CachedBluetoothDeviceManager
...
-add test case "onGetDeviceName"
Bug: 112735753
Test: make -j42 RunSettingsRoboTests
Change-Id: Id62b6eb8be38fb6ac69ca371563be899b8d61aff
2018-08-30 08:06:19 +00:00
Raff Tsai
a59ce66b3b
Merge "Close searchActivity doesn't go back to previous activity"
2018-08-30 01:08:24 +00:00
Aurimas Liutikas
3b4ca98216
[automerger skipped] Merge "Migrate Settings to androidx." am: a544f17b99 -s ours am: 2b0960c2d1 -s ours
...
am: 77d2f1f8ab
2018-08-29 12:30:55 -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
Raff Tsai
4778a9afbd
Close searchActivity doesn't go back to previous activity
...
When requestCode is 0, we will not finish activity.
Change-Id: Ib630951739031b05c83efe189875a4a41c8e51ec
Fixes: 113372155
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.password"
2018-08-29 23:31:42 +08:00
TreeHugger Robot
68d39ba1ee
Merge "Grant permission on slice uris based on whitelist"
2018-08-29 14:11:16 +00:00
TreeHugger Robot
a3738857da
Merge "Add null check for vrManager"
2018-08-29 10:02:09 +00:00
Fan Zhang
d480c0e41a
Grant permission on slice uris based on whitelist
...
Bug: 112587202
Test: robotests
Change-Id: I4e12a73f0acd848153f32c2569358dd55bed3f92
2018-08-28 18:13:25 -07:00
Fan Zhang
c21f4a512a
Merge "Sort imports"
2018-08-29 00:19:53 +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
4a7c69a488
[automerger skipped] Merge "DO NOT MERGE: Cherry-pick misc fixes to AOSP" am: 6e2db2c34b -s ours am: e89bf878c6 -s ours
...
am: 77e838e451
2018-08-28 15:36:05 -07:00
Colin Cross
7d9f19655b
[automerger skipped] Merge "Migrate Settings to androidx." into stage-aosp-master am: 048f11d0a9 -s ours
...
am: 90184808c1
2018-08-28 15:17:41 -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
Android Build Merger (Role)
df1eefeb6e
Merge "[automerger skipped] Migrate Settings to androidx. am: b1af85d155 -s ours am: 44593b7bac -s ours"
2018-08-28 22:14:08 +00:00
Fan Zhang
23f8d59d02
Sort imports
...
Having consistent import order will reduce chance of merge
conflict between internal and external master
Test: rebuild
Change-Id: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
2018-08-28 22:13:15 +00:00
Aurimas Liutikas
0dfa35ad73
[automerger skipped] Migrate Settings to androidx. am: b1af85d155 -s ours
...
am: 44593b7bac
2018-08-28 15:12:27 -07:00
TreeHugger Robot
099eab1e05
Merge "Turn down app indexing for slices."
2018-08-28 22:08:41 +00: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
Fan Zhang
35cc28a8c9
[automerger skipped] Merge "DO NOT MERGE: Cherry-pick a bunch fixes to AOSP" am: 56cc4986df -s ours am: 0e05005d8d -s ours
...
am: e8bf02f256
2018-08-28 14:55:39 -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
Fan Zhang
e9876a6a80
[automerger skipped] Merge "DO NOT MERGE Fix color_lint errors" am: fcaf926dc1 -s ours am: 6e65a32468 -s ours
...
am: 9fe69d724d
2018-08-28 13:47:28 -07:00
Fan Zhang
44a12fc5ee
Turn down app indexing for slices.
...
Bug: 112587202
Test: robotests
Change-Id: Ice84173bd9617f58689438c460522104776c46ce
2018-08-28 13:43:08 -07: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
Aurimas Liutikas
13dc1941f5
[automerger skipped] Migrate Settings to androidx.
...
am: a290b873d0
2018-08-28 12:22:49 -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
ed3373d86d
Merge "Remove unneeded getDisplayableCards() in DashboardAdapter"
2018-08-28 18:36:23 +00:00
Treehugger Robot
fcaf926dc1
Merge "DO NOT MERGE Fix color_lint errors"
2018-08-28 18:03:31 +00:00
Fan Zhang
35ed23e8bf
Remove unneeded getDisplayableCards() in DashboardAdapter
...
It will be called when window gets focus, no need to call it here.
Change-Id: I1c4b3b745edb2519e778f8354684d90e2eb55004
Fixes: 113175600
Test: manual
2018-08-28 10:26:19 -07: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
TreeHugger Robot
f0542f0c25
Merge "Clean up the main architecture of Contextual Settings Homepage."
2018-08-28 16:02:42 +00:00
Christine Franks
036ca19897
Merge "Remove demo restrictions"
2018-08-28 15:45:35 +00:00
TreeHugger Robot
d83c1b92d2
Merge "Updated the CardContentProvider"
2018-08-28 15:04:26 +00:00
TreeHugger Robot
064af9a48e
Merge "Show bonded devices in "Pair new device"(2/2)"
2018-08-28 14:32:04 +00:00
Emily Chuang
ae90591749
Clean up the main architecture of Contextual Settings Homepage.
...
- Add lifecycle observer in HomepageManager.
- Rename some variables.
Bug: 111676964
Test: robotests
Change-Id: Ic91c53f2c1622d602b3edc664a06a13aa6945f47
2018-08-28 21:43:47 +08:00
Rick Yiu
bad519d0a4
Add null check for vrManager
...
If VrManagerService is not started, vrManager will be null. Need
add check for it.
Test: robotests
Bug: 112064298
Change-Id: I899337bb5a996efffe82970fa690f2c5d59c1bb5
2018-08-28 16:03:40 +08:00
Sunny Shao
fb80ec21c2
Updated the CardContentProvider
...
- Removed the availability_uri field
- Changed the card_action data type to integer
- Added the support_half_width field
- Modify the Database version to 2
Bug: 111820446
Test: robotest
Change-Id: I755ad93a05034037bab18e709f53b4af3ce4fe5e
2018-08-28 12:39:10 +08:00
Ash_Chen
8f7092a15e
Show bonded devices in "Pair new device"(2/2)
...
Some users forgot they had paired devices and couldn't see their BT device
when they search device in "Pair new device". (b/80382940, b/80133137).
Need to change the behavior to let paired devices can be shown on "Available devices".
Bug: 111738593
Test: Bluetooth Pairing Test
Change-Id: Ib499785abaa8e4efc1875be113ac87bdbe0c89ba
2018-08-28 11:39:38 +08:00
SongFerng Wang
937b8172b2
Merge "SIM status page sync signal strength and service state behavior from systemUI"
2018-08-28 02:40:02 +00:00
