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

45903 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Reck
ed66e1b988 Merge "Fix NPE" 2012-02-28 11:38:56 -08:00
Dianne Hackborn
eb040a1f19 Merge "You could think of this as what an OEM might do." 2012-02-28 11:26:02 -08:00
James Dong
a9e4401f15 Merge "Deprecated a mis-spelled method and replaced it with a new method" 2012-02-28 11:23:26 -08:00
Android Git Automerger
c1bf2237ca am a66926ff: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp 
* commit 'a66926ff7fac7ef77da1b5f3f1a1dd9dd8d6b960':
 2012-02-28 10:51:35 -08:00
Svetoslav Ganov
7a415d2d60 am 8f4582a2: am c78f1217: am a2b41b43: NumberPicker showing IME when its input field gains focus. 
* commit '8f4582a278d3f93450f2a72ad6f6dc872668efb9':
 2012-02-28 10:51:32 -08:00
Android Git Automerger
20801d679f Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp 2012-02-28 10:49:07 -08:00
Svetoslav Ganov
2891b9aaba am 0c96daa5: am 0c7ffac4: am a2b41b43: NumberPicker showing IME when its input field gains focus. 
* commit '0c96daa5d5a1ef778ad1ef4619ef1fa4c30519c6':
  NumberPicker showing IME when its input field  gains focus.
 2012-02-28 10:41:42 -08:00
Svetoslav Ganov
c502f3b6de am c78f1217: am a2b41b43: NumberPicker showing IME when its input field gains focus. 
* commit 'c78f121716ff7d4cbf8a70519a266ae030942751':
  NumberPicker showing IME when its input field  gains focus.
 2012-02-28 10:39:17 -08:00
Svetoslav Ganov
c1a5853a7c am 0c7ffac4: am a2b41b43: NumberPicker showing IME when its input field gains focus. 
* commit '0c7ffac4caf413bd5fef2002079ec1d4bff2bc37':
  NumberPicker showing IME when its input field  gains focus.
 2012-02-28 10:38:39 -08:00
Svetoslav Ganov
6948e13a34 am a2b41b43: NumberPicker showing IME when its input field gains focus. 
* commit 'a2b41b438d45570867e4682c0caaf93ace5e712e':
  NumberPicker showing IME when its input field  gains focus.
 2012-02-28 10:35:43 -08:00
Svetoslav Ganov
3191d487f7 am a2b41b43: NumberPicker showing IME when its input field gains focus. 
* commit 'a2b41b438d45570867e4682c0caaf93ace5e712e':
  NumberPicker showing IME when its input field  gains focus.
 2012-02-28 10:35:18 -08:00
Glenn Kasten
e82b06b4af Merge "Unlock effect chains in the middle of two if's" 2012-02-28 07:23:42 -08:00
Glenn Kasten
a0401c3384 Merge "Simplify removeNotificationClient" 2012-02-28 07:21:51 -08:00
Glenn Kasten
9f22baff2b Merge "AudioFlinger const methods and parameters" 2012-02-28 07:21:09 -08:00
Jean-Baptiste Queru
81ecdad03e am 254cf597: am 7b6b81f8: am f016dc1b: am f881fa51: Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration" 
* commit '254cf5973ebe5ebdce9ef261d826e88ed2f67f58':
  stagefright amr: Avoid C++/C99 for loops with variable declaration
 2012-02-28 07:19:40 -08:00
Jean-Baptiste Queru
6054e3e186 am d107453d: (-s ours) am 84dd87d9: am 015a248e: am 93df415c: Merge "Add stubs for better compatibility" 
* commit 'd107453ddf3af507e015ac641d5fb67ed513cd4b':
  Add stubs for better compatibility
 2012-02-28 07:19:36 -08:00
Glenn Kasten
aea503952a Merge "Fix theoretical race condition in addOutputTrack" 2012-02-28 07:18:27 -08:00
Glenn Kasten
2f0b8f08ed Merge "AudioBufferProvider comments and cleanup" 2012-02-28 07:17:47 -08:00
Mathias Agopian
ed61a47c5b Merge "a window could get stuck to gpu composition" 2012-02-27 19:48:36 -08:00
Mathias Agopian
e0dec77b25 Merge "move CursorWindow from libbinder to libandroidfw" 2012-02-27 19:48:21 -08:00
Mathias Agopian
89d353a4c5 move CursorWindow from libbinder to libandroidfw 
Change-Id: I3b304e4f74e0d0ec8b20c57296c62449c9a0f792
 2012-02-27 18:11:20 -08:00
Jeff Sharkey
679154b333 Merge "Move NetworkStatsFactory to faster ProcFileReader." 2012-02-27 18:09:29 -08:00
Jamie Gennis
910b2b2ff5 Merge "Add tracing to various graphics components." 2012-02-27 18:06:39 -08:00
Jamie Gennis
1c8e95cf86 Add tracing to various graphics components. 
This change adds ATRACE call tracing to BufferQueue,
SurfaceTextureClient, SurfaceTexture, SurfaceFlinger, Layer, and EGL.

Change-Id: I9d75ed26f5a3f0d1af635da38289520134cfbbb7
 2012-02-27 17:50:35 -08:00
Jeff Sharkey
c13af3c0f9 Merge "Suppress StrictMode when reading /proc/ files." 2012-02-27 17:44:09 -08:00
Adam Powell
793be05776 Merge "View pressed state dispatching tweaks" 2012-02-27 17:38:51 -08:00
Mathias Agopian
fa8009d6ac Merge "remove dependency on unneeded headers" 2012-02-27 17:38:27 -08:00
Chia-chi Yeh
694602715e Merge "VpnDialogs: hide the fields when the statistic numbers are unavailable." 2012-02-27 17:35:06 -08:00
Michael Jurka
7244f940d7 Merge "Remove unnecessary code" 2012-02-27 17:15:41 -08:00
Jamie Gennis
8b82aff67c Merge "Removed dependecies between BufferQueue and SurfaceTexture" 2012-02-27 17:06:53 -08:00
JP Abgrall
fd970dd81d Merge "dumpstate: use /system/xbin/su directly" 2012-02-27 17:05:55 -08:00
Jean-Baptiste Queru
962ccb6d93 am 7b6b81f8: am f016dc1b: am f881fa51: Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration" 
* commit '7b6b81f89538d34415869710cbf464ba7c28bf9b':
  stagefright amr: Avoid C++/C99 for loops with variable declaration
 2012-02-27 17:02:15 -08:00
Dave Burke
f4a475427f Merge "Increase max size of log size by 50% on userdebug builds." 2012-02-27 17:01:38 -08:00
Jean-Baptiste Queru
476df7e91b am f016dc1b: am f881fa51: Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration" 
* commit 'f016dc1bd7f9a67adac13b0b564692dab8723392':
  stagefright amr: Avoid C++/C99 for loops with variable declaration
 2012-02-27 16:59:59 -08:00
Mathias Agopian
ec923ee0d0 a window could get stuck to gpu composition 
this could happen after an orientation change. basically
we need to triger a geometry-changed when the very first buffer
is received

Change-Id: I097e411fd6612c18725737cffccdbf6b2af3511c
 2012-02-27 16:58:04 -08:00
Jean-Baptiste Queru
5316ab3c34 am f881fa51: Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration" 
* commit 'f881fa517978adc7ea610a1982e0d071f1fd3425':
  stagefright amr: Avoid C++/C99 for loops with variable declaration
 2012-02-27 16:57:06 -08:00
Daniel Lam
eae59d2ea7 Removed dependecies between BufferQueue and SurfaceTexture 
Refactored SurfaceTexture and BufferQueue such that share
no protected members.  Created an consumer facing interface
for BufferQueue in preparation of connecting SurfaceTexture
and BufferQueue through a binder.

Change-Id: I938e63e085128148c58d0e26c7213b30145c109f
 2012-02-27 16:40:48 -08:00
felipeal
01d80eebfb Merge "Fixed minor typo on Javadoc" 2012-02-27 16:39:50 -08:00
Eric Laurent
c060dde299 Merge "audio preprocessing: fix multiple enable problem" 2012-02-27 16:35:30 -08:00
Alon Albert
5e783b363e Merge "Add new Reminder Method: Alarm" 2012-02-27 16:29:55 -08:00
Craig Mautner
275a6ebb64 Merge "Fix bug introduced when moving animation step out from between assignments to wasAnimating and nowAnimating. Now wasAnimating once again contains the animation state prior to the animation step." 2012-02-27 16:28:15 -08:00
Jean-Baptiste Queru
5d46260664 Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration" 2012-02-27 16:23:19 -08:00
Jean-Baptiste Queru
da12204605 am 84dd87d9: am 015a248e: am 93df415c: Merge "Add stubs for better compatibility" 
* commit '84dd87d992d88d1f407796a41bc8baa27dc97a81':
  Add stubs for better compatibility
 2012-02-27 16:03:41 -08:00
Jean-Baptiste Queru
2d0b5dad97 am 015a248e: am 93df415c: Merge "Add stubs for better compatibility" 
* commit '015a248e631dc10fd6b52ae8773c0a3e0cf752af':
  Add stubs for better compatibility
 2012-02-27 16:01:31 -08:00
Jean-Baptiste Queru
6a22ed0a4b am 93df415c: Merge "Add stubs for better compatibility" 
* commit '93df415c1e0b4c99f274adb3629ce19abf1d0f53':
  Add stubs for better compatibility
 2012-02-27 15:58:50 -08:00
Eric Fischer
02a8087414 Merge "Import translations. DO NOT MERGE" 2012-02-27 15:41:31 -08:00
Jean-Baptiste Queru
47e81bd44d Merge "Add stubs for better compatibility" 2012-02-27 15:36:22 -08:00
Gilles Debunne
b423565a1a Merge "Selection highlight made possible with no editor" 2012-02-27 15:30:57 -08:00
Gilles Debunne
e0b94933aa Merge "Fix for NPE on long press to start a selection on text." 2012-02-27 15:30:37 -08:00
Gilles Debunne
c4dba0be3c Merge "Fix for NPE when dragging on TextView" 2012-02-27 15:28:49 -08:00