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
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
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
Stephen Chen
d2fb2b7718
Merge "Make connected Wi-Fi message multiline to avoid cutoff." into oc-dev am: 6c85dbaea2
...
am: ae7d423c74
2017-04-25 22:18:28 +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
jackqdyulei
303672f1d3
Merge "Move battery stats loading to AsyncLoader." into oc-dev
...
am: d0ea1386ad
2017-04-25 21:55:10 +00:00
TreeHugger Robot
f9bfab880e
Merge "'Allow sound' = let the app decide" into oc-dev
2017-04-25 21:45:20 +00:00
TreeHugger Robot
e494a3e59b
Merge "Distribute the misc among all the apps" into oc-dev
2017-04-25 21:44:55 +00:00
TreeHugger Robot
d0ea1386ad
Merge "Move battery stats loading to AsyncLoader." into oc-dev
2017-04-25 21:44:06 +00:00
Daniel Sheng
e531c540c2
Merge "Added settings UI for camera lift trigger gesture"
2017-04-25 20:43:55 +00:00
Daniel Sheng
4cdc1d98b1
Merge "Added suggestion category for camera lift gesture"
2017-04-25 20:43:55 +00:00
Felipe Leme
db2b55a244
Implemented ACTION_REQUEST_SET_AUTOFILL_SERVICE.
...
Bug: 37673809
Fixes: 37576671
Test: manual verification
Test: make RunSettingsRoboTests -j90
Change-Id: I36170cb715473dfbf598deedd9719a46168aabc8
2017-04-25 13:30:05 -07:00
jackqdyulei
106dc459e0
Move battery stats loading to AsyncLoader.
...
It takes 3-4 seconds to load the battery settings page in Ryu. Main
reason is that it takes too long to init BatteryStatsHelper.
This cl moves loading code to AsyncLoader, and we will refresh ui once
the loading part is finished.
Following cl will add animation for the battery header to make it not
so janky
Bug: 37196170
Test: RunSettingsRoboTest
Change-Id: I40dfdde4a072e28a56c8fdf0ec6d671b5109fc6d
2017-04-25 13:26:17 -07:00
Fan Zhang
7d04b2dab0
Merge changes I4ae01109,Ib45289c3 into oc-dev
...
am: eda3e8c3d9
2017-04-25 20:22:45 +00:00
TreeHugger Robot
eda3e8c3d9
Merge changes I4ae01109,Ib45289c3 into oc-dev
...
* changes:
Remove shadow below app info header.
Fix ANR in installed app details.
2017-04-25 20:16:20 +00:00
Fan Zhang
a25bc6983e
Add search index provider for ConfigureNotificationSettings
...
Change-Id: I1da8e318a8823ffe54b2edd7a83a8c7e31ee34e6
Fix: 37593839
Test: make RunSettingsRoboTests
2017-04-25 13:01:36 -07:00
Ruchi Kandoi
7094f1d170
Merge "Add searchable index for Bluetooth and Nfc only if the feature exists" into oc-dev
...
am: 41a858fde1
2017-04-25 19:20:06 +00:00
TreeHugger Robot
41a858fde1
Merge "Add searchable index for Bluetooth and Nfc only if the feature exists" into oc-dev
2017-04-25 19:05:42 +00:00
Charles He
9c5e338850
Merge "Prevent fingerprint from bypassing work challenge" into oc-dev
...
am: 24157209c5
2017-04-25 19:01:35 +00:00
Fan Zhang
e8411c4454
Merge "Properly check wallpaper state before showing suggestion" into oc-dev
...
am: db68ddc1cc
2017-04-25 18:59:52 +00:00
Fan Zhang
c669438450
Merge "Update account sync settings title." into oc-dev
...
am: a031636725
2017-04-25 18:59:34 +00:00
TreeHugger Robot
24157209c5
Merge "Prevent fingerprint from bypassing work challenge" into oc-dev
2017-04-25 18:59:34 +00:00
Fan Zhang
db68ddc1cc
Merge "Properly check wallpaper state before showing suggestion" into oc-dev
2017-04-25 18:55:53 +00:00
Fan Zhang
a031636725
Merge "Update account sync settings title." into oc-dev
2017-04-25 18:55:29 +00:00
