ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
20,232 Commits 2 Branches 0 Tags 54 MiB
1577102f2c
Commit Graph

20232 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
8dd5a64d2c Merge "Fix some SDK build breakage. Not all." 2010-08-27 15:42:19 -07:00
Mathias Agopian
b54263ab73 Merge "cleanup EGL a bit. remove unused extension." 2010-08-27 15:31:19 -07:00
Mathias Agopian
27e2fac337 cleanup EGL a bit. remove unused extension. 
Change-Id: I7758bc7d6dc2e70fc3590fe939ebf71fbcde7059
 2010-08-27 15:30:16 -07:00
Wu-cheng Li
f4d7089aad am 1620d118: Fix SDK build error. 
Merge commit '1620d118a49dc6df7b0e83d7343f8a8bb6e23b12' into gingerbread-plus-aosp

* commit '1620d118a49dc6df7b0e83d7343f8a8bb6e23b12':
  Fix SDK build error.
 2010-08-27 15:13:53 -07:00
Sascha Brawer
395aca11f9 Merge "Added default map boundaries for locale rm-CH. Cloned from values-de-rCH/arrays.xml." 2010-08-27 14:37:19 -07:00
James Dong
53a63f9fb9 am df8356ff: Merge "Workaround for a QCOM issue where the output buffer size advertised by the AVC encoder is occasionally too small." into gingerbread 
Merge commit 'df8356ff9a2f1fab44bb3aea26c5da0a9f23a4ad' into gingerbread-plus-aosp

* commit 'df8356ff9a2f1fab44bb3aea26c5da0a9f23a4ad':
  Workaround for a QCOM issue where the output buffer size advertised by the AVC encoder
 2010-08-27 14:36:02 -07:00
James Dong
9ee52948b8 Merge "Workaround for a QCOM issue where the output buffer size advertised by the AVC encoder is occasionally too small." into gingerbread 2010-08-27 14:33:54 -07:00
Wu-cheng Li
a138f21822 am d851e6fe: Merge "Unhide camera fps range API and deprecate old ones." into gingerbread 
Merge commit 'd851e6fea59bcc5a9ad4ddcdfde63e9443640ef2' into gingerbread-plus-aosp

* commit 'd851e6fea59bcc5a9ad4ddcdfde63e9443640ef2':
  Unhide camera fps range API and deprecate old ones.
 2010-08-27 14:22:21 -07:00
Wu-cheng Li
c60754900b Merge "Unhide camera fps range API and deprecate old ones." into gingerbread 2010-08-27 14:20:51 -07:00
Mathias Agopian
1bd3674343 am ff3dcf27: Merge "cleanup EGL a bit. remove unused extension." into gingerbread 
Merge commit 'ff3dcf27be2bbb259b7605396d36e50ade35266f' into gingerbread-plus-aosp

* commit 'ff3dcf27be2bbb259b7605396d36e50ade35266f':
  cleanup EGL a bit. remove unused extension.
 2010-08-27 14:17:00 -07:00
Mathias Agopian
af4764d570 Merge "cleanup EGL a bit. remove unused extension." into gingerbread 2010-08-27 14:14:46 -07:00
James Dong
cd61febcbb am b86365ad: Merge "Suppress the video recording start signal - bug 2950297" into gingerbread 
Merge commit 'b86365ad74a197f2af6d70eedeb19083e31a9686' into gingerbread-plus-aosp

* commit 'b86365ad74a197f2af6d70eedeb19083e31a9686':
  Suppress the video recording start signal
 2010-08-27 13:48:48 -07:00
Nipun Kwatra
8f136d033c Merge "Added MediaSourceSplitter to split single source to multiple ones." 2010-08-27 13:48:15 -07:00
James Dong
a75ced9ce6 Merge "Suppress the video recording start signal - bug 2950297" into gingerbread 2010-08-27 13:47:06 -07:00
Andreas Huber
bc7d5958c8 am 577615c9: Merge "Better support for rtsp (normal play-)time display. Better seek support, timeout if no packets arrive for too long." into gingerbread 
Merge commit '577615c98e390f8417e07844d04304eac5b0e911' into gingerbread-plus-aosp

* commit '577615c98e390f8417e07844d04304eac5b0e911':
  Better support for rtsp (normal play-)time display. Better seek support, timeout if no packets arrive for too long.
 2010-08-27 13:46:19 -07:00
Andreas Huber
56f602bc7d am e250c220: Merge "We accidentally always aborted after 10 secs, even if the connection was fine." into gingerbread 
Merge commit 'e250c220d1bb3bd117641add94ee7465a82f085c' into gingerbread-plus-aosp

* commit 'e250c220d1bb3bd117641add94ee7465a82f085c':
  We accidentally always aborted after 10 secs, even if the connection was fine.
 2010-08-27 13:46:14 -07:00
Andreas Huber
1afe05eb1b Merge "Better support for rtsp (normal play-)time display. Better seek support, timeout if no packets arrive for too long." into gingerbread 2010-08-27 13:44:14 -07:00
Andreas Huber
2c39c50ac0 Merge "We accidentally always aborted after 10 secs, even if the connection was fine." into gingerbread 2010-08-27 13:44:07 -07:00
Mathias Agopian
10cab190ba cleanup EGL a bit. remove unused extension. 
Change-Id: Ia87120b076ab1bf7b28f06087878d8161fb46c88
 2010-08-27 13:17:32 -07:00
Gilles Debunne
830f25c8b6 am ee4831c4: Merge "Added char limit to string" into gingerbread 
Merge commit 'ee4831c4bb39144b995ea561ad35b9b0e1864b33' into gingerbread-plus-aosp

* commit 'ee4831c4bb39144b995ea561ad35b9b0e1864b33':
  Added char limit to string
 2010-08-27 13:16:24 -07:00
Gilles Debunne
d22af9fe79 Merge "Added char limit to string" into gingerbread 2010-08-27 13:13:56 -07:00
Kenny Root
ec8b61fb4c am ad6731b0: Merge "Add debugging to ZipFileRO" into gingerbread 
Merge commit 'ad6731b0fc759e446504bca163d8fd2fb6326577' into gingerbread-plus-aosp

* commit 'ad6731b0fc759e446504bca163d8fd2fb6326577':
  Add debugging to ZipFileRO
 2010-08-27 13:00:22 -07:00
Kenny Root
e96ad7bc45 Merge "Add debugging to ZipFileRO" into gingerbread 2010-08-27 12:58:00 -07:00
Kenny Root
e0573a4ad6 Add debugging to ZipFileRO 
Some assets are failing to read from ZIP files. This adds a bit more
debugging to figure out what's going on.

Change-Id: Id90e10546c54c85069a34478fbc28bc2523bda5d
 2010-08-27 12:47:34 -07:00
Gilles Debunne
dfe1dd29a6 am 445ab76c: Merge "Broken build. Missing ;" into gingerbread 
Merge commit '445ab76c49779998543bb78881f5d9f8ae81e598' into gingerbread-plus-aosp

* commit '445ab76c49779998543bb78881f5d9f8ae81e598':
  Broken build. Missing ;
 2010-08-27 12:23:47 -07:00
Gilles Debunne
5436d53d20 am e69b2860: Merge "DO NOT MERGE Removed "Stop selecting text" option." into gingerbread 
Merge commit 'e69b286005b0b543e274f523d894e069811215a6' into gingerbread-plus-aosp

* commit 'e69b286005b0b543e274f523d894e069811215a6':
  DO NOT MERGE Removed "Stop selecting text" option.
 2010-08-27 12:23:43 -07:00
Brad Fitzpatrick
50de57ad77 am b94493fe: Merge "Document blocking behavior of ImageView setImageURI and setImageResource" into gingerbread 
Merge commit 'b94493feaf8b7a620a25c23c1f131a999ed61293' into gingerbread-plus-aosp

* commit 'b94493feaf8b7a620a25c23c1f131a999ed61293':
  Document blocking behavior of ImageView setImageURI and setImageResource
 2010-08-27 12:23:39 -07:00
Mathias Agopian
46adfbc949 am ae66946b: Merge "fix a race in SF buffer management" into gingerbread 
Merge commit 'ae66946bd9e9f1168241c75196d2379b43e3ca30' into gingerbread-plus-aosp

* commit 'ae66946bd9e9f1168241c75196d2379b43e3ca30':
  fix a race in SF buffer management
 2010-08-27 12:23:35 -07:00
Brad Fitzpatrick
2e48f7e4e3 am 9020595b: am f5287094: Fix closing tag in docs. 
Merge commit '9020595b7f376bb414c9a6dba216dec76ababb17' into gingerbread-plus-aosp

* commit '9020595b7f376bb414c9a6dba216dec76ababb17':
  Fix closing tag in docs.
 2010-08-27 12:23:30 -07:00
Amith Yamasani
60070c4564 am 4b4114d1: am a90b7f01: Add methods to InputConnection: setComposingRegion() to select a region of text for correction, and getSelectedText() to return the selected text. 
Merge commit '4b4114d155b4f3d5cc4179934cb6403b1776261d'

* commit '4b4114d155b4f3d5cc4179934cb6403b1776261d':
  Add methods to InputConnection: setComposingRegion() to select a region of text for correction, and getSelectedText()
 2010-08-27 12:14:46 -07:00
David Brown
543246e0c4 am b4298cd8: am 846eb30f: Add SipAddress to ContactsContract. 
Merge commit 'b4298cd8ba48db21625a396311e01ed6ad9f516c'

* commit 'b4298cd8ba48db21625a396311e01ed6ad9f516c':
  Add SipAddress to ContactsContract.
 2010-08-27 12:14:13 -07:00
Brad Fitzpatrick
4be6b11700 resolved conflicts for merge of 6b50986a to gingerbread-plus-aosp 
Change-Id: I7c5ec7ae717e75ad242e2c1ad4537052e4eea718
 2010-08-27 12:08:40 -07:00
Dianne Hackborn
daf5d57ab3 Merge "resolved conflicts for merge of 409b7120 to master" 2010-08-27 12:05:45 -07:00
Dianne Hackborn
6a6875aa7a resolved conflicts for merge of 409b7120 to master 
Change-Id: I1741e205b5ff5ae62a38ab3b096bcc3d96883538
 2010-08-27 12:04:26 -07:00
Gilles Debunne
3c07bb6459 Merge "Broken build. Missing ;" into gingerbread 2010-08-27 11:52:27 -07:00
Gilles Debunne
b481c7930b Merge "DO NOT MERGE Removed "Stop selecting text" option." into gingerbread 2010-08-27 11:50:26 -07:00
Brad Fitzpatrick
73414a12ad Merge "Document blocking behavior of ImageView setImageURI and setImageResource" into gingerbread 2010-08-27 11:49:31 -07:00
Mathias Agopian
e5b4978094 Merge "fix a race in SF buffer management" into gingerbread 2010-08-27 11:47:33 -07:00
Wink Saville
443407a081 Merge "Add NetworkProperties to DataConnection." 2010-08-27 11:38:48 -07:00
Brad Fitzpatrick
12831aaacf am f5287094: Fix closing tag in docs. 
Merge commit 'f52870948d5d57d033fcdafc9c3fb0a872975447' into gingerbread

* commit 'f52870948d5d57d033fcdafc9c3fb0a872975447':
  Fix closing tag in docs.
 2010-08-27 11:35:53 -07:00
Romain Guy
82f7cf5732 Merge "Apply gamma correction to font rendering." 2010-08-27 11:31:50 -07:00
Brad Fitzpatrick
879e1ceecb Merge "SharedPreferences$Editor.startCommit()" into gingerbread 2010-08-27 11:21:13 -07:00
Chet Haase
2c9b09fa6f Merge "Fix Sequencer end events when terminated early" 2010-08-27 11:15:51 -07:00
Gilles Debunne
d03f163cf9 am 225ad9cb: Merge "DO NOT MERGE Text selection: tapping on selection opens context menu" into gingerbread 
Merge commit '225ad9cb184c94e29e4e0fb89d5e7d043e399ca4' into gingerbread-plus-aosp

* commit '225ad9cb184c94e29e4e0fb89d5e7d043e399ca4':
  DO NOT MERGE Text selection: tapping on selection opens context menu
 2010-08-27 10:34:56 -07:00
Gilles Debunne
0f6ded9a6a am b8fd0473: Merge "Fix for 512 limit in assetManager.list" into gingerbread 
Merge commit 'b8fd047311e329f2b8dbe3d228488ba844718ee1' into gingerbread-plus-aosp

* commit 'b8fd047311e329f2b8dbe3d228488ba844718ee1':
  Fix for 512 limit in assetManager.list
 2010-08-27 10:34:47 -07:00
Gilles Debunne
4ab6241a8e Merge "DO NOT MERGE Text selection: tapping on selection opens context menu" into gingerbread 2010-08-27 10:33:17 -07:00
Gilles Debunne
9c060fe8e0 Merge "Fix for 512 limit in assetManager.list" into gingerbread 2010-08-27 10:32:43 -07:00
Jason parks
261d730905 Merge "Deprecated the managed cursor API's on Activity. Loaders are the new world order." 2010-08-27 09:28:21 -07:00
Bill Napier
f2d251d579 Merge "Fix MonkeyRunner SDK documentation generation." 2010-08-27 09:10:42 -07:00
Joe Onorato
d127ab20e4 Merge "Hand merge bc5d9d22: Need to close the windowshade on ACTION_CLOSE_SYSTEM_DIALOGS and ACTION_SCREEN_OFF." into master" 2010-08-27 08:46:04 -07:00