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

22012 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
4b999030ad am 6c427617: Merge "support humidity sensor type" 
* commit '6c427617be940be32fdebbd9c78f9223b292c814':
  support humidity sensor type
 2011-05-18 15:20:29 -07:00
Jean-Baptiste Queru
6c427617be Merge "support humidity sensor type" 2011-05-18 15:00:11 -07:00
Fabrice Di Meglio
41701ac5f6 Merge "Fix bug #4441002 Crash in SkPathEffectGlue::OneD_constructor" 2011-05-18 12:50:34 -07:00
Adam Powell
2e6b4ad76c resolved conflicts for merge of f61c3d07 to master 
Change-Id: Id38b4ff3ccc677b2d9e743186473b3559b00119b
 2011-05-18 10:33:20 -07:00
Ying Wang
65ee22aa01 Fix intermediate src dir for framework.jar 
Intermediate src dir for JAVA_LIBRARIES should be in the common
intermediate dir.

Change-Id: Ib16ddd63aed080cdd1494204b347c1e1e1beafcb
 2011-05-18 09:48:40 -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
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
Kazuhiro Ondo
b22a9fd9bb am 01758e81: Linkproperties update via unsol data call state change. 
* commit '01758e81b3ad89934581885bb2fc7006510ec639':
  Linkproperties update via unsol data call state change.
 2011-05-18 00:02:31 -07:00
Kazuhiro Ondo
01758e81b3 Linkproperties update via unsol data call state change. 
Handles the scenario of radio technology handover with IP continuity.
Once RIL/Modem finished a handover operation, an unsol data call state
change will be send up to FW notifying all link propertes changes.
FW will then re-configure the device with new link properties
including iptable used by Tethering.

Change-Id: I05e29f66ac3db8ba4274d3662642607742ba1d12
 2011-05-17 20:53:40 -07:00
Adam Powell
961f8bef18 am 98603eed: am 30a76196: Merge "Fix bug 4416126 - orientation change bug with action bar overflow menu" into honeycomb-mr2 
* commit '98603eed2ff95d1d0dcb7fc1ecf3c35f3b447f55':
  Fix bug 4416126 - orientation change bug with action bar overflow menu
 2011-05-17 20:28:06 -07:00
Adam Powell
98603eed2f am 30a76196: Merge "Fix bug 4416126 - orientation change bug with action bar overflow menu" into honeycomb-mr2 
* commit '30a76196c8f426b530a80166817d3280acb2b100':
  Fix bug 4416126 - orientation change bug with action bar overflow menu
 2011-05-17 20:25:58 -07:00
Adam Powell
5d6c990b7f Fix bug 4416126 - orientation change bug with action bar overflow menu 
Change-Id: I8e327bd41e610c792db4eed36ed46b58e94c0ea0
 2011-05-17 20:20:52 -07:00
Fabrice Di Meglio
78b868ff42 Fix bug #4441002 Crash in SkPathEffectGlue::OneD_constructor 
- take care of empty strings in TextLayoutCache when computing advances/glyphs with Harfbuzz

Change-Id: I8eb5f632feb7a86e5c4a6db03d073c4b7d859dbc
 2011-05-17 19:56:20 -07:00
Adam Powell
f61c3d077d am 16c69222: am 185d9c4d: Merge "Tweak padding and sizing of alert dialog elements to fit better in landscape mode on large screen devices. Integrate new dialog frame assets that take up less space." into honeycomb-mr2 
* commit '16c692229d6ed3d0df8682884b35252ea72c7c26':
  Tweak padding and sizing of alert dialog elements to fit better in landscape mode on large screen devices. Integrate new dialog frame assets that take up less space.
 2011-05-17 18:34:49 -07:00
Adam Powell
16c692229d am 185d9c4d: Merge "Tweak padding and sizing of alert dialog elements to fit better in landscape mode on large screen devices. Integrate new dialog frame assets that take up less space." into honeycomb-mr2 
* commit '185d9c4dbf4b0ee976e4d0c3ea9d3ba307491339':
  Tweak padding and sizing of alert dialog elements to fit better in landscape mode on large screen devices. Integrate new dialog frame assets that take up less space.
 2011-05-17 18:32:06 -07:00
Adam Powell
185d9c4dbf Merge "Tweak padding and sizing of alert dialog elements to fit better in landscape mode on large screen devices. Integrate new dialog frame assets that take up less space." into honeycomb-mr2 2011-05-17 18:30:08 -07:00
Adam Powell
bd964f9624 Tweak padding and sizing of alert dialog elements to fit better in 
landscape mode on large screen devices. Integrate new dialog frame
assets that take up less space.

Change-Id: Icd1261063511355844579d6c5c34f32284031f82
 2011-05-17 18:25:56 -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
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
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
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
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
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
Adam Powell
bd32a79ecb am f721b398: Merge "Prevent cases of bogus action bar measurement." into honeycomb-mr2 
* commit 'f721b398ad69503e1212e5fe8a44d176d25f135a':
  Prevent cases of bogus action bar measurement.
 2011-05-17 12:18:05 -07:00
Adam Powell
1b4a1628f3 Prevent cases of bogus action bar measurement. 
Change-Id: I92d3bc41aa82835e1aa23f208ab61e943266f186
 2011-05-17 12:14:17 -07:00
Eino-Ville Talvala
d9c2601afa Add auto-white balance locking to the Camera API. 
Adds a new camera parameter for locking auto-white balance to its
current value. Also adds a function for checking if auto-white balance
lock is supported by the current platform. Lock semantics match that
of the auto-exposure lock.

Hidden for now.

Change-Id: Id59339a4be84d55c1b0b8473d765b6aa765999b2
 2011-05-17 10:52:42 -07:00
Dianne Hackborn
0305e354e1 This API change is now part of MR2. 
Change-Id: I242e66fb9c46d48244942298361f408062fb05c4
 2011-05-17 10:49:53 -07:00
Adam Powell
f95e474796 am b45b21d1: am b4eb3ace: am 79411726: Merge "Turn fading edges back on for ScrollView and HorizontalScrollView." into honeycomb-mr2 
* commit 'b45b21d13e3311c819d5fbd548ff8c859cc1dfe3':
  Turn fading edges back on for ScrollView and HorizontalScrollView.
 2011-05-17 10:07:23 -07:00