Commit Graph

13272 Commits

Author SHA1 Message Date
Xavier Ducrohet
b1b6735cd6 Prepare for JB SDK rev 3
Change-Id: I3b1beb1ff2e12ed39631f6f96379819a0cea6b3c
2012-08-29 16:36:54 -07:00
Doug Zongker
23b06c5502 am 0999f50b: am adf05af0: Merge "add an app to generate localized text bitmaps needed for recovery" into jb-mr1-dev
* commit '0999f50b7208c2dcdb57bac95148d83651a1cacb':
  add an app to generate localized text bitmaps needed for recovery
2012-08-29 16:32:02 -07:00
Doug Zongker
0999f50b72 am adf05af0: Merge "add an app to generate localized text bitmaps needed for recovery" into jb-mr1-dev
* commit 'adf05af0b9f46638517241dce5cf7f6b9a7c48fe':
  add an app to generate localized text bitmaps needed for recovery
2012-08-29 16:29:51 -07:00
Doug Zongker
adf05af0b9 Merge "add an app to generate localized text bitmaps needed for recovery" into jb-mr1-dev 2012-08-29 16:27:39 -07:00
Doug Zongker
a95366ae57 add an app to generate localized text bitmaps needed for recovery
Recovery only knows how to display images, so any text has to be
turned into bitmaps.  This app displays each localized version of the
text in a TextView and then captures a bitmap, combining them and
generating an output PNG.

Change-Id: Ib16858a1d66e9839d1255b962fb1aaf8982bfe10
2012-08-29 16:04:12 -07:00
Jeff Brown
70ffc1bef0 am 75cd1b5b: am 99c82587: Merge "Use new display manager API." into jb-mr1-dev
* commit '75cd1b5bc411a599b9fbb632e96edcbdd9a0e1f8':
  Use new display manager API.
2012-08-29 15:46:37 -07:00
Jeff Brown
75cd1b5bc4 am 99c82587: Merge "Use new display manager API." into jb-mr1-dev
* commit '99c82587b170497eeb8518db79beba8625038019':
  Use new display manager API.
2012-08-29 15:44:48 -07:00
Jeff Brown
99c82587b1 Merge "Use new display manager API." into jb-mr1-dev 2012-08-29 15:42:18 -07:00
The Android Automerger
0aa706d541 merge in jb-release history after reset to jb-dev 2012-08-29 14:29:50 -07:00
The Android Automerger
37820ad511 merge in jb-release history after reset to jb-dev 2012-08-29 12:43:03 -07:00
Raphael Moll
faaab7f0ef am 6a7a7de5: am 76bb1467: am 980822ca: am 0c11d925: am 3fda35f2: Merge "Windows USB Driver for generic + Q, rev 7."
* commit '6a7a7de58032aa76af7ba829ac7743db13206edb':
  Windows USB Driver for generic + Q, rev 7.
2012-08-29 11:14:54 -07:00
Raphael Moll
6a7a7de580 am 76bb1467: am 980822ca: am 0c11d925: am 3fda35f2: Merge "Windows USB Driver for generic + Q, rev 7."
* commit '76bb14675dbe7d8ec0af2bad5e272abab34fa119':
  Windows USB Driver for generic + Q, rev 7.
2012-08-29 11:12:37 -07:00
Raphael Moll
76bb14675d am 980822ca: am 0c11d925: am 3fda35f2: Merge "Windows USB Driver for generic + Q, rev 7."
* commit '980822ca28361db510267a08c782239468bda76b':
  Windows USB Driver for generic + Q, rev 7.
2012-08-29 11:10:49 -07:00
Raphael Moll
980822ca28 am 0c11d925: am 3fda35f2: Merge "Windows USB Driver for generic + Q, rev 7."
* commit '0c11d9258fc3d9b05e79e3e6910aced8da0a5d0e':
  Windows USB Driver for generic + Q, rev 7.
2012-08-29 11:08:00 -07:00
Raphael Moll
0c11d9258f am 3fda35f2: Merge "Windows USB Driver for generic + Q, rev 7."
* commit '3fda35f2c9cc3910a9fbab92b4b73e9891387fc5':
  Windows USB Driver for generic + Q, rev 7.
2012-08-29 11:06:12 -07:00
Raphael Moll
3fda35f2c9 Merge "Windows USB Driver for generic + Q, rev 7." 2012-08-29 10:56:46 -07:00
The Android Automerger
be9369beb2 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-29 06:33:25 -07:00
Jeff Brown
60df6ce6b8 Use new display manager API.
Change-Id: Ia7a19413d201532d8cf22bee6bcedd4af1657831
2012-08-29 06:15:17 -07:00
Andrew Hsieh
219c914bd2 am 61dd5c3a: am d4f07cf5: am ec4fa913: am 87485cd8: am fcc2452b: Merge "Remove unused .ctors, .dtors, and .eh_frame in MIPS crt*_so.S."
* commit '61dd5c3a6cc8b8a96d56c387aa4097844a2fbde8':
  Remove unused .ctors, .dtors, and .eh_frame in MIPS crt*_so.S.
2012-08-28 23:27:01 -07:00
Andrew Hsieh
61dd5c3a6c am d4f07cf5: am ec4fa913: am 87485cd8: am fcc2452b: Merge "Remove unused .ctors, .dtors, and .eh_frame in MIPS crt*_so.S."
* commit 'd4f07cf5f30ea5eae0cfe25a13c9375f33a0eb12':
  Remove unused .ctors, .dtors, and .eh_frame in MIPS crt*_so.S.
2012-08-28 23:24:54 -07:00
Andrew Hsieh
d4f07cf5f3 am ec4fa913: am 87485cd8: am fcc2452b: Merge "Remove unused .ctors, .dtors, and .eh_frame in MIPS crt*_so.S."
* commit 'ec4fa91327ed785809418cbf2c42560011bd8cab':
  Remove unused .ctors, .dtors, and .eh_frame in MIPS crt*_so.S.
2012-08-28 23:22:53 -07:00
Andrew Hsieh
ec4fa91327 am 87485cd8: am fcc2452b: Merge "Remove unused .ctors, .dtors, and .eh_frame in MIPS crt*_so.S."
* commit '87485cd82216de50dd0ff945ef70d8016a61d45e':
  Remove unused .ctors, .dtors, and .eh_frame in MIPS crt*_so.S.
2012-08-28 23:19:45 -07:00
Andrew Hsieh
87485cd822 am fcc2452b: Merge "Remove unused .ctors, .dtors, and .eh_frame in MIPS crt*_so.S."
* commit 'fcc2452b5102b412ba300243e0e9d26c827515cf':
  Remove unused .ctors, .dtors, and .eh_frame in MIPS crt*_so.S.
2012-08-28 23:17:32 -07:00
Andrew Hsieh
fcc2452b51 Merge "Remove unused .ctors, .dtors, and .eh_frame in MIPS crt*_so.S." 2012-08-28 23:08:56 -07:00
Eino-Ville Talvala
e3dc84340f am c2967743: am 9aaa620b: Merge "EmulatedFakeCamera2: Support (0,0) jpeg thumbnail size." into jb-mr1-dev
* commit 'c296774352dd1a652ccf800f641783d3a039cf9e':
  EmulatedFakeCamera2: Support (0,0) jpeg thumbnail size.
2012-08-28 16:59:54 -07:00
Eino-Ville Talvala
c296774352 am 9aaa620b: Merge "EmulatedFakeCamera2: Support (0,0) jpeg thumbnail size." into jb-mr1-dev
* commit '9aaa620bdbb43b34d16ef81595ad1ffbcb3a863c':
  EmulatedFakeCamera2: Support (0,0) jpeg thumbnail size.
2012-08-28 16:57:20 -07:00
Eino-Ville Talvala
9aaa620bdb Merge "EmulatedFakeCamera2: Support (0,0) jpeg thumbnail size." into jb-mr1-dev 2012-08-28 16:55:45 -07:00
Raphael Moll
c688aefcbd Merge "Windows USB Driver for generic, rev 7" 2012-08-28 15:32:56 -07:00
Andy Stadler
dc64828674 am 92841986: am 00814d01: Fix .classpath
* commit '92841986ea924d55ce98f45b7716596f080d4e6f':
  Fix .classpath
2012-08-28 15:10:37 -07:00
Andy Stadler
92841986ea am 00814d01: Fix .classpath
* commit '00814d01e44b8a04d3f46f5455d5644ee378e915':
  Fix .classpath
2012-08-28 15:08:52 -07:00
Andy Stadler
00814d01e4 Fix .classpath
Change-Id: Id897c83e926069b667d9f1d048f89bbe84445aeb
2012-08-28 14:59:13 -07:00
Eino-Ville Talvala
33c3f77760 EmulatedFakeCamera2: Use HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED
Stop using CAMERA2_HAL_PIXEL_FORMAT_OPAQUE.

Bug: 6243944
Change-Id: I96ea30228b126b4eed560a760269cb50bbbb62f7
2012-08-28 14:39:59 -07:00
Eino-Ville Talvala
eb502a31bc EmulatedFakeCamera2: Support (0,0) jpeg thumbnail size.
Change-Id: I5aa01501c36076a6260d47d2ae4bdc0365b49a8c
2012-08-28 13:40:46 -07:00
Raphael Moll
4d64923bb8 Windows USB Driver for generic + Q, rev 7.
(Cherry-picked from master c9533ad3cf)

Change-Id: Ia18fe5f08a6e2c6040e61f3105cff71cb3f4f8e5
2012-08-28 13:23:47 -07:00
Raphael Moll
fbb5fc390a Windows USB Driver for generic, rev 7
Change-Id: Ie646d5709108ffa69d9729cfe6e5674a47e1d4ff
2012-08-28 13:21:49 -07:00
Chao-Ying Fu
75f8d8217e Remove unused .ctors, .dtors, and .eh_frame in MIPS crt*_so.S.
Change-Id: I9b2d28c7c189d0f3a2ded694fadd0380cfd8e6e5
2012-08-28 13:21:42 -07:00
Adam Koch
7579595978 am a332dd45: am 1e0f4c13: am f4db935d: am a4877aed: Merge "Updating code sample for "displaying bitmaps efficiently" training class. Changes: -Use updated versions of ImageWorker & ImageCache from I/O 2012 app -Use copied DiskLruCache from system (rather than custom
* commit 'a332dd45bddd61a070801380a3d532be426c5c48':
  Updating code sample for "displaying bitmaps efficiently" training class. Changes:  -Use updated versions of ImageWorker & ImageCache from I/O 2012 app  -Use copied DiskLruCache from system (rather than custom)  -Use copied AsyncTask from system (to keep behavior consistent)  -Ensure no strict mode violations or lint errors  -Other misc bug fixes  -Move single-use static methods in Utils to corresponding class
2012-08-28 07:51:43 -07:00
Adam Koch
a332dd45bd am 1e0f4c13: am f4db935d: am a4877aed: Merge "Updating code sample for "displaying bitmaps efficiently" training class. Changes: -Use updated versions of ImageWorker & ImageCache from I/O 2012 app -Use copied DiskLruCache from system (rather than custom) -Use copie
* commit '1e0f4c136f45936217348c9ddfe34aed6bb215ec':
  Updating code sample for "displaying bitmaps efficiently" training class. Changes:  -Use updated versions of ImageWorker & ImageCache from I/O 2012 app  -Use copied DiskLruCache from system (rather than custom)  -Use copied AsyncTask from system (to keep behavior consistent)  -Ensure no strict mode violations or lint errors  -Other misc bug fixes  -Move single-use static methods in Utils to corresponding class
2012-08-28 07:49:13 -07:00
Adam Koch
1e0f4c136f am f4db935d: am a4877aed: Merge "Updating code sample for "displaying bitmaps efficiently" training class. Changes: -Use updated versions of ImageWorker & ImageCache from I/O 2012 app -Use copied DiskLruCache from system (rather than custom) -Use copied AsyncTask f
* commit 'f4db935d3a104cfc828c888d4eb53a22c5b70424':
  Updating code sample for "displaying bitmaps efficiently" training class. Changes:  -Use updated versions of ImageWorker & ImageCache from I/O 2012 app  -Use copied DiskLruCache from system (rather than custom)  -Use copied AsyncTask from system (to keep behavior consistent)  -Ensure no strict mode violations or lint errors  -Other misc bug fixes  -Move single-use static methods in Utils to corresponding class
2012-08-28 07:47:06 -07:00
Adam Koch
f4db935d3a am a4877aed: Merge "Updating code sample for "displaying bitmaps efficiently" training class. Changes: -Use updated versions of ImageWorker & ImageCache from I/O 2012 app -Use copied DiskLruCache from system (rather than custom) -Use copied AsyncTask from system (t
* commit 'a4877aed7654e8bc7f531593f75c1ae05ef3411c':
  Updating code sample for "displaying bitmaps efficiently" training class. Changes:  -Use updated versions of ImageWorker & ImageCache from I/O 2012 app  -Use copied DiskLruCache from system (rather than custom)  -Use copied AsyncTask from system (to keep behavior consistent)  -Ensure no strict mode violations or lint errors  -Other misc bug fixes  -Move single-use static methods in Utils to corresponding class
2012-08-28 07:45:17 -07:00
Adam Koch
a4877aed76 Merge "Updating code sample for "displaying bitmaps efficiently" training class. Changes: -Use updated versions of ImageWorker & ImageCache from I/O 2012 app -Use copied DiskLruCache from system (rather than custom) -Use copied AsyncTask from system (to keep behavior consistent) -Ensure no strict mode violations or lint errors -Other misc bug fixes -Move single-use static methods in Utils to corresponding class" into jb-dev 2012-08-28 07:42:11 -07:00
The Android Open Source Project
b339d790e3 am ed5b5d40: (-s ours) am 74cddad9: am 0c8806a4: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit 'ed5b5d40302bb583574286d088d833a25c9f94b7':
2012-08-27 15:20:33 -07:00
The Android Open Source Project
ed5b5d4030 am 74cddad9: am 0c8806a4: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '74cddad9dfe6777a4ae047e070cf42ff6f0ace81':
2012-08-27 15:17:13 -07:00
The Android Open Source Project
74cddad9df am 0c8806a4: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '0c8806a484d6d78099d9af2782b76f495e4b3c05':
2012-08-27 15:13:21 -07:00
The Android Open Source Project
0c8806a484 Reconcile with jb-mr0-release - do not merge
Change-Id: Iaa7372f223059e828c2f256c83b8d6e7d39bd74a
2012-08-27 14:11:00 -07:00
Raphael Moll
c9533ad3cf Windows USB Driver for generic + Q, rev 7.
Change-Id: I6a6bf4b89405ebd51c72685c85a1b894de0e6897
2012-08-27 09:25:24 -07:00
The Android Automerger
57dfd607cf merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-27 06:33:32 -07:00
Chiao Cheng
7b87c25291 Merge "Adding new packages to classpath." 2012-08-24 10:24:28 -07:00
The Android Automerger
bda8a3659a merge in jb-mr0-release history after reset to jb-dev 2012-08-23 21:30:13 -07:00
Andrew Hsieh
af1632e1c1 am 407c3481: am 121d1955: am 82043724: am 9cf4d01b: am 51f72cc1: Merge "Support asm/sockios.h for MIPS."
* commit '407c3481531422091d845f0b344c14f973f9ddb8':
  Support asm/sockios.h for MIPS.
2012-08-23 15:58:09 -07:00