OSDN Git Service
Jason Sams [Thu, 19 May 2011 19:27:22 +0000 (12:27 -0700)]
Merge "Move context and device creation out of the spec file."
James Dong [Thu, 19 May 2011 18:51:37 +0000 (11:51 -0700)]
Merge "Publish setLocation() method as a public Java API"
Wink Saville [Thu, 19 May 2011 18:32:27 +0000 (11:32 -0700)]
am
09ded82b: am
ab5baa1d: Merge "Reset connection while data state changed." into honeycomb-LTE
* commit '
09ded82b784b9f6e01d4cd4298097fd2b459560b':
Reset connection while data state changed.
Wink Saville [Thu, 19 May 2011 18:28:36 +0000 (11:28 -0700)]
am
ab5baa1d: Merge "Reset connection while data state changed." into honeycomb-LTE
* commit '
ab5baa1d5fbd433e4c391ea06d177aa6a6c1c736':
Reset connection while data state changed.
Wink Saville [Thu, 19 May 2011 18:25:45 +0000 (11:25 -0700)]
Merge "Reset connection while data state changed." into honeycomb-LTE
Gloria Wang [Thu, 19 May 2011 18:15:16 +0000 (11:15 -0700)]
Merge "Add one more MIME type (audio/aac-adts) for aac file. Fix for bug
4463059."
Joe Fernandez [Thu, 19 May 2011 18:13:41 +0000 (11:13 -0700)]
am
0a36cec6: am
605be31c: am
146a0b45: am
fde9ac72: Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1
* commit '
0a36cec642fb58e295d0608026890d95d0ae3cc0':
docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74
Joe Fernandez [Thu, 19 May 2011 18:06:04 +0000 (11:06 -0700)]
am
605be31c: am
146a0b45: am
fde9ac72: Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1
* commit '
605be31c4a80e03dc0af76a73aaa33316ca4a635':
docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74
Joe Fernandez [Thu, 19 May 2011 17:59:16 +0000 (10:59 -0700)]
am
146a0b45: am
fde9ac72: Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1
* commit '
146a0b4522db2d782953a464fe63adcd7e1569c2':
docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74
Joe Fernandez [Thu, 19 May 2011 17:53:04 +0000 (10:53 -0700)]
am
fde9ac72: Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1
* commit '
fde9ac72668ced2e473ad247cacc8a4bdd05996f':
docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74
Mike Lockwood [Thu, 19 May 2011 17:52:43 +0000 (10:52 -0700)]
Merge "resolved conflicts for merge of
c1730dcf to master"
Joe Fernandez [Thu, 19 May 2011 17:49:45 +0000 (10:49 -0700)]
Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1
Gloria Wang [Thu, 19 May 2011 17:43:03 +0000 (10:43 -0700)]
Add one more MIME type (audio/aac-adts) for aac file.
Fix for bug
4463059.
Change-Id: Ie2125349667e65b41871a228d87e4dce6b513398
Mike Lockwood [Thu, 19 May 2011 17:34:44 +0000 (13:34 -0400)]
resolved conflicts for merge of
c1730dcf to master
Change-Id: I9e0f9740930c7d3acb51235dd4c67cf2ed54a486
Cibu Johny [Mon, 22 Feb 2010 21:01:02 +0000 (13:01 -0800)]
View horizontalDirection public attribute resolution to an internal var.
- add more comment
Change-Id: I514c6ace3a98d56aa0b5c52221dee3045656071f
Mike Lockwood [Thu, 19 May 2011 17:06:44 +0000 (10:06 -0700)]
am
ae448e2c: am
a88b42d5: USB: Add method to access raw USB device descriptors
* commit '
ae448e2c90cae096efea53c1c93a70e7b5ca2db7':
USB: Add method to access raw USB device descriptors
Mike Lockwood [Thu, 19 May 2011 17:01:53 +0000 (10:01 -0700)]
am
a88b42d5: USB: Add method to access raw USB device descriptors
* commit '
a88b42d569a91290477d8f5731a2ee43931271da':
USB: Add method to access raw USB device descriptors
Mike Lockwood [Thu, 19 May 2011 15:52:40 +0000 (11:52 -0400)]
USB: Add method to access raw USB device descriptors
Change-Id: Id5b46ede14a838198a59bdc8ed4732942044cfa8
Signed-off-by: Mike Lockwood <lockwood@android.com>
Adam Powell [Thu, 19 May 2011 15:58:42 +0000 (08:58 -0700)]
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.
Xavier Ducrohet [Thu, 19 May 2011 15:58:18 +0000 (08:58 -0700)]
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.
James Dong [Thu, 19 May 2011 15:49:09 +0000 (08:49 -0700)]
resolved conflicts for merge of
a8939e0d to master
Change-Id: I090479ed09618e1aa3685ca79e16202d9c82f523
Jean-Baptiste Queru [Thu, 19 May 2011 14:54:53 +0000 (07:54 -0700)]
Merge
c41aefe1
Change-Id: I70fc4382f832d1a2bded8a5ee7d9b96fac77879b
Jean-Baptiste Queru [Thu, 19 May 2011 14:16:43 +0000 (07:16 -0700)]
Merge
111d17ce
Change-Id: I2e0aa4328bc78eb5bcd987e7bf74b0889d2fae7f
Dianne Hackborn [Thu, 19 May 2011 10:46:24 +0000 (03:46 -0700)]
am
ba8fc5b0: am
8416e5cf: am
6ad07db7: Merge "Fix fake display size when rotated." into honeycomb-mr2
* commit '
ba8fc5b059228402afa965e175d5f6655e3fe555':
Fix fake display size when rotated.
Jean-Baptiste Queru [Thu, 19 May 2011 10:44:45 +0000 (03:44 -0700)]
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.
Gloria Wang [Thu, 19 May 2011 10:44:31 +0000 (03:44 -0700)]
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:
Svetoslav Ganov [Thu, 19 May 2011 03:50:03 +0000 (20:50 -0700)]
Fixing my build fix
Change-Id: I8393e0172367de730123b2fa9d743b1ecb2eb087
Svetoslav Ganov [Thu, 19 May 2011 02:44:31 +0000 (19:44 -0700)]
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
Adam Powell [Thu, 19 May 2011 02:16:31 +0000 (19:16 -0700)]
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.
Adam Powell [Thu, 19 May 2011 02:14:44 +0000 (19:14 -0700)]
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.
Adam Powell [Thu, 19 May 2011 02:13:22 +0000 (19:13 -0700)]
Merge "DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets." into honeycomb-mr2
Adam Powell [Thu, 19 May 2011 02:10:46 +0000 (19:10 -0700)]
DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets.
Change-Id: I56a75189ae48f04934882661ce5014549a089769
Xavier Ducrohet [Thu, 19 May 2011 00:51:31 +0000 (17:51 -0700)]
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.
Jim Miller [Thu, 19 May 2011 00:49:32 +0000 (17:49 -0700)]
Merge "First pass at integrating new ScrollView-based recents panel. - added layout transitions - now calls removeTask() for selected activity."
Kazuhiro Ondo [Thu, 19 May 2011 00:48:37 +0000 (17:48 -0700)]
am
b22a9fd9: am
01758e81: Linkproperties update via unsol data call state change.
* commit '
b22a9fd9bb32133cbc7dc4fc7752dbf68e52dffe':
Linkproperties update via unsol data call state change.
Wink Saville [Thu, 19 May 2011 00:47:49 +0000 (17:47 -0700)]
am
e34a7686: am
258208a7: Merge "Remove SIM operator name hack" into honeycomb-LTE
* commit '
e34a7686a36bf0f48cd9d20090b4b8df1bf0d1ce':
Remove SIM operator name hack
Xavier Ducrohet [Thu, 19 May 2011 00:43:27 +0000 (17:43 -0700)]
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.
Jason Sams [Thu, 19 May 2011 00:36:02 +0000 (17:36 -0700)]
Move context and device creation out of the spec file.
Change-Id: I79470d4fb9317bcad9d68921ce0c414aa133f3cb
Xavier Ducrohet [Thu, 19 May 2011 00:40:08 +0000 (17:40 -0700)]
am
aa0834e3: Merge "LayoutLib: support the new baseline/margin query API." into honeycomb-mr1
* commit '
aa0834e3e6c3ceef6f78e3e03d1d27046e5237a0':
LayoutLib: support the new baseline/margin query API.
Xavier Ducrohet [Thu, 19 May 2011 00:36:16 +0000 (17:36 -0700)]
Merge "LayoutLib: support the new baseline/margin query API." into honeycomb-mr1
Adam Powell [Thu, 19 May 2011 00:32:16 +0000 (17:32 -0700)]
resolved conflicts for merge of
961f8bef to master
Change-Id: I9b437ddbebb10cf3ccf579b6b13e6c86bd73900c
Alex Sakhartchouk [Wed, 18 May 2011 23:39:05 +0000 (16:39 -0700)]
Merge "Preparing libRS for for compilation on host."
James Dong [Wed, 18 May 2011 23:33:20 +0000 (16:33 -0700)]
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
Robert Greenwalt [Wed, 18 May 2011 23:33:16 +0000 (16:33 -0700)]
am
59b1a4ed: Switch to use netd to add/remove routes.
* commit '
59b1a4ede7032c1b4d897e13dd4ede09b5e14743':
Switch to use netd to add/remove routes.
James Dong [Wed, 18 May 2011 23:09:58 +0000 (16:09 -0700)]
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
James Dong [Wed, 18 May 2011 23:06:14 +0000 (16:06 -0700)]
Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" into honeycomb-mr2
Jim Miller [Wed, 18 May 2011 03:06:29 +0000 (20:06 -0700)]
First pass at integrating new ScrollView-based recents panel.
- added layout transitions
- now calls removeTask() for selected activity.
Change-Id: Ie57b3d79551353a564bb2e4da26243a10bb0198d
Wink Saville [Wed, 18 May 2011 22:59:04 +0000 (15:59 -0700)]
Reset connection while data state changed.
Check data call states and reset connection if any link properties changed.
Change-Id: I008aea969378648192852161959fdf4aad6211a1
Jean-Baptiste Queru [Wed, 18 May 2011 22:33:27 +0000 (15:33 -0700)]
Merge
4b999030
Change-Id: Ibb94ba77ec8588f5e7636cf6a038b143e3dcb2bd
Robert Greenwalt [Tue, 10 May 2011 22:05:02 +0000 (15:05 -0700)]
Switch to use netd to add/remove routes.
Also adds support for v6 routes and for removing single routes.
Change-Id: I1c4f08c7938371090944d8d6f603e1e0d6d70c01
Jean-Baptiste Queru [Wed, 18 May 2011 22:20:29 +0000 (15:20 -0700)]
am
6c427617: Merge "support humidity sensor type"
* commit '
6c427617be940be32fdebbd9c78f9223b292c814':
support humidity sensor type
Dianne Hackborn [Wed, 18 May 2011 22:16:05 +0000 (15:16 -0700)]
am
8416e5cf: am
6ad07db7: Merge "Fix fake display size when rotated." into honeycomb-mr2
* commit '
8416e5cf0a8439a3f605629068d3639f2a35e08b':
Fix fake display size when rotated.
Dianne Hackborn [Wed, 18 May 2011 22:12:07 +0000 (15:12 -0700)]
am
6ad07db7: Merge "Fix fake display size when rotated." into honeycomb-mr2
* commit '
6ad07db7a2c289d036f081eb0c7a666cdb77b548':
Fix fake display size when rotated.
Dianne Hackborn [Wed, 18 May 2011 22:09:58 +0000 (15:09 -0700)]
Merge "Fix fake display size when rotated." into honeycomb-mr2
Dianne Hackborn [Wed, 18 May 2011 22:07:48 +0000 (15:07 -0700)]
Fix fake display size when rotated.
Change-Id: Ic8a1dbe32cf0cb3c5cdc9b9294b98e810558f875
Jean-Baptiste Queru [Wed, 18 May 2011 22:00:11 +0000 (15:00 -0700)]
Merge "support humidity sensor type"
Daniel Sandler [Wed, 18 May 2011 21:44:16 +0000 (14:44 -0700)]
Merge "Turn off navbar for now."
Mathias Agopian [Wed, 18 May 2011 21:43:53 +0000 (14:43 -0700)]
Merge "Disable error report temporarily to enable inline video"
Daniel Sandler [Wed, 18 May 2011 21:42:29 +0000 (17:42 -0400)]
Turn off navbar for now.
Change-Id: I7b80312e172ccbf4b6ce30a35367fa14418368fb
Teng-Hui Zhu [Wed, 18 May 2011 17:38:40 +0000 (10:38 -0700)]
Disable error report temporarily to enable inline video
bug:
4435022
Change-Id: I06f05a4781ad432ab71db93f0815eb89cd2e7a69
Guang Zhu [Wed, 18 May 2011 21:21:29 +0000 (14:21 -0700)]
Merge "call clearCache from UI thread"
Fabrice Di Meglio [Wed, 18 May 2011 19:50:34 +0000 (12:50 -0700)]
Merge "Fix bug #
4441002 Crash in SkPathEffectGlue::OneD_constructor"
Dianne Hackborn [Wed, 18 May 2011 17:36:14 +0000 (10:36 -0700)]
am
4f9bb17f: am
c2db2144: am
a429d5df: Merge "Improve compat mode scaling implementation." into honeycomb-mr2
* commit '
4f9bb17f7e74746c4296100f2fbd47f0f6ead3a7':
Improve compat mode scaling implementation.
Adam Powell [Wed, 18 May 2011 17:33:20 +0000 (10:33 -0700)]
resolved conflicts for merge of
f61c3d07 to master
Change-Id: Id38b4ff3ccc677b2d9e743186473b3559b00119b
Katie McCormick [Wed, 18 May 2011 17:25:02 +0000 (10:25 -0700)]
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
Guang Zhu [Wed, 18 May 2011 17:02:22 +0000 (10:02 -0700)]
call clearCache from UI thread
according to the warning message, WebView#clearCache now should be
invoked from UI thread only
Change-Id: I089d9dcdcccc353b802a628c539e62f001d361f8
Jean-Baptiste Queru [Wed, 18 May 2011 16:52:18 +0000 (09:52 -0700)]
am
a38762f3: am
7ae7d31c: Merge "MOTOYA changed two kinds of Japanese font files."
* commit '
a38762f340853cca5a07732c21e9fb816fd252b8':
MOTOYA changed two kinds of Japanese font files.
Jean-Baptiste Queru [Wed, 18 May 2011 16:46:16 +0000 (09:46 -0700)]
am
7ae7d31c: Merge "MOTOYA changed two kinds of Japanese font files."
* commit '
7ae7d31c2fb06a5c53e71c9e77fa75c8f5777391':
MOTOYA changed two kinds of Japanese font files.
James Dong [Wed, 18 May 2011 00:42:49 +0000 (17:42 -0700)]
Publish setLocation() method as a public Java API
related-to-bug:
4260295
Change-Id: I91b923af8549127eb08f0d7e535cd53ad229e1f6
Andreas Huber [Wed, 18 May 2011 16:40:52 +0000 (09:40 -0700)]
Merge "Properly forward rotation information from input format to output format."
Andreas Huber [Wed, 18 May 2011 16:31:22 +0000 (09:31 -0700)]
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
Gloria Wang [Wed, 18 May 2011 16:30:01 +0000 (09:30 -0700)]
am
5a6c3d49: am
07e9267d: Merge "DO NOT MERGE For bug
4422428 Squashed commit of the following:" into honeycomb-mr2
* commit '
5a6c3d491ccac07ef3f6a624a8a3e0c36959b661':
DO NOT MERGE For bug
4422428 Squashed commit of the following:
Jean-Baptiste Queru [Wed, 18 May 2011 16:24:40 +0000 (09:24 -0700)]
Merge "MOTOYA changed two kinds of Japanese font files."
Mike Lockwood [Wed, 18 May 2011 16:23:35 +0000 (09:23 -0700)]
am
53b988ba: am
5a79cfd7: am
27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" into honeycomb-mr2
* commit '
53b988ba1842f40e595bb85f2ca055c24787e6dc':
StorageVolume: Add getStorageId() accessor
John Reck [Wed, 18 May 2011 16:23:22 +0000 (09:23 -0700)]
am
c54d3a98: am
1818b4a9: am
1147bf63: Don\'t use mobile for large uastring
* commit '
c54d3a987235c615715e45f5a22ba75e6fae22b3':
Don't use mobile for large uastring
Eric Fischer [Wed, 18 May 2011 16:21:13 +0000 (09:21 -0700)]
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
Gloria Wang [Wed, 18 May 2011 16:19:56 +0000 (09:19 -0700)]
am
07e9267d: Merge "DO NOT MERGE For bug
4422428 Squashed commit of the following:" into honeycomb-mr2
* commit '
07e9267d33bb199d0a2b8de221c64541bdf2465a':
DO NOT MERGE For bug
4422428 Squashed commit of the following:
Gloria Wang [Wed, 18 May 2011 16:17:50 +0000 (09:17 -0700)]
Merge "DO NOT MERGE For bug
4422428 Squashed commit of the following:" into honeycomb-mr2
Eino-Ville Talvala [Wed, 18 May 2011 15:54:40 +0000 (08:54 -0700)]
Merge "Add auto-white balance locking to the Camera API."
Mike Lockwood [Wed, 18 May 2011 13:25:49 +0000 (09:25 -0400)]
resolved conflicts for merge of
22c140b7 to master
Change-Id: I1d57d76519d7a8d8ea7c5be4f49ef885f1ffb302
Kazuhiro Ondo [Wed, 18 May 2011 07:02:31 +0000 (00:02 -0700)]
am
01758e81: Linkproperties update via unsol data call state change.
* commit '
01758e81b3ad89934581885bb2fc7006510ec639':
Linkproperties update via unsol data call state change.
Wink Saville [Wed, 18 May 2011 06:32:01 +0000 (23:32 -0700)]
Merge "dumpstate: don't attempt to use vril-dump, it breaks adb bugreport"
James Dong [Wed, 18 May 2011 05:39:06 +0000 (22:39 -0700)]
Revert "Add const to the finders method in MetaData.cpp"
This reverts commit
78fed171d9d62b25aa846d7373a7040e3fd2241e.
Conflicts:
include/media/stagefright/MPEG4Writer.h
Change-Id: Ie6f497f67a473ad95b50bb949c1aa49e1804bac3
JP Abgrall [Wed, 18 May 2011 04:35:54 +0000 (21:35 -0700)]
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>
Kazuhiro Ondo [Sun, 1 May 2011 01:10:57 +0000 (20:10 -0500)]
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
Wink Saville [Wed, 18 May 2011 03:38:05 +0000 (20:38 -0700)]
am
258208a7: Merge "Remove SIM operator name hack" into honeycomb-LTE
* commit '
258208a78ca90a7d3a45a2f15af4bbb21a266f47':
Remove SIM operator name hack
Wink Saville [Wed, 18 May 2011 03:35:35 +0000 (20:35 -0700)]
Merge "Remove SIM operator name hack" into honeycomb-LTE
Adam Powell [Wed, 18 May 2011 03:28:06 +0000 (20:28 -0700)]
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
Adam Powell [Wed, 18 May 2011 03:25:58 +0000 (20:25 -0700)]
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
Adam Powell [Wed, 18 May 2011 03:24:39 +0000 (20:24 -0700)]
Merge "Fix bug
4416126 - orientation change bug with action bar overflow menu" into honeycomb-mr2
Adam Powell [Wed, 18 May 2011 03:20:47 +0000 (20:20 -0700)]
Fix bug
4416126 - orientation change bug with action bar overflow menu
Change-Id: I8e327bd41e610c792db4eed36ed46b58e94c0ea0
Fabrice Di Meglio [Wed, 18 May 2011 02:48:57 +0000 (19:48 -0700)]
Fix bug #
4441002 Crash in SkPathEffectGlue::OneD_constructor
- take care of empty strings in TextLayoutCache when computing advances/glyphs with Harfbuzz
Change-Id: I8eb5f632feb7a86e5c4a6db03d073c4b7d859dbc
Dianne Hackborn [Wed, 18 May 2011 01:42:23 +0000 (18:42 -0700)]
am
c2db2144: am
a429d5df: Merge "Improve compat mode scaling implementation." into honeycomb-mr2
* commit '
c2db21445ddd4327e949b38edcf1ab9fd18f94f0':
Improve compat mode scaling implementation.
Dianne Hackborn [Wed, 18 May 2011 01:40:12 +0000 (18:40 -0700)]
am
a429d5df: Merge "Improve compat mode scaling implementation." into honeycomb-mr2
* commit '
a429d5df1aa59d817d694b96a07351224cc5d146':
Improve compat mode scaling implementation.
Dianne Hackborn [Wed, 18 May 2011 01:38:37 +0000 (18:38 -0700)]
Merge "Improve compat mode scaling implementation." into honeycomb-mr2
Adam Powell [Wed, 18 May 2011 01:34:49 +0000 (18:34 -0700)]
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.
Adam Powell [Wed, 18 May 2011 01:32:06 +0000 (18:32 -0700)]
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.
Adam Powell [Wed, 18 May 2011 01:30:08 +0000 (18:30 -0700)]
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
Dianne Hackborn [Wed, 18 May 2011 00:44:51 +0000 (17:44 -0700)]
Improve compat mode scaling implementation.
Rip out the old funky code for trying to restrict the app window
sizes to be within the compat mode range. Instead, we know rely
entirely on scaling -- we deal with windows always with the scaling
applied so that the window manager doesn't have to deal with them
specially. Instead, we just apply the inverse scale at the few
points we need to do something the app sees.
Change-Id: I785409dd4513b5f738684e1635dc8f770c249651
Adam Powell [Tue, 17 May 2011 03:32:16 +0000 (20:32 -0700)]
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
OSDN Git Service
