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
Wink Saville
eb331e827b
Merge "Update voip in classpath"
2013-02-05 22:41:58 +00:00
Dirk Dougherty
2ef571bced
am c8286562: am 24600336: am 64f03f37: am 451d3b83: Merge "Add redirect for removed file." into jb-mr1-dev
...
# Via Android Git Automerger (3) and others
* commit 'c82865621bb29c9fdf0d7f25b2a492b36adef927':
Add redirect for removed file.
2013-02-05 14:15:57 -08: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
1657a0d586
am b3459b08: (-s ours) Reconcile with jb-mr1.1-release - do not merge
...
# Via The Android Automerger (5) and The Android Open Source Project (1)
* commit 'b3459b08c398250747a44a9d4e96ad3832e3e7f3':
2013-02-05 13:48:54 -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
Stephen Hines
4a31681276
Merge "Update HelloCompute to use separate output bitmap."
2013-02-05 21:42:50 +00: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
6149c80080
am 851b4032: am 0d594020: am a9fe80d2: am 388ea1e3: Minor updates to keep androiddevdocs redirect in sync with devsite version (in frameworks/base)
...
# Via Android Git Automerger (3) and Dirk Dougherty (1)
* commit '851b40325449e9a0fabd2f9667f707860b94d51e':
Minor updates to keep androiddevdocs redirect in sync with devsite version (in frameworks/base)
2013-02-05 09:57:17 -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
803b58a180
am b070a3d4: am 18c3a185: Merge "Fix warnings in sample detected by NDK_ANALYZE=1"
...
# Via Andrew Hsieh (1) and others
* commit 'b070a3d46b1f1f0cf6efeb6991f428652a82a97c':
Fix warnings in sample detected by NDK_ANALYZE=1
2013-02-05 00:16:16 -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
Adam Koch
6addcd306b
am 5d849d6f: am 5f404299: am aa3687df: am 2e5555e0: Bitmapfun Sample: Fix bug where background image loading could hang
...
# Via Android Git Automerger (3) and Adam Koch (1)
* commit '5d849d6f5003cb96c9c36f675c451a0dd57c02de':
Bitmapfun Sample: Fix bug where background image loading could hang
2013-02-04 16:43:41 -08: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
Trevor Johns
2aca583c4b
Remove MailSync demo
...
This directory seems to be empty, and predates the initial AOSP
code drop.
Change-Id: Ibdab72dd60523cb13dab14d0bfc65775d6430c20
2013-01-31 16:49:07 -08:00
Dianne Hackborn
6b16feb5a0
Update to follow activity manager protocol change.
...
Change-Id: Iee6382c8ed35e296fe27a8fdb69e97dd8b455cc9
2013-01-31 15:17:38 -08:00
Igor Murashkin
c581ff6587
am f3e630bf: (-s ours) am bbbc646d: EmulatedCamera2: Fix metadata symbols: DO NOT MERGE
...
# Via Android Git Automerger (1) and Igor Murashkin (1)
* commit 'f3e630bf44a4e703e8e90210ea5c9e6e87683841':
EmulatedCamera2: Fix metadata symbols: DO NOT MERGE
2013-01-30 18:59:51 -08:00
Igor Murashkin
399aa6615e
am 3d6a2c0f: (-s ours) am 28ecf8da: Revert "Camera2: Selectively re-define master metadata symbols: DO NOT MERGE": DO NOT MERGE
...
# Via Android Git Automerger (1) and Igor Murashkin (1)
* commit '3d6a2c0f54646514fa6dce9fa41b074a39690212':
Revert "Camera2: Selectively re-define master metadata symbols: DO NOT MERGE": DO NOT MERGE
2013-01-30 18:59:50 -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
Wink Saville
7dedc1f169
Update voip in classpath
...
frameworks/base/voip has been moved to frameworks/opt/net/voip
and is now a library.
Change-Id: I4b17697be2cf6d239b7d80920f10392df8b52be2
2013-01-30 10:26:29 -08:00
Svetoslav Ganov
b226ef38fa
Merge "Refactoring due to removing some private APIs."
2013-01-29 03:16:11 +00: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
0960eb4b1d
am e66430c1: am 2e21a7d5: am 2f388d7a: Merge "Correcting 2 FC\'s in Dev Tools"
...
# By HardCorePawn
# Via Android Git Automerger (2) and others
* commit 'e66430c1d9cc0f0cb3cd3771459b0e3b5bc9d912':
Correcting 2 FC's in Dev Tools
2013-01-25 17:11:40 -08: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
Winson Chung
ce966749a5
Merge "Updating WeatherListWidget to the new collections widget api."
2013-01-24 00:29: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
Svetoslav Ganov
00fc93c6fe
Refactoring due to removing some private APIs.
...
Change-Id: Id00d9fa974d8cb747cebb99c5a64ed5b438b56e9
2013-01-23 00:20:07 +00:00
Raphael Moll
7531ada080
am 288e1996: am b78b8ccd: am 7f340728: Merge "Fix SDK build: use repository XML schemas from new prebuilts."
...
* commit '288e1996175b76e2ffa163836bfb6f4e595fdf75':
Fix SDK build: use repository XML schemas from new prebuilts.
2013-01-16 16:41:57 -08: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