ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
24,510 Commits 2 Branches 0 Tags 54 MiB
b4bbbced82
Commit Graph

24510 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xavier Ducrohet
b4bbbced82 Merge "Layoutlib: support viewkey in include nodes." 2010-11-19 11:21:01 -08:00
Android Git Automerger
f4a099573e Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base 2010-11-19 11:10:11 -08:00
Brad Fitzpatrick
45748c30a6 Merge "StrictMode: use Log.isLoggable" 2010-11-19 11:07:47 -08:00
Gilles Debunne
b192bb443a Merge "Clean-up in StaticLayout" 2010-11-19 11:07:15 -08:00
Mike Lockwood
5470cc95e3 Merge "PTP: Fix permissions problems with files imported via PTP" 2010-11-19 10:58:47 -08:00
Charles Chen
a79d54874e Merge "Removing logs of text that is being spoken." 2010-11-19 10:56:45 -08:00
Dirk Dougherty
4608a78204 am 00f502a3: am 0e29064d: Merge "Doc change: update media formats table." into gingerbread 
* commit '00f502a38cc4d6e2278f962b04308e6590dba36b':
  Doc change: update media formats table.
 2010-11-19 10:56:26 -08:00
Dirk Dougherty
c512be40bb am 0e29064d: Merge "Doc change: update media formats table." into gingerbread 
* commit '0e29064d1caad7b82aa76876e7e2f4c86ded06d2':
  Doc change: update media formats table.
 2010-11-19 10:53:20 -08:00
Dirk Dougherty
daba254db2 Merge "Doc change: update media formats table." into gingerbread 2010-11-19 10:47:10 -08:00
Robert Greenwalt
bf0f1ce9cb Merge "Notify all VMs when proxy changes." 2010-11-19 10:34:17 -08:00
Andreas Huber
cc24448135 Merge "Fix an artifact of going from off_t to off64_t" 2010-11-19 10:31:50 -08:00
Brad Fitzpatrick
3a56d0fbd0 am 096c4c44: am 251384a7: Merge "Improve performance when getting styled string." 
* commit '096c4c448d8110c21108f2db4a19a85099e78557':
  Improve performance when getting styled string.
 2010-11-19 10:27:56 -08:00
Jean-Baptiste Queru
7528f2253a am f69f356e: am 14ac9546: Merge "build failed with g++ v. 4.4.5 err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* inste 
* commit 'f69f356ebaf33aa150817c44ee2bd781f24e4e71':
  build failed with g++ v. 4.4.5 err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* instead of char*
 2010-11-19 10:27:51 -08:00
Brad Fitzpatrick
4175b01d51 am 251384a7: Merge "Improve performance when getting styled string." 
* commit '251384a7595022ddbc53f4ab0fa386f9c040f1f5':
  Improve performance when getting styled string.
 2010-11-19 10:25:09 -08:00
Jean-Baptiste Queru
414633971b am 14ac9546: Merge "build failed with g++ v. 4.4.5 err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* instead of char*" 
* commit '14ac9546367d4df37eead55f6762b944b49f33b2':
  build failed with g++ v. 4.4.5 err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* instead of char*
 2010-11-19 10:24:51 -08:00
Scott Main
1045860ed9 Merge "docs: de-'new' samples and tutorials" 2010-11-19 10:23:29 -08:00
Mike Lockwood
bd9b9495f2 Merge "Remove command line mtp host tool" 2010-11-19 10:22:09 -08:00
Irfan Sheriff
02aff907b5 Merge "Split SupplicantStateTracker and refactor" 2010-11-19 10:18:29 -08:00
Andreas Huber
c7e11f86e0 Merge "Squashed commit of the following:" 2010-11-19 10:07:28 -08:00
Kenny Root
38c37d60fa Merge "Use different version of CLDR data in DatePicker" 2010-11-19 09:11:42 -08:00
Scott Main
1f99882a43 Merge "new docs for fragments" 2010-11-19 09:09:33 -08:00
Amith Yamasani
7a71e05d52 Merge "Update screen timeout again." 2010-11-19 08:47:36 -08:00
Mike Lockwood
4b838af77b Merge "PTP: Improve performance and reliability of file importing" 2010-11-19 08:33:21 -08:00
Brad Fitzpatrick
a62be1a99c Merge "Improve performance when getting styled string." 2010-11-19 07:41:39 -08:00
Kristian Monsen
891ca53b9a Merge "Find mime from file extension if the mime is empty" 2010-11-19 06:58:01 -08:00
Jesse Wilson
92751299ef Merge "Decode JSON literal types eagerly and with our own decoder." 2010-11-18 23:09:44 -08:00
Xavier Ducrohet
76a1477ea2 Merge "Layoutlib: use int[] wrapper to use as map keys." 2010-11-18 21:00:59 -08:00
Dianne Hackborn
e92a2fed09 Merge "Some work on issue #3201795: Improve transition when keyboard comes up" 2010-11-18 20:05:19 -08:00
Xavier Ducrohet
f960ee1293 Merge "Layoutlib: Properly dispose of bitmap delegate." 2010-11-18 20:03:31 -08:00
James Dong
fc561198f6 Merge "64-bit file size/offset support for media framework" 2010-11-18 18:19:30 -08:00
Stephen Hines
d00ddae255 Merge "Remove unnecessary export_func pragma." 2010-11-18 17:48:58 -08:00
Eric Laurent
718b6b6cf5 Merge "Fix issue 3192794." 2010-11-18 17:45:48 -08:00
Adam Powell
bb56473d1f Merge "Make holo widget styles public" 2010-11-18 17:23:54 -08:00
Eric Fischer
aa433d3e62 Merge "Add date format strings for the new locales." 2010-11-18 17:20:43 -08:00
Gil Dobjanschi
da77cad12e Merge "AudioTrack getTimelineDuration clarification." 2010-11-18 17:14:14 -08:00
Eric Fischer
2db95da3bf Merge "Import initial translations for 20 new locales." 2010-11-18 17:12:43 -08:00
Wink Saville
e1290c986e Merge "Use TextUtils.isEmpty to simplify code." 2010-11-18 17:10:04 -08:00
Alex Sakhartchouk
f5f08081a5 Merge "Fixing the state restore bug." 2010-11-18 16:39:42 -08:00
Adam Cohen
1e0e92628d Merge "Fixing issue #3200503" 2010-11-18 16:15:03 -08:00
Alex Sakhartchouk
261051b8f6 Merge "Support for cubemaps." 2010-11-18 15:58:17 -08:00
Mathias Agopian
40b095a472 am 550b1e17: am 671a6ff4: Add support for virtual sensors. 
* commit '550b1e17c332b1302299af0b3a8a2fa81d7cde65':
  Add support for virtual sensors.
 2010-11-18 15:55:31 -08:00
Mathias Agopian
da6332fe79 am 671a6ff4: Add support for virtual sensors. 
* commit '671a6ff4be11b3e2d8eb017e0c7a78e6133fb2b8':
  Add support for virtual sensors.
 2010-11-18 15:52:14 -08:00
Jamie Gennis
69ea586ad2 Merge "Set the external display usage bit in Stagefright." 2010-11-18 15:42:59 -08:00
Wink Saville
b698c235c8 Merge "Fix SPN_STRINGS_UPDATED_ACTION." 2010-11-18 15:42:04 -08:00
Justin Ho
2d814e6a4f am 5e5c2a19: (-s ours) am 80381ab4: Merge "DO NOT MERGE - Updated ringtones for Crespo, fixing looping problem" into gingerbread 
* commit '5e5c2a199a9e44ef56c6638a52b9a9153f3d8c0d':
  DO NOT MERGE - Updated ringtones for Crespo, fixing looping problem
 2010-11-18 15:10:02 -08:00
Justin Ho
0ad82aa722 am 80381ab4: Merge "DO NOT MERGE - Updated ringtones for Crespo, fixing looping problem" into gingerbread 
* commit '80381ab4ed44bd69c3e3464a848ca15851365b03':
  DO NOT MERGE - Updated ringtones for Crespo, fixing looping problem
 2010-11-18 15:06:51 -08:00
Justin Ho
d58312b119 Merge "DO NOT MERGE - Updated ringtones for Crespo, fixing looping problem" into gingerbread 2010-11-18 15:03:39 -08:00
Gil Dobjanschi
d1851f864b Merge "Added IOException to WaveformData constructor" 2010-11-18 14:47:18 -08:00
Jeff Brown
98dc391e20 Merge "Added support for full PC-style keyboards." 2010-11-18 14:20:30 -08:00
Andreas Huber
35cf947565 Merge "Log H.264 profile/level in OMXCodec" 2010-11-18 14:15:02 -08:00