The Android Automerger
405b3038a7
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-30 06:33:26 -07:00
Andrew Hsieh
eb703bf543
Replace deprecated APIs in NDK samples
...
1. hello-gl2 from android-5 to android-7
2. native-activity from android-9 to android-10
3. native-audio from android-9 to android-10
4. native-plasma from android-9 to android-10
Related CL
https://android-review.googlesource.com/#/c/42218 , which
adjusts android-10 to use android-9 header/lib
Related issue:
http://code.google.com/p/android/issues/detail?id=20017
Change-Id: I49c4c0dd2cedb34522a9d196211ee96fce21b6c4
2012-08-30 13:02:53 +08:00
Xavier Ducrohet
b1b6735cd6
Prepare for JB SDK rev 3
...
Change-Id: I3b1beb1ff2e12ed39631f6f96379819a0cea6b3c
2012-08-29 16:36:54 -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
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
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
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
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
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
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
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
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
The Android Automerger
57dfd607cf
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-27 06:33:32 -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
407c348153
am 121d1955: am 82043724: am 9cf4d01b: am 51f72cc1: Merge "Support asm/sockios.h for MIPS."
...
* commit '121d1955f72918b2ad0b70f2e437252c268381fd':
Support asm/sockios.h for MIPS.
2012-08-23 15:55:25 -07:00
Andrew Hsieh
121d1955f7
am 82043724: am 9cf4d01b: am 51f72cc1: Merge "Support asm/sockios.h for MIPS."
...
* commit '82043724c4fea5bf063e6ed5b341816b3543b955':
Support asm/sockios.h for MIPS.
2012-08-23 15:53:56 -07:00
Roman Nurik
b2ac2d803b
am a5e5a459: am e7df2e3f: am f6457d05: Merge "Retroactively add EffectiveNavigation and TabCompat sample code." into jb-dev
...
* commit 'a5e5a459c06c4897dc61a508ba63e3ba239c7c3b':
Retroactively add EffectiveNavigation and TabCompat sample code.
2012-08-23 14:14:10 -07:00
Roman Nurik
a5e5a459c0
am e7df2e3f: am f6457d05: Merge "Retroactively add EffectiveNavigation and TabCompat sample code." into jb-dev
...
* commit 'e7df2e3f6eb1f847cc362f70b062fc76e7825d30':
Retroactively add EffectiveNavigation and TabCompat sample code.
2012-08-23 14:11:40 -07:00
Adam Koch
03ceb37f79
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
Change-Id: If21e045db1e1a80391169f3c9c9258d48345ab6b
2012-08-23 16:41:05 -04:00
Andy Stadler
3e2e762f64
am a770685d: Quick fixes for .classpath (eclipse happiness)
...
* commit 'a770685d55a6709a1c73f5937aeeed6227dae7df':
Quick fixes for .classpath (eclipse happiness)
2012-08-23 12:00:58 -07:00
Andy Stadler
a770685d55
Quick fixes for .classpath (eclipse happiness)
...
Change-Id: Ibbef12b7b253bf07abdfcb1dc0ae141baf7a9315
2012-08-23 11:29:03 -07:00
Andrew Hsieh
82043724c4
am 9cf4d01b: am 51f72cc1: Merge "Support asm/sockios.h for MIPS."
...
* commit '9cf4d01b7c46401ba632db2efa471bb262bc30aa':
Support asm/sockios.h for MIPS.
2012-08-22 16:52:58 -07:00
Andrew Hsieh
9cf4d01b7c
am 51f72cc1: Merge "Support asm/sockios.h for MIPS."
...
* commit '51f72cc1bdd6f2624d5d625716ca3767cd3c3a63':
Support asm/sockios.h for MIPS.
2012-08-22 16:51:01 -07:00
Andrew Hsieh
51f72cc1bd
Merge "Support asm/sockios.h for MIPS."
2012-08-22 16:38:02 -07:00
Roman Nurik
e7df2e3f6e
am f6457d05: Merge "Retroactively add EffectiveNavigation and TabCompat sample code." into jb-dev
...
* commit 'f6457d0548f499f77c996d13cc43115e448aa437':
Retroactively add EffectiveNavigation and TabCompat sample code.
2012-08-22 16:21:36 -07:00