Elliott Hughes
ff3ca6f61a
Fix Os.link apicheck breakage.
...
Change-Id: I4fa4c21b3c373e18209ea88d72714e4f7f8a7bb4
2014-05-09 20:25:38 -07:00
Adam Powell
17048b84ec
Merge "Revert "Remove the View#initializeScrollbars API""
2014-05-10 01:51:54 +00:00
Adam Powell
d20aa6c531
Revert "Remove the View#initializeScrollbars API"
...
Looks like there are some bugs in the API checker for @removed.
This reverts commit 172c26e20fd71a2b4489a80b96ea5f6292db6430.
Change-Id: Ia4e610f71af19c5521fc019b9a6c26d0c11f23f1
2014-05-10 01:51:27 +00:00
Adam Powell
0604dbc18e
Merge "Remove the View#initializeScrollbars API"
2014-05-10 01:03:52 +00:00
Adam Powell
5d4c35d1ea
Remove the View#initializeScrollbars API
...
This was never a safe API for apps to call since the TypedArray
parameter must have been obtained by filtering on
android.R.styleable.View, which is not public. Any behavior in the
wild has therefore been undefined.
Change-Id: Id19f571c92748ef2a8c036072fd83a417527f779
2014-05-09 17:32:38 -07:00
Winson Chung
6be810570f
Merge "Adding dismiss method on the top cards, and disabling the app info pane."
2014-05-10 00:24:27 +00:00
Winson Chung
54e297a5bb
Adding dismiss method on the top cards, and disabling the app info pane.
2014-05-09 17:15:32 -07:00
Chris Craik
2417f7e08c
Merge "Simplify projection matrix management."
2014-05-09 23:55:25 +00:00
Winson Chung
77dd7ce506
Merge "Fixing crash in Activity.onApplyTheme()."
2014-05-09 23:42:49 +00:00
Winson Chung
4d1a434cbd
Fixing crash in Activity.onApplyTheme().
2014-05-09 16:42:00 -07:00
Winson Chung
b7a6e198fe
Merge changes I5d21645b,I8928e357
...
* changes:
Fixing NPE in accessing theme attribute.
Better transition between excluded-from-recent applications to recents.
2014-05-09 23:25:58 +00:00
Winson Chung
aca960204e
Fixing NPE in accessing theme attribute.
...
Change-Id: I5d21645b5530f13e1709021bd818de6bdb1d6544
2014-05-09 16:18:55 -07:00
John Reck
c42bfb95c6
Merge "Refactor VirtualLightRefBase & JNI"
2014-05-09 23:18:26 +00:00
Ruchi Kandoi
195111641c
Merge "Vibrator: Minor coding style changes."
2014-05-09 23:13:07 +00:00
Chris Craik
0c0ec26366
Simplify projection matrix management.
...
Store in and use from snapshot, and remove the kFlagOrthoDirty flag,
as it's redundant with kFlagIsFboLayer.
Change-Id: I2bd380192d50117f4ce1fd2058213669a886f406
2014-05-09 16:11:14 -07:00
Ruchi Kandoi
664703d6be
Vibrator: Minor coding style changes.
...
Corrects the coding style errors caused by
I762be1d51eedbf3184d80ed51dc93a0d113a6d5d
Change-Id: I5adb713611f5479b21dd32ed8d8d51cb1910bca9
2014-05-09 16:01:31 -07:00
John Spurlock
4f9d2597f8
Merge "Temporary workaround for recent system UI regression."
2014-05-09 22:51:05 +00:00
John Spurlock
d0b006e21e
Temporary workaround for recent system UI regression.
...
Bug:14680799
Change-Id: I865c12794df2436aeee5ebd00ee1fbb7a9178594
2014-05-09 18:42:43 -04:00
Dianne Hackborn
a90f9e435f
Merge "Battery stats tweaks."
2014-05-09 22:34:36 +00:00
John Reck
9fa4071c47
Refactor VirtualLightRefBase & JNI
...
Change-Id: I8e244e7109e59d5be96871b23bb9b1201c7f9eaa
2014-05-09 15:28:54 -07:00
Kenny Root
e928957316
Merge "WindowManagerService: add some defensive checks"
2014-05-09 22:20:20 +00:00
Chris Craik
f9075798d7
am 90eaf92e: am 7e13d1d4: am f6c9c420: Merge "Correct stride for drawing to cached glyph bitmap"
...
* commit '90eaf92e325457ccb30286879a2f92b7ba517c7d':
Correct stride for drawing to cached glyph bitmap
2014-05-09 22:00:02 +00:00
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