drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
50,508 Commits 1 Branch 0 Tags
Commit Graph

50508 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Katie McCormick
37250130b6 am 2c898da6: am 32638ccb: am 4ef5f4dc: am 566489db: Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d 
* commit '2c898da6d3306e041da0165607555303203ec86d':
  Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
 2011-05-18 10:25:02 -07:00
Andreas Huber
9516aee4c1 Merge "Properly forward rotation information from input format to output format." 2011-05-18 09:40:52 -07:00
Andreas Huber
0920bca3ab Properly forward rotation information from input format to output format. 
The software renderer would otherwise never rotate videos as it only has access to
the decoder's output format.

Change-Id: If893c0c23d0e85a3d9d4eb94390a114af5514b1c
 2011-05-18 09:31:22 -07:00
Mike Lockwood
fa1e5561cc am 53b988ba: am 5a79cfd7: am 27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" into honeycomb-mr2 
* commit '53b988ba1842f40e595bb85f2ca055c24787e6dc':
  StorageVolume: Add getStorageId() accessor
 2011-05-18 09:23:35 -07:00
John Reck
74bafe40d7 am c54d3a98: am 1818b4a9: am 1147bf63: Don\'t use mobile for large uastring 
* commit 'c54d3a987235c615715e45f5a22ba75e6fae22b3':
  Don't use mobile for large uastring
 2011-05-18 09:23:22 -07:00
Eric Fischer
cd4877f0e7 am 49ac7418: (-s ours) am d9703697: am da480945: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 
* commit '49ac741841224b9ff2579f6b7722dc7eb0ebcd3a':
  Import revised translations.  DO NOT MERGE
 2011-05-18 09:21:13 -07:00
Eino-Ville Talvala
706804e2e4 Merge "Add auto-white balance locking to the Camera API." 2011-05-18 08:54:40 -07:00
Mike Lockwood
b6aabcf6e3 resolved conflicts for merge of 22c140b7 to master 
Change-Id: I1d57d76519d7a8d8ea7c5be4f49ef885f1ffb302
 2011-05-18 09:25:49 -04:00
Wink Saville
748caa8a7e Merge "dumpstate: don't attempt to use vril-dump, it breaks adb bugreport" 2011-05-17 23:32:01 -07:00
James Dong
f84e4a657f Revert "Add const to the finders method in MetaData.cpp" 
This reverts commit 78fed171d9d62b25aa846d7373a7040e3fd2241e.

Conflicts:

	include/media/stagefright/MPEG4Writer.h

Change-Id: Ie6f497f67a473ad95b50bb949c1aa49e1804bac3
 2011-05-17 22:39:06 -07:00
JP Abgrall
cb4d1a91fc dumpstate: don't attempt to use vril-dump, it breaks adb bugreport 
http://b/4442803 vril-dump's usage of adb causes bugreport to hang

lcm-dump.sh re-uses adb which breaks.

Change-Id: I5eeb30f78793c0a6d10bfaf0097d6aa7b811cf66
Signed-off-by: JP Abgrall <jpa@google.com>
 2011-05-17 21:35:54 -07:00
Katie McCormick
2c898da6d3 am 32638ccb: am 4ef5f4dc: am 566489db: Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d 
* commit '32638ccb66d933512f4792d120b5cd93e9a26537':
  Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
 2011-05-17 17:47:48 -07:00
Katie McCormick
32638ccb66 am 4ef5f4dc: am 566489db: Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d 
* commit '4ef5f4dce666b90c786da61bb2371dc51ea8dc40':
  Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
 2011-05-17 17:40:38 -07:00
Katie McCormick
4ef5f4dce6 am 566489db: Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d 
* commit '566489dbf6047ce90f3765b4058723dbcd731b30':
  Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
 2011-05-17 17:38:04 -07:00
Katie McCormick
566489dbf6 Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d 
Change-Id: I7dd7ec732aa3089b4e20d5a859f35e1bbd846c3b
 2011-05-17 17:21:00 -07:00
Eric Fischer
52ee3eb4eb Merge "Import revised translations." 2011-05-17 17:14:56 -07:00
Eric Fischer
89234127e5 Import revised translations. 
Change-Id: I8c101b5eaee4ed13f3b36f25ea90aa9c940c45d5
 2011-05-17 16:51:41 -07:00
Mike Lockwood
53b988ba18 am 5a79cfd7: am 27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" into honeycomb-mr2 
* commit '5a79cfd7518defdce1911cecbc2441bb0a057e54':
  StorageVolume: Add getStorageId() accessor
 2011-05-17 16:49:40 -07:00
John Reck
c54d3a9872 am 1818b4a9: am 1147bf63: Don\'t use mobile for large uastring 
* commit '1818b4a99016486d42de1a2ff35c88bb3197cd20':
  Don't use mobile for large uastring
 2011-05-17 16:49:25 -07:00
Mike Lockwood
5a79cfd751 am 27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" into honeycomb-mr2 
* commit '27ac64eceee8d4e392983861c6bc6bd620e4c6f7':
  StorageVolume: Add getStorageId() accessor
 2011-05-17 16:44:51 -07:00
Mike Lockwood
27ac64ecee Merge "StorageVolume: Add getStorageId() accessor" into honeycomb-mr2 2011-05-17 16:42:48 -07:00
Brian Carlstrom
d752472d9a Move to KeyChain.bind 
Change-Id: Ic3c6e0e9be9bcfdc882cf97cec38cca70b23d0a1
 2011-05-17 16:20:36 -07:00
John Reck
1818b4a990 am 1147bf63: Don\'t use mobile for large uastring 
* commit '1147bf638a791ef403c0cc6654f4decd1b0d67c1':
  Don't use mobile for large uastring
 2011-05-17 16:18:11 -07:00
Alex Sakhartchouk
51c07e717b Merge "Moves fbo support in renderscript behind the hal" 2011-05-17 15:40:29 -07:00
Jamie Gennis
433060a152 Merge "SurfaceFlinger: unfreeze windows for fixed size buffers." 2011-05-17 15:13:35 -07:00
Jaikumar Ganesh
71f017e0b0 Merge "Improve locking granularity for PAN and Input." 2011-05-17 15:12:00 -07:00
Jaikumar Ganesh
6003fe9af0 Improve locking granularity for PAN and Input. 
Long term, all this needs to be converted to a state machine.

Change-Id: I757a04994cd04e490a632b433e62b00a23880638
 2011-05-17 15:10:00 -07:00
Romain Guy
0a2ed6de7b Merge "Improve LayoutInflater's compliance." 2011-05-17 15:06:09 -07:00
Jason Sams
3badb0d0ca Merge "Core to client fifo on sockets." 2011-05-17 15:05:50 -07:00
Jason Sams
edbfabdb98 Core to client fifo on sockets. 
Change-Id: I3b84a7d4c3c5fa0d764ad4db22dfd142d5cfa95b
 2011-05-17 15:01:29 -07:00
Brian Carlstrom
eb00a7e43f Merge "Simplify KeyChain API by removing now unneeded CA certificate lookup (1 of 3)" 2011-05-17 14:57:31 -07:00
John Reck
1147bf638a Don't use mobile for large uastring 
Bug: 4427114

Change-Id: I0bf58fd2c340e66c15bf782819bf896d227c5455
 2011-05-17 14:39:45 -07:00
Romain Guy
9c1223a713 Improve LayoutInflater's compliance. 
There are standards, we should do our best to implement them
properly.

Change-Id: I83a7dc0651795d09b19d536c17b6aefc2eca5c81
 2011-05-17 14:25:49 -07:00
Mike Lockwood
fbfe555125 StorageVolume: Add getStorageId() accessor 
This ID is used for MTP as well as per volume querying in the media provider.

Change-Id: Ic4fc986d972bd477730643f7e9450c390c0b3a4b
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-05-17 17:19:37 -04:00
Fabrice Di Meglio
dff7897548 Merge "View horizontalDirection public attribute resolution to an internal var." 2011-05-17 14:16:43 -07:00
Chet Haase
63e2c0888d Merge "Fix for using HARDWARE layers on unaccelerated views." 2011-05-17 14:00:53 -07:00
Adam Powell
36aad417a3 Merge "resolved conflicts for merge of 2b6ace58 to master" 2011-05-17 13:57:07 -07:00
James Dong
384fa845fb Merge "Make track informational event optional, depending on system property" 2011-05-17 13:41:42 -07:00
Adam Powell
5d4034a37e resolved conflicts for merge of 2b6ace58 to master 
Change-Id: Icaff26a56c3e467317ca16d71e61fe8c5e60dfda
 2011-05-17 13:41:24 -07:00
Eric Fischer
49ac741841 am d9703697: am da480945: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 
* commit 'd9703697b20b666112a27d904db5fbaf391b3dd2':
  Import revised translations.  DO NOT MERGE
 2011-05-17 13:31:48 -07:00
Eric Fischer
d9703697b2 am da480945: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 
* commit 'da4809455716cf16451ca5db79654370a6a44f17':
  Import revised translations.  DO NOT MERGE
 2011-05-17 13:27:59 -07:00
Eric Fischer
da48094557 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 2011-05-17 13:25:22 -07:00
Mike Lockwood
22c140b7b9 am 798df16e: am 50b27631: Remove some cruft that was left in config.xml by mistake 
* commit '798df16e3a3920ba55d7abc7ed10def6a17132bf':
  Remove some cruft that was left in config.xml by mistake
 2011-05-17 13:14:32 -07:00
Mike Lockwood
798df16e3a am 50b27631: Remove some cruft that was left in config.xml by mistake 
* commit '50b27631598d56cf2def58270ddcf1619045dda4':
  Remove some cruft that was left in config.xml by mistake
 2011-05-17 13:12:32 -07:00
Mike Lockwood
50b2763159 Remove some cruft that was left in config.xml by mistake 
This should fix build breakage for products with nosdcard set.

Change-Id: I989f8630015baaf22fa3d597fc3c1c1646ce44ac
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-05-17 16:08:22 -04:00
Chet Haase
6f33e81a0b Fix for using HARDWARE layers on unaccelerated views. 
If a view is not accelerated but has its layer type set to
LAYER_TYPE_HARDWARE, then the framework will use the old drawing cache
approach, to cache it in a bitmap. This works fine, but when the layer
is set to NONE, that drawing cache is not destroyed, as it would be were
the layer set to LAYER_TYPE_SOFTWARE. This prevents future invalidations on
the view from working correctly because the bitmap cache has never been
destroyed and recreated.

The fix is to always destroy the drawing cache when the layer type is
changed from SOFTWARE or HARDWARE, to make sure that it gets set appropriately
regardless of the state of the view's acceleration.

Change-Id: I449649e6d370477825015505da76564455a156e6
 2011-05-17 12:42:19 -07:00
Jeff Sharkey
78ae81efa9 Merge "First pass at NetworkPolicy and activity tracking." 2011-05-17 12:27:01 -07:00
James Dong
0f32fb3ecf Make track informational event optional, depending on system property 
o also add a track informational event to return the encoded data in kilo-bytes

Change-Id: I7c383360d57048c8a3606d0b8141ba53e4f4b224
 2011-05-17 12:21:57 -07:00
Adam Powell
2b6ace5811 am bd32a79e: am f721b398: Merge "Prevent cases of bogus action bar measurement." into honeycomb-mr2 
* commit 'bd32a79ecb1109c71f80510c927f6dbc131ae563':
  Prevent cases of bogus action bar measurement.
 2011-05-17 12:21:22 -07:00
Eric Fischer
876533d98a Import revised translations. DO NOT MERGE 
Change-Id: I2f5dcc745a5c9f3d7443d03b9dfe4b6e584db58c
 2011-05-17 12:19:30 -07:00