android_development/samples, branch cm-10.1 Unnamed repository; edit this file 'description' to name the repository. Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/development into 1.1 2013-02-13T07:10:07+00:00 Steve Kondik shade@chemlab.org 2013-02-13T07:10:07+00:00 7badd22f5f1b4136ecb06c5c76102b6d8daed720 Android 4.2.2 release 1 Conflicts: sdk/plat_tools_source.properties Change-Id: I13d52f5e7db985e4b55b64ec21395c1c7429e22b 
Android 4.2.2 release 1

Conflicts:
	sdk/plat_tools_source.properties

Change-Id: I13d52f5e7db985e4b55b64ec21395c1c7429e22b
am f4535aee: Merge "Update bitmapfun sample to call recycle()" into jb-mr1-dev 2013-02-07T17:15:44+00:00 Chris Banes chrisbanes@google.com 2013-02-07T17:15:44+00:00 2a84299d4d8e1944f2af66199b784004d639deaa # Via Android (Google) Code Review (1) and Chris Banes (1) * commit 'f4535aee56bf564f962dbcbdc0ce03af98f0ebd4': Update bitmapfun sample to call recycle() 
# Via Android (Google) Code Review (1) and Chris Banes (1)
* commit 'f4535aee56bf564f962dbcbdc0ce03af98f0ebd4':
  Update bitmapfun sample to call recycle()
Update bitmapfun sample to call recycle() 2013-02-06T16:21:21+00:00 Chris Banes chrisbanes@google.com 2013-02-04T16:16:58+00:00 4d6574e878e2af2f19b46b28b28748ba2786e05a 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> 
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>
am 2e5555e0: Bitmapfun Sample: Fix bug where background image loading could hang 2013-02-01T21:27:32+00:00 Adam Koch akoch@google.com 2013-02-01T21:27:32+00:00 aa3687df9e86b4ec53a81d4ceb3435ddf4e9a7f4 # Via Adam Koch * commit '2e5555e04b1e78f2d6fc48e8069b33399a4cf028': 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
FM Radio: Add support for FM Radio in Android 2013-01-29T18:08:37+00:00 Stuart MacDonald stuart.macdonald@stericsson.com 2011-03-14T14:14:54+00:00 7973971018f9f4b180e5271bc4cc021ec2b3de98 Two sample applications for the proposed FM Radio API. Change-Id: I8a0b0099f6ea20d9f53822127498d5e603eb3255 Signed-off-by: Christian Bejram <christian.bejram@stericsson.com> Conflicts: build/sdk.atree Conflicts: build/sdk.atree 
Two sample applications for the proposed FM Radio API.

Change-Id: I8a0b0099f6ea20d9f53822127498d5e603eb3255

Signed-off-by: Christian Bejram <christian.bejram@stericsson.com>

Conflicts:
	build/sdk.atree

Conflicts:
	build/sdk.atree
Bitmapfun Sample: Fix bug where background image loading could hang 2013-01-28T17:20:42+00:00 Adam Koch akoch@google.com 2013-01-28T16:54:02+00:00 2e5555e04b1e78f2d6fc48e8069b33399a4cf028 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 
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
am 690af128: Cherrypick from Change-Id: I4ae984cf776604cede32b98db6b1eb3cb6c59c7e 2013-01-15T19:01:26+00:00 Chet Haase chet@google.com 2013-01-15T19:01:26+00:00 8c013aeeecaecb2a0a1038433d0d7a603a57ac30 * commit '690af1285c320a1d3fc31cc57414347c74bd8e1d': Cherrypick from Change-Id: I4ae984cf776604cede32b98db6b1eb3cb6c59c7e 
* commit '690af1285c320a1d3fc31cc57414347c74bd8e1d':
  Cherrypick from Change-Id: I4ae984cf776604cede32b98db6b1eb3cb6c59c7e
Cherrypick from Change-Id: I4ae984cf776604cede32b98db6b1eb3cb6c59c7e 2013-01-15T18:36:26+00:00 Chet Haase chet@google.com 2013-01-11T00:19:38+00:00 690af1285c320a1d3fc31cc57414347c74bd8e1d First set of demo apps for DevBytes videos Change-Id: I696b184aaa8058f01c0369a173aae09e38a8cb08 
First set of demo apps for DevBytes videos

Change-Id: I696b184aaa8058f01c0369a173aae09e38a8cb08
am b8a61acb: Bitmapfun Sample: Change cache memory calculation to use maxMemory() 2013-01-14T14:15:15+00:00 Adam Koch akoch@google.com 2013-01-14T14:15:15+00:00 ec5a8473253c4458b996cbfba6ed8b0bbb82ef5f * commit 'b8a61acb072e03665b2c53c7fd049b5bbf5ed1d4': Bitmapfun Sample: Change cache memory calculation to use maxMemory() 
* commit 'b8a61acb072e03665b2c53c7fd049b5bbf5ed1d4':
  Bitmapfun Sample: Change cache memory calculation to use maxMemory()
Bitmapfun Sample: Change cache memory calculation to use maxMemory() 2013-01-11T21:51:09+00:00 Adam Koch akoch@google.com 2013-01-11T17:26:45+00:00 b8a61acb072e03665b2c53c7fd049b5bbf5ed1d4 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 
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