LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,272 Commits 2 Branches 0 Tags
bd48d1e676d23f8f6ff9b57d1a92e4b3935bfecc
Commit Graph

13272 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Raphael Moll
de7e352b15 am ddb45cd3: am 68251f81: Merge "Adjust sdk to new prebuilts location." 
# Via Android Git Automerger (1) and others
* commit 'ddb45cd3e9fb5ce63b636823d9be693dceb6ee55':
  Adjust sdk to new prebuilts location.
 2013-02-08 10:13:29 -08:00
Raphael Moll
ddb45cd3e9 am 68251f81: Merge "Adjust sdk to new prebuilts location." 
# Via Gerrit Code Review (1) and Raphael Moll (1)
* commit '68251f8115197b1bef0bd1e2bb06bcb491dededc':
  Adjust sdk to new prebuilts location.
 2013-02-08 10:11:31 -08:00
Raphael Moll
68251f8115 Merge "Adjust sdk to new prebuilts location." 2013-02-08 17:59:26 +00:00
The Android Automerger
04e0a9cfd0 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2013-02-07 14:23:19 -08:00
Chris Banes
a1a83e1f25 am e6edd932: am d3dc2b12: am 2a84299d: am f4535aee: Merge "Update bitmapfun sample to call recycle()" into jb-mr1-dev 
# Via Android Git Automerger (3) and others
* commit 'e6edd9322b43ef14da2e447b45183bf07262238f':
  Update bitmapfun sample to call recycle()
 2013-02-07 11:19:47 -08:00
Chris Banes
e6edd9322b am d3dc2b12: am 2a84299d: am f4535aee: Merge "Update bitmapfun sample to call recycle()" into jb-mr1-dev 
# Via Android Git Automerger (2) and others
* commit 'd3dc2b12e21305685920d262cfdc093dfaf1da0b':
  Update bitmapfun sample to call recycle()
 2013-02-07 09:25:08 -08:00
Chris Banes
d3dc2b12e2 am 2a84299d: am f4535aee: Merge "Update bitmapfun sample to call recycle()" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and others
* commit '2a84299d4d8e1944f2af66199b784004d639deaa':
  Update bitmapfun sample to call recycle()
 2013-02-07 09:17:21 -08:00
Chris Banes
2a84299d4d am f4535aee: Merge "Update bitmapfun sample to call recycle()" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and Chris Banes (1)
* commit 'f4535aee56bf564f962dbcbdc0ce03af98f0ebd4':
  Update bitmapfun sample to call recycle()
 2013-02-07 09:15:44 -08:00
Chris Banes
f4535aee56 Merge "Update bitmapfun sample to call recycle()" into jb-mr1-dev 2013-02-07 17:12:28 +00:00
Mathias Agopian
2373f44281 Merge "clean-up sensor emulation code." 2013-02-07 03:08:32 +00:00
Mathias Agopian
6e263d5568 clean-up sensor emulation code. 
don't blindly access the "status" field which is not used for all sensors.

Change-Id: I6ff80cf37b8feeccddfd843480db1861aabbedf1
 2013-02-06 18:57:04 -08:00
Trevor Johns
dc452cf178 Merge "Remove MailSync demo" 2013-02-07 02:54:28 +00:00
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
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