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

21876 Commits

Author SHA1 Message Date
Mike Lockwood
44bcfcae3b Merge "resolved conflicts for merge of c1730dcf to master" 2011-05-19 10:52:43 -07:00
Mike Lockwood
90f902afde resolved conflicts for merge of c1730dcf to master 
Change-Id: I9e0f9740930c7d3acb51235dd4c67cf2ed54a486
 2011-05-19 13:34:44 -04:00
Cibu Johny
1714c21c15 View horizontalDirection public attribute resolution to an internal var. 
- add more comment

Change-Id: I514c6ace3a98d56aa0b5c52221dee3045656071f
 2011-05-19 10:18:16 -07:00
Mike Lockwood
c1730dcf89 am ae448e2c: am a88b42d5: USB: Add method to access raw USB device descriptors 
* commit 'ae448e2c90cae096efea53c1c93a70e7b5ca2db7':
  USB: Add method to access raw USB device descriptors
 2011-05-19 10:06:44 -07:00
Mike Lockwood
ae448e2c90 am a88b42d5: USB: Add method to access raw USB device descriptors 
* commit 'a88b42d569a91290477d8f5731a2ee43931271da':
  USB: Add method to access raw USB device descriptors
 2011-05-19 10:01:53 -07:00
Mike Lockwood
a88b42d569 USB: Add method to access raw USB device descriptors 
Change-Id: Id5b46ede14a838198a59bdc8ed4732942044cfa8
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-05-19 12:57:41 -04:00
Jean-Baptiste Queru
5c3816f2ff Merge c41aefe1 
Change-Id: I70fc4382f832d1a2bded8a5ee7d9b96fac77879b
 2011-05-19 07:54:53 -07:00
Jean-Baptiste Queru
c6b7a0131e Merge 111d17ce 
Change-Id: I2e0aa4328bc78eb5bcd987e7bf74b0889d2fae7f
 2011-05-19 07:17:00 -07:00
Svetoslav Ganov
d36a699410 Fixing my build fix 
Change-Id: I8393e0172367de730123b2fa9d743b1ecb2eb087
 2011-05-18 20:50:03 -07:00
Adam Powell
c8f045b8a4 am d466a463: am b7ec3e41: Merge "DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets." into honeycomb-mr2 
* commit 'd466a4631f3e4f482dd658f42c277d6ad281a9d1':
  DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets.
 2011-05-18 19:16:31 -07:00
Adam Powell
d466a4631f am b7ec3e41: Merge "DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets." into honeycomb-mr2 
* commit 'b7ec3e41a6b3423d1669ae784a8ad8fbe32df29d':
  DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets.
 2011-05-18 19:14:44 -07:00
Adam Powell
67a0a6ab09 DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets. 
Change-Id: I56a75189ae48f04934882661ce5014549a089769
 2011-05-18 19:10:46 -07:00
Jim Miller
7a1eb5cf96 Merge "First pass at integrating new ScrollView-based recents panel. - added layout transitions - now calls removeTask() for selected activity." 2011-05-18 17:49:32 -07:00
Kazuhiro Ondo
8904c3d814 am b22a9fd9: am 01758e81: Linkproperties update via unsol data call state change. 
* commit 'b22a9fd9bb32133cbc7dc4fc7752dbf68e52dffe':
  Linkproperties update via unsol data call state change.
 2011-05-18 17:48:37 -07:00
Robert Greenwalt
c41aefe1d4 am 59b1a4ed: Switch to use netd to add/remove routes. 
* commit '59b1a4ede7032c1b4d897e13dd4ede09b5e14743':
  Switch to use netd to add/remove routes.
 2011-05-18 16:33:16 -07:00
Jim Miller
9f0f0e0e31 First pass at integrating new ScrollView-based recents panel. 
- added layout transitions
- now calls removeTask() for selected activity.

Change-Id: Ie57b3d79551353a564bb2e4da26243a10bb0198d
 2011-05-18 16:03:31 -07:00
Jean-Baptiste Queru
111d17ce51 Merge 4b999030 
Change-Id: Ibb94ba77ec8588f5e7636cf6a038b143e3dcb2bd
 2011-05-18 15:33:27 -07:00
Robert Greenwalt
59b1a4ede7 Switch to use netd to add/remove routes. 
Also adds support for v6 routes and for removing single routes.

Change-Id: I1c4f08c7938371090944d8d6f603e1e0d6d70c01
 2011-05-18 15:25:43 -07:00
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
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