Justin Ho
6bdf5c39d8
am 1f61ad17: (-s ours) am 3810c08b: Merge "DO NOT MERGE - Fixing ringtones that were put in as notifications" into gingerbread
2010-10-26 16:10:57 -07:00
Irfan Sheriff
a8413beb39
Merge "WifiLock extensions for high performance mode"
2010-10-26 16:08:29 -07:00
Justin Ho
1f61ad1728
am 3810c08b: Merge "DO NOT MERGE - Fixing ringtones that were put in as notifications" into gingerbread
2010-10-26 16:08:13 -07:00
Justin Ho
3810c08bbc
Merge "DO NOT MERGE - Fixing ringtones that were put in as notifications" into gingerbread
2010-10-26 16:06:28 -07:00
Adam Cohen
e1838c773d
Merge "- Made showNext() and showPrevious() on StackView remotable - Made StackView show the transition when showNext() or showPrevious() is called"
2010-10-26 15:51:57 -07:00
Adam Cohen
3352b6807f
- Made showNext() and showPrevious() on StackView remotable
...
- Made StackView show the transition when showNext() or
showPrevious() is called
Change-Id: Id6e3e6d9ff374c037323f77d247f1a1e4398009e
2010-10-26 15:46:31 -07:00
Justin Ho
95ce5b20c8
DO NOT MERGE - Fixing ringtones that were put in as notifications
...
Change-Id: I09a8a0f369604a6332b921b9e944a800ec4d6677
2010-10-26 15:34:07 -07:00
Dianne Hackborn
adf840ea0c
Merge "ClipDescription no longer inherits from ClipData."
2010-10-26 15:25:18 -07:00
Dianne Hackborn
f834dfabbc
ClipDescription no longer inherits from ClipData.
...
Change-Id: Ie4939f87c7e1628d9c19ecb5c0b3036d1f76ef29
2010-10-26 15:23:15 -07:00
Romain Guy
2d38cc80af
Merge "Enable display lists."
2010-10-26 14:26:15 -07:00
Romain Guy
0d9275e565
Enable display lists.
...
Change-Id: Id0d9b987251da5b7ecbb5497a55dbb5937430316
2010-10-26 14:22:30 -07:00
Gloria Wang
4bd78cbe87
Merge "Do not create drm directory here. Fix for bug 3134576."
2010-10-26 14:16:47 -07:00
Raphael
f241c40476
Revert "Fix rendering of digitalClock/Gallery in Eclipse editors."
...
This reverts commit 25e96ce7b99f9736a6024d25bd65a83774c7640f.
2010-10-26 13:55:10 -07:00
Irfan Sheriff
5876a4273e
WifiLock extensions for high performance mode
...
Add extension to WifiLock to allow apps to operate
in high performance mode (high power & disable suspend
optimizations for battery consumption).
Bug: 2834260
Change-Id: Id394d265b9876bf0230efb3d222056e9b80b44fd
2010-10-26 13:25:03 -07:00
Chet Haase
9440083be2
Merge "Optimizing ColorFilter in display lists"
2010-10-26 12:53:57 -07:00
Chet Haase
ad93c2bb63
Optimizing ColorFilter in display lists
...
Change-Id: Ie4d5e5b0bc45e0ce47bba144049303c270762e54
2010-10-26 12:52:03 -07:00
Daniel Sandler
fdfe1a6bef
Merge "Remove logspew."
2010-10-26 12:48:35 -07:00
Daniel Sandler
91fb28caf6
Remove logspew.
...
Change-Id: Ic713febfb1d92d19321ed512dbf6f38e5e2dfbf4
2010-10-26 15:37:36 -04:00
Mathias Agopian
32b1dd2632
am 85c5ca07: am 2f19f56a: Merge "Updade Surface (ANativeWindow) format based on its buffers format" into gingerbread
2010-10-26 12:26:23 -07:00
Mathias Agopian
49d1735482
am 1b98a9e6: am 5219dd8e: Merge "add format parameter to setBufferGeometry" into gingerbread
2010-10-26 12:23:53 -07:00
Mathias Agopian
324be17021
am d9588e9c: am a7b745ca: Merge "fix eglChooseConfig() for special attributes." into gingerbread
2010-10-26 12:23:46 -07:00
Mathias Agopian
85c5ca07b9
am 2f19f56a: Merge "Updade Surface (ANativeWindow) format based on its buffers format" into gingerbread
2010-10-26 12:22:12 -07:00
Mathias Agopian
1b98a9e6a9
am 5219dd8e: Merge "add format parameter to setBufferGeometry" into gingerbread
2010-10-26 12:19:48 -07:00
Mathias Agopian
d9588e9c3c
am a7b745ca: Merge "fix eglChooseConfig() for special attributes." into gingerbread
2010-10-26 12:19:43 -07:00
Mathias Agopian
2f19f56ac5
Merge "Updade Surface (ANativeWindow) format based on its buffers format" into gingerbread
2010-10-26 12:18:32 -07:00
Mathias Agopian
5219dd8e29
Merge "add format parameter to setBufferGeometry" into gingerbread
2010-10-26 12:18:19 -07:00
Jeff Hamilton
eb1f2de631
am f56aac4b: am d8cf2125: Merge "Add a way to get a string for an error code." into gingerbread
2010-10-26 12:18:08 -07:00
Mathias Agopian
a7b745ca75
Merge "fix eglChooseConfig() for special attributes." into gingerbread
2010-10-26 12:18:07 -07:00
Jeff Hamilton
f56aac4b6e
am d8cf2125: Merge "Add a way to get a string for an error code." into gingerbread
2010-10-26 12:16:10 -07:00
Jeff Hamilton
d8cf2125c1
Merge "Add a way to get a string for an error code." into gingerbread
2010-10-26 12:14:17 -07:00
Xavier Ducrohet
68404a0125
am a44a5e02: am 1b6180ec: Merge "Fix rendering of digitalClock/Gallery in Eclipse editors." into gingerbread
2010-10-26 12:13:32 -07:00
Gloria Wang
a784d4ed25
Do not create drm directory here. Fix for bug 3134576.
...
Change-Id: I1e26ff32b1c2d97464d544c2455eab0a726e3294
2010-10-26 12:11:55 -07:00
Xavier Ducrohet
a44a5e02d2
am 1b6180ec: Merge "Fix rendering of digitalClock/Gallery in Eclipse editors." into gingerbread
2010-10-26 12:10:28 -07:00
Jeff Hamilton
68a5c9f3cf
Add a way to get a string for an error code.
...
Change-Id: I133e974c656eb558349cbc3f9a2caf5b18c8fc3d
2010-10-26 14:09:48 -05:00
Xavier Ducrohet
1b6180ec31
Merge "Fix rendering of digitalClock/Gallery in Eclipse editors." into gingerbread
2010-10-26 12:09:18 -07:00
James Dong
ee1dc6221f
Merge "Remove unused and hidden setVideoEncoderLevel() from MediaRecorder.java"
2010-10-26 12:01:39 -07:00
Gil Dobjanschi
23617befe4
Merge "Effects and overlays are not modified when a video clip is trimmed."
2010-10-26 11:50:04 -07:00
Jaikumar Ganesh
7d0f553852
Merge "Fix A2DP connection problem, if disconnected while playing music."
2010-10-26 11:31:44 -07:00
James Dong
a0cab99dd2
Remove unused and hidden setVideoEncoderLevel() from MediaRecorder.java
...
Change-Id: Ia464d79d65e43c84937624c5a6fa77c7155cffaa
2010-10-26 11:30:42 -07:00
Patrick Scott
bb8300e155
Merge "Fix debug statements and aapt assert."
2010-10-26 11:26:19 -07:00
Jaikumar Ganesh
b2ec4fa8d7
Fix A2DP connection problem, if disconnected while playing music.
...
Change-Id: I594564c11dc1698f00f9db3e6f6e4f8da9e2fe69
2010-10-26 11:22:48 -07:00
Dianne Hackborn
78098341f8
Merge "Fix issue #3130426 : Finsky crash in switching from window carousel"
2010-10-26 11:20:06 -07:00
Gilles Debunne
5b78d8a886
Merge "New Holo style for Tabs."
2010-10-26 11:18:51 -07:00
Xavier Ducrohet
25e96ce7b9
Fix rendering of digitalClock/Gallery in Eclipse editors.
...
Change-Id: I80f4f90b173529632eaf2fbc3bb5471b7ede8216
2010-10-26 11:18:39 -07:00
Dianne Hackborn
fb3cffeb35
Fix issue #3130426 : Finsky crash in switching from window carousel
...
Need to note that we no longer have saved state before delivering
results or new intents to an activity.
Also do some work on loaders to prevent apps from making fragment
changes as a result of receiving loader data. This makes apps
consistent crash in a case that they would previously sometimes
crash (if they got the loader data after onPause).
Change-Id: I46e9e46d0aa05d9d7d6a275a2a488a18a20a5747
2010-10-26 11:09:54 -07:00
Gilles Debunne
44c1473c03
New Holo style for Tabs.
...
Holo theme with new assets and style for TabWidgets.
Legacy Themes still use GB style.
Assets added in a previous bluk update were removed.
Change-Id: Ia4a612678561fa5047bbd2a72488086c0f3d61a1
2010-10-26 11:08:05 -07:00
Irfan Sheriff
f235c5ab91
add wps pin from device capability
...
Bug: 3119043
Bug: 3112178
Change-Id: Iaae6bcf53e11f7fac82b3c604ddc27ff05e00542
2010-10-26 10:48:11 -07:00
Patrick Scott
4f145c9674
Fix debug statements and aapt assert.
...
ENABLE_PSEUDOLOCALIZE seems to not exist.
Change-Id: Ifef771a96938c7ff0f8b664142bb502030b8c543
2010-10-26 13:22:17 -04:00
Shimeng (Simon) Wang
48c9daac20
Merge "Fix the viewport height to view height when title bar is visible."
2010-10-26 10:05:20 -07:00
James Dong
028b537051
Merge "Add two creation flags to OMXCodec::Create()"
2010-10-26 09:26:24 -07:00