rongrong.x.gao
dffb671025
Merge "Fix MUT cannot connect to AP by WPS after rotating MUT" am: 2503ea04fb am: 220e085953 am: 4ccf08c6d4
...
am: 2277572041
2017-04-27 04:28:10 +00:00
rongrong.x.gao
2277572041
Merge "Fix MUT cannot connect to AP by WPS after rotating MUT" am: 2503ea04fb am: 220e085953
...
am: 4ccf08c6d4
2017-04-27 04:12:39 +00:00
rongrong.x.gao
4ccf08c6d4
Merge "Fix MUT cannot connect to AP by WPS after rotating MUT" am: 2503ea04fb
...
am: 220e085953
2017-04-27 04:07:11 +00:00
Maurice Lam
75215a9553
Merge "Enable redaction interstitial after setting up pattern" into oc-dev am: 2fc1fa6c41
...
am: 0c3e38b593
2017-04-27 04:01:07 +00:00
Treehugger Robot
2503ea04fb
Merge "Fix MUT cannot connect to AP by WPS after rotating MUT"
2017-04-27 03:56:27 +00:00
Maurice Lam
0c3e38b593
Merge "Enable redaction interstitial after setting up pattern" into oc-dev
...
am: 2fc1fa6c41
2017-04-27 03:48:23 +00:00
TreeHugger Robot
2fc1fa6c41
Merge "Enable redaction interstitial after setting up pattern" into oc-dev
2017-04-27 03:40:18 +00:00
TreeHugger Robot
086f2dfe3e
Merge "Disable "Verify apps over usb" according to user restriction."
2017-04-27 03:37:27 +00:00
Doris Ling
3248492fd7
Merge "DO NOT MERGE: Revert "Add summary text to Display->Brightness level."" into oc-dev am: 024bc8706d
...
am: 387b8c0f8e
2017-04-27 03:31:07 +00:00
Doris Ling
387b8c0f8e
Merge "DO NOT MERGE: Revert "Add summary text to Display->Brightness level."" into oc-dev
...
am: 024bc8706d
2017-04-27 03:28:39 +00:00
TreeHugger Robot
024bc8706d
Merge "DO NOT MERGE: Revert "Add summary text to Display->Brightness level."" into oc-dev
2017-04-27 03:22:21 +00:00
Jack He
6ad51a2d10
Merge "Bluetooth: Dismiss pairing dialog on user click" into oc-dev am: fdd8d3f6ae
...
am: a16bcf17d4
2017-04-27 00:40:57 +00:00
Jack He
a16bcf17d4
Merge "Bluetooth: Dismiss pairing dialog on user click" into oc-dev
...
am: fdd8d3f6ae
2017-04-27 00:37:38 +00:00
TreeHugger Robot
fdd8d3f6ae
Merge "Bluetooth: Dismiss pairing dialog on user click" into oc-dev
2017-04-27 00:32:12 +00:00
TreeHugger Robot
6fd02de9b2
Merge "Update UI for Wifi Direct settings"
2017-04-27 00:30:07 +00:00
Ajay Panicker
5d51aa4542
Merge "Limit btsnoop file size (4/8)"
2017-04-26 23:02:40 +00:00
Fan Zhang
022ef86f1a
Update UI for Wifi Direct settings
...
- Change the launching preference from using an intent to directly a
fragemnt
- Partially convert WifiP2pSettings to a DashboardFragment
- Add a controller to control each pref category, when they have no
child, hide.
- Add a controller to control device's own AP name.
Change-Id: I23685c4d4a85f80ceab5a576005e693e6f8b7cc4
Fix: 36859626
Test: make RunSettingsRoboTests
2017-04-26 15:54:07 -07:00
Doris Ling
cf4a185aeb
DO NOT MERGE: Revert "Add summary text to Display->Brightness level."
...
This reverts commit 03ee253701
2017-04-26 21:33:16 +00:00
Sundeep Ghuman
4b49c11d87
Merge "Force update APs when enabling wifi in WifiSettings." into oc-dev am: 9797a39ad7
...
am: f292f23c0c
2017-04-26 18:54:10 +00:00
Sundeep Ghuman
f292f23c0c
Merge "Force update APs when enabling wifi in WifiSettings." into oc-dev
...
am: 9797a39ad7
2017-04-26 18:45:09 +00:00
Sundeep Ghuman
9797a39ad7
Merge "Force update APs when enabling wifi in WifiSettings." into oc-dev
2017-04-26 18:32:48 +00:00
Maurice Lam
c7e0fd90fb
Enable redaction interstitial after setting up pattern
...
Test: cd tests/robotests && mma
Bug: 37514884
Change-Id: Ie9342ca0ea893a687284d8b864c6d53a79f88086
2017-04-26 17:54:55 +00:00
Charles He
65fa77889a
Merge "Turn off QUIET_MODE before changing unified lock credential." into oc-dev am: 09317a6545
...
am: 4aad6f98f4
2017-04-26 17:07:31 +00:00
Fan Zhang
61183bfa45
Merge "Add search index provider for ConfigureNotificationSettings" into oc-dev am: f650c82b16
...
am: 07309c8f2a
2017-04-26 17:07:07 +00:00
Daniel Nishi
f9a073bb69
Merge "Don't shows Files when storage is adopted." into oc-dev am: 980155fb30
...
am: 23f6fcf90a
2017-04-26 17:06:32 +00:00
Daniel Nishi
0f127e98e5
Merge "Don't crash on opening ejecting USB." into oc-dev am: 32f95292bf
...
am: 3803bb966d
2017-04-26 17:05:59 +00:00
Charles He
4aad6f98f4
Merge "Turn off QUIET_MODE before changing unified lock credential." into oc-dev
...
am: 09317a6545
2017-04-26 13:35:52 +00:00
Charles He
09317a6545
Merge "Turn off QUIET_MODE before changing unified lock credential." into oc-dev
2017-04-26 13:29:44 +00:00
Tobias Thierer
5ce67493c3
resolve merge conflicts of 999f6a9a29 to master
...
Test: make
Change-Id: If37a66bc38d0fd02ef7465e9be86032c2aff6314
2017-04-26 12:21:23 +01:00
Julia Reynolds
e760f01788
Merge "'Allow sound' = let the app decide" into oc-dev am: f9bfab880e
...
am: bcf0c83ae2
2017-04-26 10:56:34 +00:00
jackqdyulei
6a9e198851
Merge "Distribute the misc among all the apps" into oc-dev am: e494a3e59b
...
am: 0fbccaa30b
2017-04-26 10:56:15 +00:00
jackqdyulei
89f27bcc2d
Merge "Move battery stats loading to AsyncLoader." into oc-dev am: d0ea1386ad
...
am: 303672f1d3
2017-04-26 10:55:55 +00:00
Fan Zhang
2e02794115
Merge changes I4ae01109,Ib45289c3 into oc-dev am: eda3e8c3d9
...
am: 7d04b2dab0
2017-04-26 10:55:34 +00:00
Ruchi Kandoi
068ba85a7e
Merge "Add searchable index for Bluetooth and Nfc only if the feature exists" into oc-dev am: 41a858fde1
...
am: 7094f1d170
2017-04-26 10:55:10 +00:00
Charles He
073da5c4d9
Merge "Prevent fingerprint from bypassing work challenge" into oc-dev am: 24157209c5
...
am: 9c5e338850
2017-04-26 10:54:38 +00:00
Pavel Grafov
5d567c4786
Disable "Verify apps over usb" according to user restriction.
...
This is ag/2124876 which fails to automerge oc-dev->master, so
sending as a separate change. Will add Merged-In to the original CL
before submitting to oc-dev.
Bug: 37158436
Test: make ROBOTEST_FILTER=VerifyAppsOverUsbPreferenceControllerTest RunSettingsRoboTests
Change-Id: I52d40f4176ecd660c621ec056649c94fc29f2d4b
2017-04-26 11:54:13 +01:00
Fan Zhang
07309c8f2a
Merge "Add search index provider for ConfigureNotificationSettings" into oc-dev
...
am: f650c82b16
2017-04-26 00:14:45 +00:00
TreeHugger Robot
f650c82b16
Merge "Add search index provider for ConfigureNotificationSettings" into oc-dev
2017-04-26 00:06:42 +00:00
Fan Zhang
0576ea48b5
resolve merge conflicts of e8411c4454 to master
...
Test: make RunSettingsRoboTests
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I7575438bf364f3f4a6ea0372e6216fd5d5a5bb69
2017-04-25 16:16:12 -07:00
Daniel Nishi
23f6fcf90a
Merge "Don't shows Files when storage is adopted." into oc-dev
...
am: 980155fb30
2017-04-25 22:39:54 +00:00
Daniel Nishi
3803bb966d
Merge "Don't crash on opening ejecting USB." into oc-dev
...
am: 32f95292bf
2017-04-25 22:39:35 +00:00
Felipe Leme
999f6a9a29
Merge "Implemented ACTION_REQUEST_SET_AUTOFILL_SERVICE." into oc-dev
...
am: c36ed203db
2017-04-25 22:38:20 +00:00
Daniel Nishi
980155fb30
Merge "Don't shows Files when storage is adopted." into oc-dev
2017-04-25 22:30:29 +00:00
Daniel Nishi
32f95292bf
Merge "Don't crash on opening ejecting USB." into oc-dev
2017-04-25 22:30:14 +00:00
TreeHugger Robot
c36ed203db
Merge "Implemented ACTION_REQUEST_SET_AUTOFILL_SERVICE." into oc-dev
2017-04-25 22:27:09 +00:00
Fan Zhang
bd3cbf44ac
Merge "Update account sync settings title." into oc-dev am: a031636725
...
am: c669438450
2017-04-25 22:19:10 +00:00
jackqdyulei
bf922da309
Merge "Remove STATE_TOP_SLEEPING from foreground time" into oc-dev am: e5fa4cd4b5
...
am: 1bc54ae5eb
2017-04-25 22:18:50 +00:00
Sundeep Ghuman
87bf49a436
Force update APs when enabling wifi in WifiSettings.
...
This reverts commit b2bdc8f17b
2017-04-25 15:12:00 -07:00
Julia Reynolds
bcf0c83ae2
Merge "'Allow sound' = let the app decide" into oc-dev
...
am: f9bfab880e
2017-04-25 21:56:00 +00:00
jackqdyulei
0fbccaa30b
Merge "Distribute the misc among all the apps" into oc-dev
...
am: e494a3e59b
2017-04-25 21:55:34 +00:00
