ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
41,491 Commits 2 Branches 0 Tags 54 MiB
c1140c41a5
Commit Graph

41491 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Sandler
f2e05f1750 am 2a40d0d9: Merge "Put screensavers back in the icebox for now. DO NOT MERGE." into ics-mr1 
* commit '2a40d0d92b208021b492e9af3d944720cbf269fc':
  Put screensavers back in the icebox for now. DO NOT MERGE.
 2011-12-01 06:31:09 -08:00
Daniel Sandler
859cdf2328 Merge "Put screensavers back in the icebox for now. DO NOT MERGE." into ics-mr1 2011-12-01 06:29:53 -08:00
Bart Sears
9d735cbfd6 am 41a5774a: Merge "fix position of WebTextView on scrolling layers" into ics-mr1 
* commit '41a5774a99215025628b83db54c45f84b876678e':
  fix position of WebTextView on scrolling layers
 2011-11-30 22:31:08 -08:00
Bart Sears
5b74fe7ca1 Merge "fix position of WebTextView on scrolling layers" into ics-mr1 2011-11-30 22:29:16 -08:00
Adam Cohen
a5bc14b4f5 am 557a1772: Merge "Working around issue where setting min height on RelativeLayout causes items to collapse. (Bug 5640357)" into ics-mr1 
* commit '557a1772f676480da75fff81ff38d6e896fce0a2':
  Working around issue where setting min height on RelativeLayout causes items to collapse. (Bug 5640357)
 2011-11-30 21:13:04 -08:00
Adam Cohen
c3003b601d Merge "Working around issue where setting min height on RelativeLayout causes items to collapse. (Bug 5640357)" into ics-mr1 2011-11-30 21:10:27 -08:00
Dianne Hackborn
e80305872e am a1240184: Merge "Fix issue #5433192 and maybe #5433192" into ics-mr1 
* commit 'a1240184efd1d4391540a6e3e9cae50d56d05cb2':
  Fix issue #5433192 and maybe #5433192
 2011-11-30 20:50:57 -08:00
Dianne Hackborn
dfcc7b62f5 Merge "Fix issue #5433192 and maybe #5433192" into ics-mr1 2011-11-30 20:49:21 -08:00
satok
e2dcd7f0fe am b94a7fb3: Merge "Fix ConcurrentModificationException in TextServicesManagerService" into ics-mr1 
* commit 'b94a7fb3d7483e8b47e4f0229fc7abff10a6572d':
  Fix ConcurrentModificationException in TextServicesManagerService
 2011-11-30 17:39:12 -08:00
satok
cc4f36dfc8 Merge "Fix ConcurrentModificationException in TextServicesManagerService" into ics-mr1 2011-11-30 17:37:52 -08:00
Svetoslav Ganov
bd8b845e62 am d8ec8db5: Merge "Fixing memory leaks in the accessiiblity layer." into ics-mr1 
* commit 'd8ec8db5e0f227e4f63e948acb78d829f5ad30c8':
  Fixing memory leaks in the accessiiblity layer.
 2011-11-30 16:59:46 -08:00
Svetoslav Ganov
efe11185b5 Merge "Fixing memory leaks in the accessiiblity layer." into ics-mr1 2011-11-30 16:56:41 -08:00
Dianne Hackborn
acfa87eeb1 am 88f10c6c: Merge "Fix issue #5679504: Device stuck and sudden reboot - Watchdog reset?" into ics-mr1 
* commit '88f10c6ce5a97b1990934148deb8ed6aa6ef7a48':
  Fix issue #5679504: Device stuck and sudden reboot - Watchdog reset?
 2011-11-30 14:15:55 -08:00
Dianne Hackborn
e40e39ddfd am f8d20bd6: Merge "Turn off debug log." into ics-mr1 
* commit 'f8d20bd6495883e98e23827a2e5ed03766fe483b':
  Turn off debug log.
 2011-11-30 14:13:42 -08:00
Dianne Hackborn
ea402a7e8c Merge "Fix issue #5679504: Device stuck and sudden reboot - Watchdog reset?" into ics-mr1 2011-11-30 14:12:44 -08:00
Dianne Hackborn
5703b2516a Merge "Turn off debug log." into ics-mr1 2011-11-30 14:11:17 -08:00
Romain Guy
6a15b74f03 am 7797cae2: Merge "Cache drawable constant states instead of drawables Bug #5678369" into ics-mr1 
* commit '7797cae2564eccf6d817b06d8116bd9cdc8e9ed4':
  Cache drawable constant states instead of drawables Bug #5678369
 2011-11-30 14:09:21 -08:00
Romain Guy
0ff2c27b3e Merge "Cache drawable constant states instead of drawables Bug #5678369" into ics-mr1 2011-11-30 14:07:34 -08:00
Mathias Agopian
03ad785b7d am e8ba2aba: Merge "add a way to access the version string of the h/w implementation of EGL" into ics-mr1 
* commit 'e8ba2aba934e3767d2081007bba93bad68566d22':
  add a way to access the version string of the h/w implementation of EGL
 2011-11-30 13:54:46 -08:00
Mathias Agopian
363c4a9fa0 Merge "add a way to access the version string of the h/w implementation of EGL" into ics-mr1 2011-11-30 13:52:21 -08:00
Daniel Sandler
aa0c0b6556 am 865b9802: Merge "Expanding NotificationManager\'s event logging." into ics-mr1 
* commit '865b98024fb5fa21854feb578b8816bbb72120ba':
  Expanding NotificationManager's event logging.
 2011-11-30 11:55:50 -08:00
Daniel Sandler
2e9f9c7edc Merge "Expanding NotificationManager's event logging." into ics-mr1 2011-11-30 11:54:17 -08:00
Jeff Sharkey
a36b003bdc am 47e4015b: Merge "Avoid airplane mode labels when Wi-Fi enabled." into ics-mr1 
* commit '47e4015ba23c507196980dcb4a311afc7e2358b1':
  Avoid airplane mode labels when Wi-Fi enabled.
 2011-11-30 11:46:19 -08:00
Jeff Sharkey
4f1fbce904 Merge "Avoid airplane mode labels when Wi-Fi enabled." into ics-mr1 2011-11-30 11:44:54 -08:00
Svetoslav Ganov
5a1696368c am 2f504d9e: Merge "NumberPicker incorrectly shown for the old theme." into ics-mr1 
* commit '2f504d9ea8aa18cd8dbaa2dcc3f3959252b414cc':
  NumberPicker incorrectly shown for the old theme.
 2011-11-30 10:27:45 -08:00
Svetoslav Ganov
8cc888b840 Merge "NumberPicker incorrectly shown for the old theme." into ics-mr1 2011-11-30 10:25:42 -08:00
Dianne Hackborn
79206d2174 am db904b47: Merge "Fix issue #5628789: Cannot set static/custom wallpaper after clearing Settings data" into ics-mr1 
* commit 'db904b4782a4dfc9d81d5d0616dea3656893b539':
  Fix issue #5628789: Cannot set static/custom wallpaper after clearing Settings data
 2011-11-30 10:22:37 -08:00
Dianne Hackborn
4ef3a35243 Merge "Fix issue #5628789: Cannot set static/custom wallpaper after clearing Settings data" into ics-mr1 2011-11-30 10:20:29 -08:00
The Android Automerger
dfb76b94f5 merge in ics-mr1-release history after reset to ics-mr1 2011-11-30 06:46:17 -08:00
Narayan Kamath
de0d9c3075 am cc084f1d: Fix superfluous onError callbacks. 
* commit 'cc084f1d734c1e332d6acc1f89204036ee82bd0c':
  Fix superfluous onError callbacks.
 2011-11-30 04:57:10 -08:00
Mathias Agopian
bc2d79ed7a add a way to access the version string of the h/w implementation of EGL 
we use a hidden egl extension. the version string is printed
in SF's dumpsys log.

Change-Id: I123eb4bde6de462bb2404c67b74d6d6219a48d6a
 2011-11-29 18:00:35 -08:00
Mathias Agopian
53233c52d0 am bb1e7d43: Merge changes I7e973a35,Ib3386fcc into ics-mr1 
* commit 'bb1e7d4324ff43491c526c77f405bbbf0cece611':
  SurfaceTexture: add EGL_KHR_fence_sync option
  SurfaceTexture: add a blit-to-FBO test
 2011-11-29 17:48:01 -08:00
Mathias Agopian
0c740a46d2 Merge changes I7e973a35,Ib3386fcc into ics-mr1 
* changes:
  SurfaceTexture: add EGL_KHR_fence_sync option
  SurfaceTexture: add a blit-to-FBO test
 2011-11-29 17:46:35 -08:00
Jamie Gennis
b63de44c22 am 6f1dd757: Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1 
* commit '6f1dd757cb158d17c76baeb170f7db2271802ef8':
  SurfaceMediaSource: use the vid enc usage bit
 2011-11-29 17:26:32 -08:00
Jamie Gennis
e06a1748a4 Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1 2011-11-29 17:25:09 -08:00
Jamie Gennis
86edf4f647 SurfaceTexture: add EGL_KHR_fence_sync option 
This change adds a compile-time option for SurfaceTexture to use the
EGL_KHR_fence_sync extension to synchronize access to Gralloc buffers.

Bug: 5122031
Change-Id: I7e973a358631fff5308acf377581b811911fe790
 2011-11-29 17:09:01 -08:00
Chris Craik
7b7dde99ca am f296ee69: Merge "Send animation start notification back to webkit from ui thread" into ics-mr1 
* commit 'f296ee697409b4b55bef17d534edbc24a4619f0f':
  Send animation start notification back to webkit from ui thread
 2011-11-29 16:57:29 -08:00
Chris Craik
3c03f63b65 Merge "Send animation start notification back to webkit from ui thread" into ics-mr1 2011-11-29 16:55:47 -08:00
Dianne Hackborn
3ac429c942 am 1808f214: Merge "Fix issue #5636525: ANR observed in setup wizard after changing language" into ics-mr1 
* commit '1808f214b0cd7a62628b273b93a1ea688f262565':
  Fix issue #5636525: ANR observed in setup wizard after changing language
 2011-11-29 15:30:08 -08:00
Dianne Hackborn
e2918f4c5b Merge "Fix issue #5636525: ANR observed in setup wizard after changing language" into ics-mr1 2011-11-29 15:28:41 -08:00
Jamie Gennis
fe27e2f468 SurfaceTexture: add a blit-to-FBO test 
This change adds a test for blitting (via GL rendering) from a
SurfaceTexture to an FBO.

Change-Id: Ib3386fcc3f37153277f3e37a26347441bb80ab58
 2011-11-29 14:52:36 -08:00
Teng-Hui Zhu
ed2e31437b am d3788b97: Merge "WebView animation support" into ics-mr1 
* commit 'd3788b97c9a28e8cbfa4432389a5de04073a333b':
  WebView animation support
 2011-11-29 14:21:10 -08:00
Teng-Hui Zhu
97cf3c67f6 Merge "WebView animation support" into ics-mr1 2011-11-29 14:18:27 -08:00
Romain Guy
8b59b5100e am a9a91ad3: Merge "Improve screenshot animation performance Bug #5525888" into ics-mr1 
* commit 'a9a91ad356271c4c4d663223ff42694fbeb1d2a0':
  Improve screenshot animation performance Bug #5525888
 2011-11-29 14:16:59 -08:00
Romain Guy
84a287ec89 Merge "Improve screenshot animation performance Bug #5525888" into ics-mr1 2011-11-29 14:14:44 -08:00
Andreas Huber
94547b18a9 am 564fee36: Merge "Make sure we can properly shutdown even if" into ics-mr1 
* commit '564fee36667e2699c59a29102136220dc2f65862':
  Make sure we can properly shutdown even if
 2011-11-29 14:12:21 -08:00
Andreas Huber
e872046f28 am d12dc284: Merge "If an error occurs that prevents us from reallocating buffers during a format change" into ics-mr1 
* commit 'd12dc28460f622ab29e83fa688ad83a8263e9417':
  If an error occurs that prevents us from reallocating buffers during a format change
 2011-11-29 14:12:20 -08:00
Andreas Huber
ed6671ae3a am 351143fb: Merge "Updated (internal) API for IStreamSource to signal discontinuities" into ics-mr1 
* commit '351143fb0e2fcfb7dc2ef1045d693c71eb0ea329':
  Updated (internal) API for IStreamSource to signal discontinuities
 2011-11-29 14:12:18 -08:00
Andreas Huber
2f91d3ebca am 405a4e34: Merge "Finer granularity discontinuity support." into ics-mr1 
* commit '405a4e34032f8a07028138266fe9f79f6753b466':
  Finer granularity discontinuity support.
 2011-11-29 14:10:09 -08:00
Andreas Huber
8f2b02be3c Merge "Make sure we can properly shutdown even if" into ics-mr1 2011-11-29 14:09:10 -08:00