Andrew Solovay
9c7fa9c090
am 99aa0c17: am 5119f6e6: am 3f22f22a: am bff632c8: Merge "doc: Documented how to set notification priority." into klp-docs
...
* commit '99aa0c17d2f033590314272007fee435191ce551':
doc: Documented how to set notification priority.
2014-05-09 21:54:52 +00:00
Chris Craik
90eaf92e32
am 7e13d1d4: am f6c9c420: Merge "Correct stride for drawing to cached glyph bitmap"
...
* commit '7e13d1d4a46a01ebaa412d622ef76d90bd39d12a':
Correct stride for drawing to cached glyph bitmap
2014-05-09 21:51:49 +00:00
Selim Gurun
049803a00e
Merge "Cleanup remainings of old webview."
2014-05-09 21:50:31 +00:00
Chris Craik
7e13d1d4a4
am f6c9c420: Merge "Correct stride for drawing to cached glyph bitmap"
...
* commit 'f6c9c4204c2f8f86277d081112c9dd863ddaa778':
Correct stride for drawing to cached glyph bitmap
2014-05-09 21:46:43 +00:00
Chris Craik
f6c9c4204c
Merge "Correct stride for drawing to cached glyph bitmap"
2014-05-09 21:39:55 +00:00
Chris Craik
07d70172a6
Merge "Fix Bitmap.cpp line endings"
2014-05-09 21:39:48 +00:00
Ruchi Kandoi
2b3e85683d
Merge "Display: Brightness: Low power mode scales the brightness to 50 percent."
2014-05-09 21:34:19 +00:00
Jorim Jaggi
1d0861dd6c
Merge "Move Carrier label into universal status bar header."
2014-05-09 21:23:51 +00:00
Ruchi Kandoi
f974cc8706
Display: Brightness: Low power mode scales the brightness to 50 percent.
...
When the device is in low power mode all changes to brightness will be
scaled to half of the brightness that would be normally set when not in
low power mode.
Change-Id: I03be820ef64c1d5631ded35f7dfc2799e807226b
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2014-05-09 21:17:33 +00:00
Andrew Solovay
99aa0c17d2
am 5119f6e6: am 3f22f22a: am bff632c8: Merge "doc: Documented how to set notification priority." into klp-docs
...
* commit '5119f6e6db1cd7254ee71537a56bd133eb7e6a09':
doc: Documented how to set notification priority.
2014-05-09 21:15:10 +00:00
Vinod Krishnan
07bb4c3063
Merge "resolved conflicts for merge of 88aa8aab to master"
2014-05-09 21:11:08 +00:00
Andrew Solovay
5119f6e6db
am 3f22f22a: am bff632c8: Merge "doc: Documented how to set notification priority." into klp-docs
...
* commit '3f22f22aab7d641b9d56e57a2ceec6614e09a5d8':
doc: Documented how to set notification priority.
2014-05-09 21:10:28 +00:00
Dianne Hackborn
37de098935
Battery stats tweaks.
...
- Generate currently active events when a partial
history is requested.
- Tag wake lock release with the wake lock name if it is
different than the one that was acquired.
- New RESET mark for the start of the history.
Change-Id: Ic105656649c46f52855946ed0ad7f98f1d24dedc
2014-05-09 14:07:38 -07:00
Andrew Solovay
3f22f22aab
am bff632c8: Merge "doc: Documented how to set notification priority." into klp-docs
...
* commit 'bff632c8ff3e1f889093fcb070e86ffb19fce0ef':
doc: Documented how to set notification priority.
2014-05-09 21:05:06 +00:00
Andrew Solovay
bff632c8ff
Merge "doc: Documented how to set notification priority." into klp-docs
2014-05-09 21:01:08 +00:00
Chris Craik
32054b0b3e
Fix Bitmap.cpp line endings
...
Change-Id: Icc0b067437fffaa599c92841518ad0d526112f59
2014-05-09 13:59:36 -07:00
Lajos Molnar
0f94e3f5ed
Merge "Added MediaCodec.releaseOutputBuffer() method with render timestamp"
2014-05-09 20:58:57 +00:00
Jorim Jaggi
9054d94cba
Move Carrier label into universal status bar header.
...
Also introduces a different height for the header area on keyguard,
as it looks better with less padding when no background is here (and
is closer to the mocks).
Change-Id: Ie9b94dcf823c3e4af83a22f5fae15d9033e146fd
2014-05-09 22:47:28 +02:00
Lajos Molnar
7c513b6bef
Added MediaCodec.releaseOutputBuffer() method with render timestamp
...
Bug: 11784827
Change-Id: I67097c8e69b40ef3baa436f0e7731d28c696735c
2014-05-09 20:43:30 +00:00
Vinod Krishnan
4a3735d081
resolved conflicts for merge of 88aa8aab to master
...
Change-Id: I6d3a9885f8cf3b632267b5722e59d4968efe17f7
2014-05-09 13:23:41 -07:00
Jorim Jaggi
f992066731
Merge "Reparent status bar icons into header when expanded."
2014-05-09 20:16:56 +00:00
Jorim Jaggi
0d74eeb9ec
Reparent status bar icons into header when expanded.
...
This change moves the status bar icons into the quick settings header
when the status bar is expanded. Also, the universal header is now
showing on the Keyguard.
Change-Id: Ib91f7e0b8de9f852676a11b500c4419183db1b90
2014-05-09 22:05:24 +02:00
Alan Viverette
5e92c95d84
Animated state transition drawable
...
Change-Id: I6c795d55cd7ab9163fdd6fe6ce3771bbd7015d62
2014-05-09 13:03:12 -07:00
Dan Sandler
3f4c72f42b
Merge "Fix misaligned vectors. #cannotunsee"
2014-05-09 19:39:59 +00:00
Dan Sandler
0b9c9f745c
Fix misaligned vectors. #cannotunsee
...
Change-Id: Idacc34dc77a811b6355a19b4715309f4e4e29fde
2014-05-09 15:38:30 -04:00
Yin-Chia Yeh
e2e5527ef3
Merge "Camera2: Minor update for exposureCompensation spec"
2014-05-09 19:02:09 +00:00
Yin-Chia Yeh
a4227dfe48
Camera2: Minor update for exposureCompensation spec
...
doc change only
Change-Id: I4bcc461cd9d592d5b15beda45f2b6176d7efde37
2014-05-09 12:01:10 -07:00
Jorim Jaggi
3084a2996f
Revert "Fix measure performance of whole status bar window."
...
This reverts commit 5ef8eb5661f1b3c0723348f723778be247a2f365.
2014-05-09 20:52:00 +02:00
Vinod Krishnan
88aa8aab3d
am c4ebd014: Merge "Adding a margin for the AlertDialog to work on circular UI." into klp-modular-dev
...
* commit 'c4ebd014cec31a2d5a18c2339681ca71bd1f5d0e':
Adding a margin for the AlertDialog to work on circular UI.
2014-05-09 18:09:53 +00:00
Kenny Root
d7d2d43b49
WindowManagerService: add some defensive checks
...
Add checks before posting a message to the handler thread where
exceptions will crash the service.
Also make KeyguardLock fields final.
Bug: 14564617
Change-Id: I147d579d942f5fa555714d204cde52e2cd5f6154
2014-05-09 11:08:54 -07:00
Vinod Krishnan
c4ebd014ce
Merge "Adding a margin for the AlertDialog to work on circular UI." into klp-modular-dev
2014-05-09 18:05:10 +00:00
Vinod Krishnan
119ba2c72d
Adding a margin for the AlertDialog to work on circular UI.
...
- also removing the background completely for sdk >= 20
Change-Id: I239c8d066bb7ed0d1ab852a4d162475948b8a0d5
2014-05-09 11:03:20 -07:00
Chris Craik
e1f788b3e2
Merge "Rename matrices for consistency"
2014-05-09 18:02:53 +00:00
Brian Carlstrom
94f2aa6b19
am 0b0a52c1: am 09d11896: am edc31509: am b98ca5b0: Merge "If PackageUsage information is missing, treat as first boot and compile everything"
...
* commit '0b0a52c1ce381bdef2b857f850f1030a8bd3a50e':
If PackageUsage information is missing, treat as first boot and compile everything
2014-05-09 17:48:53 +00:00
Glenn Kasten
40cf0590b6
am 750a2b05: Merge "Unhide AudioTrack support for ENCODING_PCM_FLOAT"
...
* commit '750a2b05a54612c6ed2aa8796e659b00bf21caa0':
Unhide AudioTrack support for ENCODING_PCM_FLOAT
2014-05-09 17:48:49 +00:00
Craig Mautner
8ce0279fa5
am 87bf3b28: Merge "Introduce persistent forms of Activity lifecycle calls."
...
* commit '87bf3b28f3b94464384c8f6adb7867233c960543':
Introduce persistent forms of Activity lifecycle calls.
2014-05-09 17:44:37 +00:00
Brian Carlstrom
809146690d
am 09d11896: am edc31509: am b98ca5b0: Merge "If PackageUsage information is missing, treat as first boot and compile everything"
...
* commit '09d1189668a74b2cd4a6af124e95c9e6786499f2':
If PackageUsage information is missing, treat as first boot and compile everything
2014-05-09 17:42:50 +00:00
Glenn Kasten
4b0c34600c
Merge "Unhide AudioTrack support for ENCODING_PCM_FLOAT"
2014-05-09 17:42:04 +00:00
Craig Mautner
d9ddf2e9d0
Merge "Introduce persistent forms of Activity lifecycle calls."
2014-05-09 17:38:53 +00:00
Brian Carlstrom
09d1189668
am edc31509: am b98ca5b0: Merge "If PackageUsage information is missing, treat as first boot and compile everything"
...
* commit 'edc31509c2ff8cba86f30c836934d32a3e249dec':
If PackageUsage information is missing, treat as first boot and compile everything
2014-05-09 17:38:10 +00:00
Brian Carlstrom
edc31509c2
am b98ca5b0: Merge "If PackageUsage information is missing, treat as first boot and compile everything"
...
* commit 'b98ca5b0dd73f374178022b4a4b37412f01a3c03':
If PackageUsage information is missing, treat as first boot and compile everything
2014-05-09 17:33:04 +00:00
Brian Carlstrom
b98ca5b0dd
Merge "If PackageUsage information is missing, treat as first boot and compile everything"
2014-05-09 17:29:06 +00:00
Jorim Jaggi
fb530588f9
am af473120: Merge "Remove expansion and clear button."
...
* commit 'af47312044a0c3d4fc1f60cba5761e30c6805590':
Remove expansion and clear button.
2014-05-09 17:21:28 +00:00
Jorim Jaggi
dedbffac99
am a9f3d599: Merge "Make header card look clickable."
...
* commit 'a9f3d5990208ac9919f3d5cf5270b5b6c7b323b2':
Make header card look clickable.
2014-05-09 17:21:25 +00:00
Jorim Jaggi
0557476eb0
Merge "Remove expansion and clear button."
2014-05-09 17:17:05 +00:00
Jorim Jaggi
b5e17a0422
Merge "Make header card look clickable."
2014-05-09 17:16:48 +00:00
Jason Monk
52cb4ef7c9
am d8bbf999: Merge "Fix badness from proxy refactoring."
...
* commit 'd8bbf9994979e17c18f65b4e4ae3231187f1e3a5':
Fix badness from proxy refactoring.
2014-05-09 17:16:46 +00:00
Jorim Jaggi
bff1f071f3
Remove expansion and clear button.
...
...
Change-Id: I965317ba221092f970dc9324dd538a7bde5c0642
2014-05-09 19:16:16 +02:00
Jason Monk
c241db85c9
Merge "Fix badness from proxy refactoring."
2014-05-09 17:11:15 +00:00
Brian Carlstrom
7c5c864c8a
If PackageUsage information is missing, treat as first boot and compile everything
...
Bug: 14663243
Change-Id: I0ae33882044211f777590f482e17e87596be4463
2014-05-09 09:52:09 -07:00