Amith Yamasani
d0ab0fecee
am 480d6eb9: Merge "Fix negative inactiveTime on creating a new user" into mnc-dev
...
* commit '480d6eb953aa12a495a080557d4ea84782db2328':
Fix negative inactiveTime on creating a new user
2015-06-12 23:45:32 +00:00
Ruben Brunk
43918a1348
am 8491d2de: Merge "Fix rounding width." into mnc-dev
...
* commit '8491d2dea90bf462b09befb604138a77d746f94a':
Fix rounding width.
2015-06-12 23:45:27 +00:00
Amith Yamasani
480d6eb953
Merge "Fix negative inactiveTime on creating a new user" into mnc-dev
2015-06-12 23:38:26 +00:00
Amith Yamasani
d82dbb3ffe
Fix negative inactiveTime on creating a new user
...
Initialize the beginIdleTime to 0 rather than current time.
Bug: 21699099
Change-Id: Ib94a9198c4e80aea5d9de68c5cf5d6f8cfc79e0a
2015-06-12 16:35:17 -07:00
Ruben Brunk
8491d2dea9
Merge "Fix rounding width." into mnc-dev
2015-06-12 23:34:51 +00:00
Adam Lesinski
ea60230592
am cd9d7b7b: Merge "App Standby: Convert constants to Settings.Global" into mnc-dev
...
* commit 'cd9d7b7b076ff28bef5403b97754ae2853db17ee':
App Standby: Convert constants to Settings.Global
2015-06-12 23:31:35 +00:00
Jeff Sharkey
f39c53f220
am 1d04e6a6: Merge "More useful extras in disk/volume broadcasts." into mnc-dev
...
* commit '1d04e6a6cd06062483e22b387c6c1a615e4e5088':
More useful extras in disk/volume broadcasts.
2015-06-12 23:31:30 +00:00
Adam Lesinski
a32f9f7847
am 87a79c39: Merge "BatteryStatsHelper: Fix some lost power" into mnc-dev
...
* commit '87a79c394dcecd28c3811615ce975abcde185255':
BatteryStatsHelper: Fix some lost power
2015-06-12 23:31:25 +00:00
Adam Lesinski
9c4298b036
am a109cc1b: Merge "BatteryStats: Wifi energy data is sometimes wrong" into mnc-dev
...
* commit 'a109cc1b6d08517ba0d9ee58bae65d3a6af739c1':
BatteryStats: Wifi energy data is sometimes wrong
2015-06-12 23:31:20 +00:00
Adam Lesinski
cd9d7b7b07
Merge "App Standby: Convert constants to Settings.Global" into mnc-dev
2015-06-12 23:20:28 +00:00
Jeff Sharkey
1d04e6a6cd
Merge "More useful extras in disk/volume broadcasts." into mnc-dev
2015-06-12 23:19:34 +00:00
Adam Lesinski
a6232df053
App Standby: Convert constants to Settings.Global
...
Use settings instead of hardcoded constants, and listen for their changes.
Bug:21640379
Change-Id: Id8305bb234f93f7c64c1a5e82e26b31504624324
2015-06-12 16:19:07 -07:00
Adam Lesinski
87a79c394d
Merge "BatteryStatsHelper: Fix some lost power" into mnc-dev
2015-06-12 23:17:47 +00:00
Jeff Sharkey
c7acac6798
More useful extras in disk/volume broadcasts.
...
Change-Id: I594166cff332aaf72b2b6357ac6ed3e6e42cbc49
2015-06-12 16:16:56 -07:00
Ruben Brunk
68e4fc8ca9
Fix rounding width.
...
Bug: 19930700
Change-Id: Ia2a1f85325e2c82e4d1ebe56aae696a207287cb7
2015-06-12 16:16:42 -07:00
Adam Lesinski
a109cc1b6d
Merge "BatteryStats: Wifi energy data is sometimes wrong" into mnc-dev
2015-06-12 23:16:10 +00:00
Adam Lesinski
57123001a4
BatteryStatsHelper: Fix some lost power
...
Looks like we were losing some power calculations from the CPU side of Bluetooth and
WiFi if there was no controller activity ocurring.
Also add finer breakdown of power to BatteryStats dumpsys for WiFi and Bluetooth.
Change-Id: Ic3ce3e4e3b854f17f9a32fd4bdc47a8ea74ca439
2015-06-12 16:12:07 -07:00
Chris Craik
e65d494325
am 4c9dafbf: Merge "Put WebViews with on a HW layer if stencil/shader clipping is needed" into mnc-dev
...
* commit '4c9dafbfecf00ba3dca0c5de61d889676bfdc7af':
Put WebViews with on a HW layer if stencil/shader clipping is needed
2015-06-12 22:56:37 +00:00
Chris Craik
4c9dafbfec
Merge "Put WebViews with on a HW layer if stencil/shader clipping is needed" into mnc-dev
2015-06-12 22:46:21 +00:00
dcashman
0045ebfe85
am 1a3048f3: Merge "Don\'t use upgrade-key-sets check when scanning during boot." into mnc-dev
...
* commit '1a3048f3677680823b52d3b0d538917d08da8495':
Don't use upgrade-key-sets check when scanning during boot.
2015-06-12 22:33:03 +00:00
Ruben Brunk
531106c7a8
am e36829ee: Merge "Fix legacy disconnect callback." into mnc-dev
...
* commit 'e36829ee00d178846cb95bebde41cc9204edcd76':
Fix legacy disconnect callback.
2015-06-12 22:32:59 +00:00
dcashman
1a3048f367
Merge "Don't use upgrade-key-sets check when scanning during boot." into mnc-dev
2015-06-12 22:22:00 +00:00
Ruben Brunk
e36829ee00
Merge "Fix legacy disconnect callback." into mnc-dev
2015-06-12 22:21:54 +00:00
Adam Lesinski
f4013aa4f7
BatteryStats: Wifi energy data is sometimes wrong
...
Wifi energy data sometimes reports negative values. The bug
is filed, but in the meanwhile, batterystats calculations
are way off due to strange values.
Now we ignore invalid data, and sample again later.
Bug:21613534
Change-Id: I3c5c1385e15d85346e6fd3a2737cb58ca706ab74
2015-06-12 15:18:06 -07:00
Paul McLean
a73925104b
am 7d441225: Merge "Fixing no first "device added" notification." into mnc-dev
...
* commit '7d4412255b3dc5625444f33f04abf57683351aad':
Fixing no first "device added" notification.
2015-06-12 22:17:45 +00:00
Paul McLean
7d4412255b
Merge "Fixing no first "device added" notification." into mnc-dev
2015-06-12 22:07:49 +00:00
Stefan Kuhne
b739025e69
am 11e6fcb5: Merge "Removing screen artifacts afer orientation change in sleep mode" into mnc-dev
...
* commit '11e6fcb5a8c031460cf2c2997ba0f807858bd37c':
Removing screen artifacts afer orientation change in sleep mode
2015-06-12 22:04:30 +00:00
Mike Lockwood
943aef225d
am d5ca05c3: Merge "MidiDeviceServer: Fix race condition in setting device server\'s mDeviceInfo" into mnc-dev
...
* commit 'd5ca05c3dd3c9cd2879b15ef2444c2c33824e01b':
MidiDeviceServer: Fix race condition in setting device server's mDeviceInfo
2015-06-12 22:04:26 +00:00
Adrian Roos
be44a62e48
am 6a25e400: Label work profile notification badge for a11y
...
* commit '6a25e400cf927067421a784f58c1bf0f1a7c2cf1':
Label work profile notification badge for a11y
2015-06-12 22:04:14 +00:00
Paul McLean
cbeb8a2a3e
Fixing no first "device added" notification.
...
bug: 21674851
Change-Id: I3b2ed1cf00342471a5c70f2aecc832480d7e06fd
2015-06-12 15:00:16 -07:00
Stefan Kuhne
11e6fcb5a8
Merge "Removing screen artifacts afer orientation change in sleep mode" into mnc-dev
2015-06-12 21:54:25 +00:00
Eric Laurent
5d54db1fdd
am 7413ab67: Merge "audioservice: remove BT SCO device when service is disconnected" into mnc-dev
...
* commit '7413ab673132c455663d6e4079fe5c2158b5046b':
audioservice: remove BT SCO device when service is disconnected
2015-06-12 21:51:51 +00:00
Jeff Sharkey
b2181aef48
am 8dd7ad74: Merge "Send along the disk ID that we just scanned." into mnc-dev
...
* commit '8dd7ad7429d871baf60f371c51b89b0daef73396':
Send along the disk ID that we just scanned.
2015-06-12 21:51:43 +00:00
Mike Lockwood
d5ca05c3dd
Merge "MidiDeviceServer: Fix race condition in setting device server's mDeviceInfo" into mnc-dev
2015-06-12 21:51:39 +00:00
Adrian Roos
6a25e400cf
Label work profile notification badge for a11y
...
Bug: 21165217
Change-Id: I9d326332af0780c34dfd5cba182ff74a2bc34950
2015-06-12 21:51:29 +00:00
Eric Laurent
7413ab6731
Merge "audioservice: remove BT SCO device when service is disconnected" into mnc-dev
2015-06-12 21:42:55 +00:00
Jeff Sharkey
8dd7ad7429
Merge "Send along the disk ID that we just scanned." into mnc-dev
2015-06-12 21:40:35 +00:00
Ruben Brunk
b44864e76b
Fix legacy disconnect callback.
...
Bug: 21708377
Change-Id: I17e9fe0fda77e8f4cb00578d5d9658dc24cab543
2015-06-12 14:39:12 -07:00
Doris Liu
0fbd61ec26
am 0b9fd85f: Merge "Change ActionBar animtion from/to ActionMode" into mnc-dev
...
* commit '0b9fd85f8f08fb0fc19af75a386d14e103745561':
Change ActionBar animtion from/to ActionMode
2015-06-12 21:38:57 +00:00
Nick Chalko
c35bdfdfc0
am 7298749d: Merge "Improve javadoc for onTune and notifyVideoAvailable." into mnc-dev
...
* commit '7298749d48a9cff4dae3c189445a990700c43f31':
Improve javadoc for onTune and notifyVideoAvailable.
2015-06-12 21:38:52 +00:00
Jeff Sharkey
e9b64f9735
Send along the disk ID that we just scanned.
...
Change-Id: I33f1a5363ed171f715b2f6c5690fcee586a8a58c
2015-06-12 14:38:50 -07:00
Eric Laurent
98859b256e
audioservice: remove BT SCO device when service is disconnected
...
Bug: 21727956.
Change-Id: I9dd68ad83583cdbe7454724098c89daf70bee726
2015-06-12 14:35:59 -07:00
Chris Craik
e99cd0f1cb
am eaef7b6c: Merge "Fix roundrect clipping / blending ordering" into mnc-dev
...
* commit 'eaef7b6cb14fd8b9886cc66bea272fc3ab9f7312':
Fix roundrect clipping / blending ordering
2015-06-12 21:33:38 +00:00
Doris Liu
0b9fd85f8f
Merge "Change ActionBar animtion from/to ActionMode" into mnc-dev
2015-06-12 21:31:48 +00:00
Nick Chalko
7298749d48
Merge "Improve javadoc for onTune and notifyVideoAvailable." into mnc-dev
2015-06-12 21:31:30 +00:00
Chris Craik
eaef7b6cb1
Merge "Fix roundrect clipping / blending ordering" into mnc-dev
2015-06-12 21:23:23 +00:00
Stefan Kuhne
9326dc1407
Removing screen artifacts afer orientation change in sleep mode
...
Avoiding screen artifacts upon rotation change in sleep mode. This will
be done by postponing orientation changes until the entire UI got drawn.
Bug: 16849724
Change-Id: Ib1d818258d12f5c1909de4558af46aec27e29c75
2015-06-12 11:22:05 -10:00
Doris Liu
94283533ab
Change ActionBar animtion from/to ActionMode
...
This CL changes the animation going from/to ActionMode per UX request.
The previous animation uses a combination of scale and translation
animation, whereas the new animation uses fade-out and then fade-in
(no cross-fade) for the action bar transition.
Bug: 20882034
Change-Id: I06286a215d058ed6f9f2023a4f0bcc60fa7ef46f
2015-06-12 14:21:30 -07:00
Tyler Gunn
cd53cfe867
am 8a90866a: Merge "Correct issues with VideoProvider discovered via CTS tests." into mnc-dev
...
* commit '8a90866a9a70b8610035f38c610585b945ae0871':
Correct issues with VideoProvider discovered via CTS tests.
2015-06-12 21:14:55 +00:00
Tyler Gunn
8a90866a9a
Merge "Correct issues with VideoProvider discovered via CTS tests." into mnc-dev
2015-06-12 21:04:04 +00:00