Raphael Moll
862ae1efae
Adjust sdk to new prebuilts location.
...
Change-Id: I4a2cb710ef3c22b7b3c90e5b4ee7757087ebe44c
2013-02-06 16:45:26 -08:00
Chris Banes
4d6574e878
Update bitmapfun sample to call recycle()
...
A new sub-class of BitmapDrawable has been created which tracks
when it is being used or cached when running on Gingerbread or
older. A new ImageView subclass has been added to accomplish this,
as well as changes to the LruCache.
Change-Id: I95d3334684703aebb6b09fcd56194cf73e3c2dcf
Signed-off-by: Chris Banes <chrisbanes@google.com >
2013-02-06 16:21:21 +00:00
Dirk Dougherty
c82865621b
am 24600336: am 64f03f37: am 451d3b83: Merge "Add redirect for removed file." into jb-mr1-dev
...
# Via Android Git Automerger (2) and others
* commit '246003369211d3f0a035c4ae23e63b234080e4fd':
Add redirect for removed file.
2013-02-05 14:13:56 -08:00
Dirk Dougherty
2460033692
am 64f03f37: am 451d3b83: Merge "Add redirect for removed file." into jb-mr1-dev
...
# Via Android (Google) Code Review (1) and others
* commit '64f03f37e3c0963c168ec7517d4c6ebe588e3c33':
Add redirect for removed file.
2013-02-05 14:11:07 -08:00
Dirk Dougherty
64f03f37e3
am 451d3b83: Merge "Add redirect for removed file." into jb-mr1-dev
...
# Via Android (Google) Code Review (1) and Dirk Dougherty (1)
* commit '451d3b83cfbfd807ec3b86e3e2877cc8b2a39bab':
Add redirect for removed file.
2013-02-05 14:08:30 -08:00
Dirk Dougherty
451d3b83cf
Merge "Add redirect for removed file." into jb-mr1-dev
2013-02-05 22:06:58 +00:00
Dirk Dougherty
184a1dc183
Add redirect for removed file.
...
Change-Id: I94c59f54ab7daaae588f61c02601b7599799894b
2013-02-05 14:05:04 -08:00
The Android Open Source Project
b3459b08c3
Reconcile with jb-mr1.1-release - do not merge
...
Change-Id: I37667f21ee86fe7aafbf7f44573b27d7eb573f7e
2013-02-05 13:44:54 -08:00
The Android Automerger
49e44d8dfe
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2013-02-05 12:24:08 -08:00
Dirk Dougherty
851b403254
am 0d594020: am a9fe80d2: am 388ea1e3: Minor updates to keep androiddevdocs redirect in sync with devsite version (in frameworks/base)
...
# Via Android Git Automerger (2) and Dirk Dougherty (1)
* commit '0d5940203cd866858e07b381ea8104d8c99286a8':
Minor updates to keep androiddevdocs redirect in sync with devsite version (in frameworks/base)
2013-02-05 09:55:19 -08:00
Dirk Dougherty
0d5940203c
am a9fe80d2: am 388ea1e3: Minor updates to keep androiddevdocs redirect in sync with devsite version (in frameworks/base)
...
# Via Android Git Automerger (1) and Dirk Dougherty (1)
* commit 'a9fe80d20405e38946d4e54a361e58f4c2137165':
Minor updates to keep androiddevdocs redirect in sync with devsite version (in frameworks/base)
2013-02-05 09:53:24 -08:00
Dirk Dougherty
a9fe80d204
am 388ea1e3: Minor updates to keep androiddevdocs redirect in sync with devsite version (in frameworks/base)
...
# Via Dirk Dougherty
* commit '388ea1e3e55bf37f22a6b98bcd57da1cb4b31032':
Minor updates to keep androiddevdocs redirect in sync with devsite version (in frameworks/base)
2013-02-05 09:51:08 -08:00
Andrew Hsieh
b070a3d46b
am 18c3a185: Merge "Fix warnings in sample detected by NDK_ANALYZE=1"
...
# Via Andrew Hsieh (1) and Gerrit Code Review (1)
* commit '18c3a185c64a87791ccedb802203fda7b5290916':
Fix warnings in sample detected by NDK_ANALYZE=1
2013-02-05 00:12:06 -08:00
Andrew Hsieh
18c3a185c6
Merge "Fix warnings in sample detected by NDK_ANALYZE=1"
2013-02-05 08:10:17 +00:00
Dirk Dougherty
388ea1e3e5
Minor updates to keep androiddevdocs redirect in sync with devsite version (in frameworks/base)
...
Change-Id: If2fdf0b92d560fcfbbcfe0f5ec65dd6dcf471560
2013-02-04 13:19:46 -08:00
Adam Koch
5d849d6f50
am 5f404299: am aa3687df: am 2e5555e0: Bitmapfun Sample: Fix bug where background image loading could hang
...
# Via Android Git Automerger (2) and Adam Koch (1)
* commit '5f4042990ac33bd05cd4e3f48935d6eb0dc552c9':
Bitmapfun Sample: Fix bug where background image loading could hang
2013-02-04 09:06:34 -08:00
The Android Automerger
61e0b17123
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2013-02-01 18:25:04 -08:00
Adam Koch
5f4042990a
am aa3687df: am 2e5555e0: Bitmapfun Sample: Fix bug where background image loading could hang
...
# Via Adam Koch (1) and Android Git Automerger (1)
* commit 'aa3687df9e86b4ec53a81d4ceb3435ddf4e9a7f4':
Bitmapfun Sample: Fix bug where background image loading could hang
2013-02-01 14:26:02 -08:00
Adam Koch
aa3687df9e
am 2e5555e0: Bitmapfun Sample: Fix bug where background image loading could hang
...
# Via Adam Koch
* commit '2e5555e04b1e78f2d6fc48e8069b33399a4cf028':
Bitmapfun Sample: Fix bug where background image loading could hang
2013-02-01 13:27:32 -08:00
Andrew Hsieh
c21a505044
Fix warnings in sample detected by NDK_ANALYZE=1
...
Change-Id: I999a96fb3de5225adde91eb014170ffd7b6092f6
2013-02-01 11:14:28 -08:00
Igor Murashkin
f3e630bf44
am bbbc646d: EmulatedCamera2: Fix metadata symbols: DO NOT MERGE
...
# Via Igor Murashkin
* commit 'bbbc646d85c959d8be3431b4922e943f2978135f':
EmulatedCamera2: Fix metadata symbols: DO NOT MERGE
2013-01-30 18:57:23 -08:00
Igor Murashkin
3d6a2c0f54
am 28ecf8da: Revert "Camera2: Selectively re-define master metadata symbols: DO NOT MERGE": DO NOT MERGE
...
# Via Igor Murashkin
* commit '28ecf8da880d2371e9b995a08c79dd7efe74ca34':
Revert "Camera2: Selectively re-define master metadata symbols: DO NOT MERGE": DO NOT MERGE
2013-01-30 18:57:22 -08:00
Igor Murashkin
bbbc646d85
EmulatedCamera2: Fix metadata symbols: DO NOT MERGE
...
Change-Id: I9ccec2636d73684af9236d873a6bba0e15cd598a
2013-01-30 16:32:56 -08:00
Igor Murashkin
28ecf8da88
Revert "Camera2: Selectively re-define master metadata symbols: DO NOT MERGE": DO NOT MERGE
...
This reverts commit 52f92faa60 .
2013-01-30 16:31:51 -08:00
Adam Koch
2e5555e04b
Bitmapfun Sample: Fix bug where background image loading could hang
...
Background image loading is paused when the GridView is scrolling,
if the activity is destroyed during a scroll the image loading was
not unpaused causing it to remain running indefinitely. This change
makes sure the background image loading is unpaused.
Change-Id: Iad8093fc2af50fcfc1416c5d9089db0c064711cf
2013-01-28 12:20:42 -05:00
Dianne Hackborn
e66430c1d9
am 2e21a7d5: am 2f388d7a: Merge "Correcting 2 FC\'s in Dev Tools"
...
# By HardCorePawn
# Via Android Git Automerger (1) and others
* commit '2e21a7d5fcb3201c5da1e281063751810fcb01f4':
Correcting 2 FC's in Dev Tools
2013-01-24 17:09:18 -08:00
Dianne Hackborn
2e21a7d5fc
am 2f388d7a: Merge "Correcting 2 FC\'s in Dev Tools"
...
# By HardCorePawn
# Via Gerrit Code Review (1) and HardCorePawn (1)
* commit '2f388d7a399b9744e5212984a4c383d83eddfd7f':
Correcting 2 FC's in Dev Tools
2013-01-24 17:07:51 -08:00
Dianne Hackborn
2f388d7a39
Merge "Correcting 2 FC's in Dev Tools"
2013-01-25 01:03:44 +00:00
HardCorePawn
fdc98b7091
Correcting 2 FC's in Dev Tools
...
Added in missing permission required by SyncTester
Commented non-existant Google Login Service
2013-01-24 00:49:08 +01:00
Sergey Melnikov
e3b1ac14bd
stdint.h header is not fully compatible with C99(ISO9899:1999)
...
1. stdint.h doesn't provide macros:
* SIG_ATOMIC_MIN
* SIG_ATOMIC_MAX
* WCHAR_MIN
* WCHAR_MAX
* WINT_MIN
* WINT_MAX
2. stdint.h provides macros with incorrect type:
* UINT8_C
* UINT16_C
* UINT8_MAX
* UINT16_MAX
Change-Id: I3f4da907eaee8f46d8eb956950230ca2eb04a3ea
Signed-off-by: Sergey Melnikov <sergey.melnikov@intel.com >
2013-01-17 09:58:16 +04:00
The Android Automerger
f08d11a90f
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2013-01-16 16:41:24 -08:00
Raphael Moll
288e199617
am b78b8ccd: am 7f340728: Merge "Fix SDK build: use repository XML schemas from new prebuilts."
...
* commit 'b78b8ccd2757d6456520b578e7e0d7074a9598a7':
Fix SDK build: use repository XML schemas from new prebuilts.
2013-01-16 16:39:24 -08:00
Raphael Moll
b78b8ccd27
am 7f340728: Merge "Fix SDK build: use repository XML schemas from new prebuilts."
...
* commit '7f340728d339f047c5149940f0da90eedbdfcb4e':
Fix SDK build: use repository XML schemas from new prebuilts.
2013-01-16 16:36:33 -08:00
Raphael Moll
7f340728d3
Merge "Fix SDK build: use repository XML schemas from new prebuilts."
2013-01-17 00:17:44 +00:00
Raphael Moll
e26f9f9755
Fix SDK build: use repository XML schemas from new prebuilts.
...
Change-Id: I32799751cb19db2f99b45c26b7e308b1e11af161
2013-01-16 16:03:31 -08:00
Chet Haase
71459f1fe0
am fb198383: am 8c013aee: am 690af128: Cherrypick from Change-Id: I4ae984cf776604cede32b98db6b1eb3cb6c59c7e
...
* commit 'fb198383cc3c786ed303e49e29c8d0b86f38be73':
Cherrypick from Change-Id: I4ae984cf776604cede32b98db6b1eb3cb6c59c7e
2013-01-15 11:05:58 -08:00
Chet Haase
fb198383cc
am 8c013aee: am 690af128: Cherrypick from Change-Id: I4ae984cf776604cede32b98db6b1eb3cb6c59c7e
...
* commit '8c013aeeecaecb2a0a1038433d0d7a603a57ac30':
Cherrypick from Change-Id: I4ae984cf776604cede32b98db6b1eb3cb6c59c7e
2013-01-15 11:03:42 -08:00
Chet Haase
8c013aeeec
am 690af128: Cherrypick from Change-Id: I4ae984cf776604cede32b98db6b1eb3cb6c59c7e
...
* commit '690af1285c320a1d3fc31cc57414347c74bd8e1d':
Cherrypick from Change-Id: I4ae984cf776604cede32b98db6b1eb3cb6c59c7e
2013-01-15 11:01:26 -08:00
Chet Haase
690af1285c
Cherrypick from Change-Id: I4ae984cf776604cede32b98db6b1eb3cb6c59c7e
...
First set of demo apps for DevBytes videos
Change-Id: I696b184aaa8058f01c0369a173aae09e38a8cb08
2013-01-15 10:36:26 -08:00
Adam Koch
fe85cdde28
am 79f346a7: am ec5a8473: am b8a61acb: Bitmapfun Sample: Change cache memory calculation to use maxMemory()
...
* commit '79f346a78e35079cf390b7328cce1fbcaa0ce845':
Bitmapfun Sample: Change cache memory calculation to use maxMemory()
2013-01-14 09:28:10 -08:00
Adam Koch
79f346a78e
am ec5a8473: am b8a61acb: Bitmapfun Sample: Change cache memory calculation to use maxMemory()
...
* commit 'ec5a8473253c4458b996cbfba6ed8b0bbb82ef5f':
Bitmapfun Sample: Change cache memory calculation to use maxMemory()
2013-01-14 06:18:06 -08:00
Adam Koch
ec5a847325
am b8a61acb: Bitmapfun Sample: Change cache memory calculation to use maxMemory()
...
* commit 'b8a61acb072e03665b2c53c7fd049b5bbf5ed1d4':
Bitmapfun Sample: Change cache memory calculation to use maxMemory()
2013-01-14 06:15:15 -08:00
Adam Koch
b8a61acb07
Bitmapfun Sample: Change cache memory calculation to use maxMemory()
...
When calculating memory cache size, use Runtime.maxMemory() instead
of getMemoryClass() which is a more accurate value of available VM
heap size.
Also bump target and build SDK to 17.
Bug: 7988323
Change-Id: I4b94688b3800d958ffbe03ee9a2a620982483d3d
2013-01-11 16:51:09 -05:00
Igor Murashkin
caf8379a8d
am ba48d6f0: Merge changes I36c3dcaa,I7574913a,I8db9d918,I37e2c005 into jb-mr1-aah-dev
...
* commit 'ba48d6f00c9a13ba00022949c87215ecf4b829aa':
Camera2: Fix segfault when control fields were omitted in metadata: DO NOT MERGE
Camera2: Test: fix deadlock in isStreamInUse: DO NOT MERGE
Camera2: Return -ENODEV for camera indices out of bounds: DO NOT MERGE
Camera2: Turn off 3A when android.control.mode == OFF: DO NOT MERGE
2013-01-10 13:35:36 -08:00
Igor Murashkin
8b622fe360
am 10665f4b: Merge "Camera2: Fix a potential race condition in the readout thread: DO NOT MERGE" into jb-mr1-aah-dev
...
* commit '10665f4b0c5dc94ce7cceaa1fd60a8c29b384114':
Camera2: Fix a potential race condition in the readout thread: DO NOT MERGE
2013-01-10 13:35:35 -08:00
Igor Murashkin
ae6c881bc5
am 778dd967: Merge "Camera2: Fix a deadlock when closing the camera: DO NOT MERGE" into jb-mr1-aah-dev
...
* commit '778dd967ade8c37b4b4fc6afdd6b5f2a2a2d6875':
Camera2: Fix a deadlock when closing the camera: DO NOT MERGE
2013-01-10 13:35:34 -08:00
Igor Murashkin
6917606e04
am 6daf70b2: Merge "Camera2: Selectively re-define master metadata symbols: DO NOT MERGE" into jb-mr1-aah-dev
...
* commit '6daf70b26bfddf9ad079b925c0d586b789e3c207':
Camera2: Selectively re-define master metadata symbols: DO NOT MERGE
2013-01-10 13:35:32 -08:00
Igor Murashkin
ba48d6f00c
Merge changes I36c3dcaa,I7574913a,I8db9d918,I37e2c005 into jb-mr1-aah-dev
...
* changes:
Camera2: Fix segfault when control fields were omitted in metadata: DO NOT MERGE
Camera2: Test: fix deadlock in isStreamInUse: DO NOT MERGE
Camera2: Return -ENODEV for camera indices out of bounds: DO NOT MERGE
Camera2: Turn off 3A when android.control.mode == OFF: DO NOT MERGE
2013-01-10 13:34:31 -08:00
Igor Murashkin
10665f4b0c
Merge "Camera2: Fix a potential race condition in the readout thread: DO NOT MERGE" into jb-mr1-aah-dev
2013-01-10 13:34:27 -08:00
Igor Murashkin
778dd967ad
Merge "Camera2: Fix a deadlock when closing the camera: DO NOT MERGE" into jb-mr1-aah-dev
2013-01-10 13:34:20 -08:00