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

50587 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Lockwood
90f902afde resolved conflicts for merge of c1730dcf to master 
Change-Id: I9e0f9740930c7d3acb51235dd4c67cf2ed54a486
 2011-05-19 13:34:44 -04: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
Adam Powell
191c1fbb74 am c8f045b8: (-s ours) am d466a463: am b7ec3e41: Merge "DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets." into honeycomb-mr2 
* commit 'c8f045b8a4cc83bc40ee999cb03a446f986d445c':
  DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets.
 2011-05-19 08:58:42 -07:00
Xavier Ducrohet
9f23e60b20 am a13462a9: am 582841e7: am b18e700c: am aa0834e3: Merge "LayoutLib: support the new baseline/margin query API." into honeycomb-mr1 
* commit 'a13462a947e634a6893119146a7271369e509586':
  LayoutLib: support the new baseline/margin query API.
 2011-05-19 08:58:18 -07:00
James Dong
ba43d4282c resolved conflicts for merge of a8939e0d to master 
Change-Id: I090479ed09618e1aa3685ca79e16202d9c82f523
 2011-05-19 08:49:09 -07: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
Dianne Hackborn
d37b84edf5 am ba8fc5b0: am 8416e5cf: am 6ad07db7: Merge "Fix fake display size when rotated." into honeycomb-mr2 
* commit 'ba8fc5b059228402afa965e175d5f6655e3fe555':
  Fix fake display size when rotated.
 2011-05-19 03:46:24 -07:00
Jean-Baptiste Queru
f74782f6a1 am a49b2dbd: am a38762f3: am 7ae7d31c: Merge "MOTOYA changed two kinds of Japanese font files." 
* commit 'a49b2dbdde52e20b6d590b35e209033229f5d82d':
  MOTOYA changed two kinds of Japanese font files.
 2011-05-19 03:44:45 -07:00
Gloria Wang
4809d48f6f am 8d161fe1: (-s ours) am 5a6c3d49: am 07e9267d: Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into honeycomb-mr2 
* commit '8d161fe1eafe80e01d84d2be55ae47314f944721':
  DO NOT MERGE For bug 4422428 Squashed commit of the following:
 2011-05-19 03:44:31 -07:00
Svetoslav Ganov
d36a699410 Fixing my build fix 
Change-Id: I8393e0172367de730123b2fa9d743b1ecb2eb087
 2011-05-18 20:50:03 -07:00
Svetoslav Ganov
5459781b83 Fixing the build 
1. Updated the 14.txt with the new methods in Accessibility record
   since I made a mistake duing that. I had to do this because
   I have factored out some stuff from AccessibilityEvent to
   AccessibilityRecord and the API check does not detect that the
   APIs have not changed.

Change-Id: Ieed504634e0af909eada16f58f922cb78cb841ba
 2011-05-18 20:09:24 -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
b7ec3e41a6 Merge "DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets." into honeycomb-mr2 2011-05-18 19:13:22 -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
Xavier Ducrohet
a13462a947 am 582841e7: am b18e700c: am aa0834e3: Merge "LayoutLib: support the new baseline/margin query API." into honeycomb-mr1 
* commit '582841e734bc85b247df64ac85b6ee09f7375f44':
  LayoutLib: support the new baseline/margin query API.
 2011-05-18 17:51:31 -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
Wink Saville
bf7e83689b am e34a7686: am 258208a7: Merge "Remove SIM operator name hack" into honeycomb-LTE 
* commit 'e34a7686a36bf0f48cd9d20090b4b8df1bf0d1ce':
  Remove SIM operator name hack
 2011-05-18 17:47:49 -07:00
Xavier Ducrohet
582841e734 am b18e700c: am aa0834e3: Merge "LayoutLib: support the new baseline/margin query API." into honeycomb-mr1 
* commit 'b18e700cb9c1d7090904449fc6878b8eae1d4693':
  LayoutLib: support the new baseline/margin query API.
 2011-05-18 17:43:27 -07:00
Xavier Ducrohet
b18e700cb9 am aa0834e3: Merge "LayoutLib: support the new baseline/margin query API." into honeycomb-mr1 
* commit 'aa0834e3e6c3ceef6f78e3e03d1d27046e5237a0':
  LayoutLib: support the new baseline/margin query API.
 2011-05-18 17:40:08 -07:00
Xavier Ducrohet
aa0834e3e6 Merge "LayoutLib: support the new baseline/margin query API." into honeycomb-mr1 2011-05-18 17:36:16 -07:00
Adam Powell
b77c4e9c83 resolved conflicts for merge of 961f8bef to master 
Change-Id: I9b437ddbebb10cf3ccf579b6b13e6c86bd73900c
 2011-05-18 17:32:16 -07:00
Alex Sakhartchouk
60108e629c Merge "Preparing libRS for for compilation on host." 2011-05-18 16:39:05 -07:00
James Dong
a8939e0d48 am 380244e9: am d148a499: Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" into honeycomb-mr2 
* commit '380244e9d6c8016bc1a04691a3af0fd999ddf6b0':
  Using widevine:// to stream adaptive bitrate wvm content no longer
 2011-05-18 16:33:20 -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
James Dong
380244e9d6 am d148a499: Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" into honeycomb-mr2 
* commit 'd148a499c27145e0473f89ece0500ebed38f875f':
  Using widevine:// to stream adaptive bitrate wvm content no longer
 2011-05-18 16:09:58 -07:00
James Dong
d148a499c2 Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" into honeycomb-mr2 2011-05-18 16:06:14 -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
Dianne Hackborn
ba8fc5b059 am 8416e5cf: am 6ad07db7: Merge "Fix fake display size when rotated." into honeycomb-mr2 
* commit '8416e5cf0a8439a3f605629068d3639f2a35e08b':
  Fix fake display size when rotated.
 2011-05-18 15:16:05 -07:00
Dianne Hackborn
8416e5cf0a am 6ad07db7: Merge "Fix fake display size when rotated." into honeycomb-mr2 
* commit '6ad07db7a2c289d036f081eb0c7a666cdb77b548':
  Fix fake display size when rotated.
 2011-05-18 15:12:07 -07:00
Dianne Hackborn
6ad07db7a2 Merge "Fix fake display size when rotated." into honeycomb-mr2 2011-05-18 15:09:58 -07:00
Dianne Hackborn
8f7c271ac9 Fix fake display size when rotated. 
Change-Id: Ic8a1dbe32cf0cb3c5cdc9b9294b98e810558f875
 2011-05-18 15:07:48 -07:00
Jean-Baptiste Queru
6c427617be Merge "support humidity sensor type" 2011-05-18 15:00:11 -07:00
Daniel Sandler
cb3cf992ae Merge "Turn off navbar for now." 2011-05-18 14:44:16 -07:00
Mathias Agopian
4235e03417 Merge "Disable error report temporarily to enable inline video" 2011-05-18 14:43:53 -07:00
Daniel Sandler
4653a02105 Turn off navbar for now. 
Change-Id: I7b80312e172ccbf4b6ce30a35367fa14418368fb
 2011-05-18 17:42:29 -04:00
Teng-Hui Zhu
bca2d5b3df Disable error report temporarily to enable inline video 
bug:4435022

Change-Id: I06f05a4781ad432ab71db93f0815eb89cd2e7a69
 2011-05-18 14:37:51 -07:00
Guang Zhu
2b57689d8b Merge "call clearCache from UI thread" 2011-05-18 14:21:29 -07:00
Fabrice Di Meglio
41701ac5f6 Merge "Fix bug #4441002 Crash in SkPathEffectGlue::OneD_constructor" 2011-05-18 12:50:34 -07:00
Dianne Hackborn
fb03c4fafe am 4f9bb17f: am c2db2144: am a429d5df: Merge "Improve compat mode scaling implementation." into honeycomb-mr2 
* commit '4f9bb17f7e74746c4296100f2fbd47f0f6ead3a7':
  Improve compat mode scaling implementation.
 2011-05-18 10:36:14 -07:00
Adam Powell
2e6b4ad76c resolved conflicts for merge of f61c3d07 to master 
Change-Id: Id38b4ff3ccc677b2d9e743186473b3559b00119b
 2011-05-18 10:33:20 -07:00
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
Guang Zhu
c1635bf14e call clearCache from UI thread 
according to the warning message, WebView#clearCache now should be
invoked from UI thread only

Change-Id: I089d9dcdcccc353b802a628c539e62f001d361f8
 2011-05-18 10:14:44 -07:00