OSDN Git Service
Kazuhiro Ondo [Fri, 3 Jun 2011 02:41:16 +0000 (21:41 -0500)]
Data recovery failure due to apn/dc state stuck in "disconnecting"
If rild is reset while RIL_DEACTIVATE_DATA_CALL is pending
response, the ApnContext is not force cleaned up since
link to DCAC is cleared in the begining of release.
This patch fixes:
1) Hold DCAC reference until the DC is disconnected. This is
to ensure DC won't be stuck in DcDisconnectingState so force
reset can kick in.
2) In "clearCleanUpConnection", make sure the status of ApnContext
can be reset to IDLE even if no reference to DCAC.
Change-Id: Ic69271da7c6bc9dcb2c38ec53a9bd2e8ce785adc
Daniel Sandler [Fri, 3 Jun 2011 18:22:49 +0000 (11:22 -0700)]
am
b4b44bd3: DO NOT MERGE. Restore status bar on phones.
* commit '
b4b44bd32983e154f2ad61b99809ed6cedd46d47':
DO NOT MERGE. Restore status bar on phones.
Daniel Sandler [Fri, 3 Jun 2011 05:25:43 +0000 (01:25 -0400)]
DO NOT MERGE. Restore status bar on phones.
Bug:
4529373
Change-Id: Ie08522dbf762e80ac077ce403ff83312cec907f7
Gilles Debunne [Fri, 3 Jun 2011 17:32:00 +0000 (10:32 -0700)]
am
0538e621: Merge "Tap timeout removed on paste. Relying on position only." into honeycomb-mr2
* commit '
0538e6217de35e418c9779fd48c8300e65cc4f1e':
Tap timeout removed on paste. Relying on position only.
Andy Stadler [Fri, 3 Jun 2011 17:28:45 +0000 (10:28 -0700)]
am
3148557c: Merge "DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()" into honeycomb-mr2
* commit '
3148557c42aaa8abf4001dc6fd759e911ba55280':
DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()
Gilles Debunne [Fri, 3 Jun 2011 17:26:18 +0000 (10:26 -0700)]
Merge "Tap timeout removed on paste. Relying on position only." into honeycomb-mr2
Andy Stadler [Fri, 3 Jun 2011 17:24:27 +0000 (10:24 -0700)]
Merge "DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()" into honeycomb-mr2
Wink Saville [Fri, 3 Jun 2011 17:16:11 +0000 (10:16 -0700)]
Merge "Refactor ServiceStateTracker handling of radio technology." into honeycomb-LTE
Wink Saville [Fri, 3 Jun 2011 16:06:28 +0000 (09:06 -0700)]
Refactor ServiceStateTracker handling of radio technology.
Also add a little more debugging.
Change-Id: I832872c876b290a3e83a79068059a21894472a1d
satok [Fri, 3 Jun 2011 06:22:35 +0000 (23:22 -0700)]
am
be96408b: (Do not merge) Backport a fix for InputMethodManager.java
* commit '
be96408b801666bf196adb0eabff4839e51e63ed':
(Do not merge) Backport a fix for InputMethodManager.java
satok [Fri, 3 Jun 2011 05:45:50 +0000 (14:45 +0900)]
(Do not merge) Backport a fix for InputMethodManager.java
Bug:
4517456
Original CL: Icec380f3ca05cf798cc4b82155d0cecf178633a5
Change-Id: I579fb1ee1b53d312f7cfc5c689d4500cb875352e
Dianne Hackborn [Fri, 3 Jun 2011 02:30:34 +0000 (19:30 -0700)]
am
b46ed763: Add new Fragment API for explicitly saving/restoring state.
* commit '
b46ed7636be9341b6ce0b158b3d86f34a437e6da':
Add new Fragment API for explicitly saving/restoring state.
Dianne Hackborn [Fri, 3 Jun 2011 01:33:15 +0000 (18:33 -0700)]
Add new Fragment API for explicitly saving/restoring state.
Also fix issue #
4519821:
Blank screen displayed on tapping "Battery Use" option in the settings
We weren't correctly doing the full Activity resume code when coming
back from delivering a new Intent or result.
And fix a fragment problem where we still weren't correctly restoring
the state of list views. (I think this was from a bad manual-merge
from master.)
Change-Id: If79dc7e998155c39ab8c04781f6c73a82238a9ef
Wink Saville [Fri, 3 Jun 2011 01:21:50 +0000 (18:21 -0700)]
Merge "CdmaLte: Use SPN from SIM card if SIM card is presend" into honeycomb-LTE
Wink Saville [Fri, 3 Jun 2011 01:21:37 +0000 (18:21 -0700)]
Merge "Read CSIM records in LTE on CDMA mode" into honeycomb-LTE
Jeff Brown [Fri, 3 Jun 2011 00:28:07 +0000 (17:28 -0700)]
am
e1718de6: Merge "Add a preference panel for mouse speed." into honeycomb-mr2
* commit '
e1718de61c20c8d401633f83589f18d2c0c652db':
Add a preference panel for mouse speed.
Jeff Brown [Fri, 3 Jun 2011 00:27:48 +0000 (17:27 -0700)]
am
10c3f367: Merge "Implement pointer acceleration." into honeycomb-mr2
* commit '
10c3f367a3eb66081c06f1d75107d26e64ce248f':
Implement pointer acceleration.
Jeff Brown [Fri, 3 Jun 2011 00:26:05 +0000 (17:26 -0700)]
Merge "Add a preference panel for mouse speed." into honeycomb-mr2
Jeff Brown [Fri, 3 Jun 2011 00:25:59 +0000 (17:25 -0700)]
Merge "Implement pointer acceleration." into honeycomb-mr2
Gilles Debunne [Thu, 2 Jun 2011 23:55:15 +0000 (16:55 -0700)]
Tap timeout removed on paste. Relying on position only.
Change-Id: I2e2b4a68f17957a2631a545badd602e4d127cfc3
Andy Stadler [Thu, 2 Jun 2011 23:37:39 +0000 (16:37 -0700)]
DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()
Due to a copy/paste typo, getStorageEncryption() was protected by
getActiveAdminForCallerLocked(), which made the API unreadable if the
caller is not an admin. This doesn't match the rest of the DPM API which
allows the "get" calls to be made anonymously.
This fix supercedes the proposed workaround CL in the DPM ApiDemo sample.
Backport of: If1a6237634e97ced09a7c6a8876bb6b0f60c9be9
Change-Id: I728b2d85878b7c73a063c906529f0d973e166b49
Jeff Brown [Thu, 2 Jun 2011 08:26:32 +0000 (01:26 -0700)]
Add a preference panel for mouse speed.
Bug:
4124987
Change-Id: I3ce175d268a1d043cf5878481261b1049a15a149
Jeff Brown [Wed, 1 Jun 2011 19:33:19 +0000 (12:33 -0700)]
Implement pointer acceleration.
Bug:
4124987
Change-Id: I1f31a28f1594c55302ccabe13fe3ca6d2ff71d50
Kazuhiro Ondo [Tue, 24 May 2011 05:08:09 +0000 (00:08 -0500)]
Read CSIM records in LTE on CDMA mode
In case of CDMA and LTE hybrid system, UICC card contains
both USIM and CSIM data. FW needs to read out from both
to aqcuire information required for the service.
Change-Id: I4a714252bc97c037fa419352f23d8f38f6206406
Kazuhiro Ondo [Thu, 2 Jun 2011 05:19:49 +0000 (00:19 -0500)]
CdmaLte: Use SPN from SIM card if SIM card is presend
Change-Id: Ib766216ed5ec2522942e87d548d0af27c0553cec
Scott Main [Thu, 2 Jun 2011 17:01:53 +0000 (10:01 -0700)]
am
a8629089: Merge "cherrypick Change-Id: I7a3612a1bc22cf53d382f787fa43fe222978d35e docs: add \'animator\' resource info" into honeycomb-mr2
* commit '
a86290891a661ecdc8115fd441b44dcebedb9e3d':
cherrypick Change-Id: I7a3612a1bc22cf53d382f787fa43fe222978d35e docs: add 'animator' resource info
Scott Main [Thu, 2 Jun 2011 17:01:51 +0000 (10:01 -0700)]
am
b8236751: Merge "cherry pick Change-Id: Id082021be2c27476f106285d0dd68d9e0f5bb514 docs: release notes for adt 11" into honeycomb-mr2
* commit '
b82367512177999e240bb35ededcae20dd1e14ee':
cherry pick Change-Id: Id082021be2c27476f106285d0dd68d9e0f5bb514 docs: release notes for adt 11
Scott Main [Thu, 2 Jun 2011 17:01:42 +0000 (10:01 -0700)]
am
0d5ed597: Merge "Cherry pick Change-Id: Ie9d68854926544749dde4edfeac9be2ece38560b docs: fix broken links" into honeycomb-mr2
* commit '
0d5ed597b7b2a91d6a97d188df37caef039242af':
Cherry pick Change-Id: Ie9d68854926544749dde4edfeac9be2ece38560b docs: fix broken links
Scott Main [Thu, 2 Jun 2011 16:52:09 +0000 (09:52 -0700)]
Merge "cherrypick Change-Id: I7a3612a1bc22cf53d382f787fa43fe222978d35e docs: add 'animator' resource info" into honeycomb-mr2
Scott Main [Wed, 18 May 2011 00:00:58 +0000 (17:00 -0700)]
cherrypick Change-Id: I7a3612a1bc22cf53d382f787fa43fe222978d35e
docs: add 'animator' resource info
Change-Id: Ifbd130e5bf762d89300c20db0d86d7f695b4ff4b
Scott Main [Thu, 2 Jun 2011 16:49:43 +0000 (09:49 -0700)]
Merge "cherry pick Change-Id: Id082021be2c27476f106285d0dd68d9e0f5bb514 docs: release notes for adt 11" into honeycomb-mr2
Scott Main [Thu, 26 May 2011 21:12:54 +0000 (14:12 -0700)]
cherry pick Change-Id: Id082021be2c27476f106285d0dd68d9e0f5bb514
docs: release notes for adt 11
Change-Id: I9041a5e34fcf34e8a08b3e9becc8c149f773a250
Scott Main [Thu, 2 Jun 2011 16:47:31 +0000 (09:47 -0700)]
Merge "Cherry pick Change-Id: Ie9d68854926544749dde4edfeac9be2ece38560b docs: fix broken links" into honeycomb-mr2
Scott Main [Thu, 2 Jun 2011 16:43:05 +0000 (09:43 -0700)]
Cherry pick Change-Id: Ie9d68854926544749dde4edfeac9be2ece38560b
docs: fix broken links
Change-Id: Ibc71e21b6024a8bed0fc07dba5e0a9c6c5d7f8c0
Dianne Hackborn [Thu, 2 Jun 2011 05:31:26 +0000 (22:31 -0700)]
am
2969b511: Merge "Add new supports-screen API to set maximum allowed size." into honeycomb-mr2
* commit '
2969b51132b80c873663aa2472b21d3e95845927':
Add new supports-screen API to set maximum allowed size.
Dianne Hackborn [Thu, 2 Jun 2011 05:28:56 +0000 (22:28 -0700)]
Merge "Add new supports-screen API to set maximum allowed size." into honeycomb-mr2
Dianne Hackborn [Thu, 2 Jun 2011 04:27:05 +0000 (21:27 -0700)]
Add new supports-screen API to set maximum allowed size.
Change-Id: I0a7cd4ba73a4c18558e6daee28963d5fd12c7978
Scott Main [Thu, 2 Jun 2011 01:29:54 +0000 (18:29 -0700)]
am
f58e6c98: Merge "doc typo" into honeycomb-mr2
* commit '
f58e6c982267e6e027b8a286ebe2a2e349348ee7':
doc typo
Dianne Hackborn [Thu, 2 Jun 2011 01:29:50 +0000 (18:29 -0700)]
am
e6676351: Work around OpenFeint bug.
* commit '
e66763516a9c27c192adaba417616371a1c3c9bf':
Work around OpenFeint bug.
Scott Main [Thu, 2 Jun 2011 01:19:12 +0000 (18:19 -0700)]
Merge "doc typo" into honeycomb-mr2
Dianne Hackborn [Wed, 1 Jun 2011 23:51:20 +0000 (16:51 -0700)]
Work around OpenFeint bug.
Change-Id: Ib8320e50bb63fc56dc0118d5c8e9e328dbd3fcb1
Scott Main [Wed, 1 Jun 2011 23:28:19 +0000 (16:28 -0700)]
doc typo
Change-Id: Iab3246e12059582096594eb795f2eb42da46f667
Adam Powell [Wed, 1 Jun 2011 19:49:47 +0000 (12:49 -0700)]
am
fa8ee177: Merge "Framework: bugfix for menu selector not showing up properly." into honeycomb-mr2
* commit '
fa8ee17702a79a2597670374679a0b1952f4630f':
Framework: bugfix for menu selector not showing up properly.
Adam Powell [Wed, 1 Jun 2011 19:48:03 +0000 (12:48 -0700)]
Merge "Framework: bugfix for menu selector not showing up properly." into honeycomb-mr2
Dianne Hackborn [Wed, 1 Jun 2011 19:47:29 +0000 (12:47 -0700)]
am
79841acb: Merge "Compatibility mode never needed for normal size screens." into honeycomb-mr2
* commit '
79841acb6275348b4747d30bae6d813e15b1425d':
Compatibility mode never needed for normal size screens.
Dianne Hackborn [Wed, 1 Jun 2011 19:43:56 +0000 (12:43 -0700)]
Merge "Compatibility mode never needed for normal size screens." into honeycomb-mr2
Dianne Hackborn [Wed, 1 Jun 2011 19:42:55 +0000 (12:42 -0700)]
Compatibility mode never needed for normal size screens.
Change-Id: I3482fa692618b9272e1e19384e766a77f2a53c5d
Dianne Hackborn [Wed, 1 Jun 2011 19:39:36 +0000 (12:39 -0700)]
am
80cf4e79: Merge "Fix issue #
4500511: Holo effect background doesn\'t reach top of screen anymore" into honeycomb-mr2
* commit '
80cf4e79d2acd1f94b6a9866255459c6ab2760be':
Fix issue #
4500511: Holo effect background doesn't reach top of screen anymore
Dianne Hackborn [Wed, 1 Jun 2011 19:34:48 +0000 (12:34 -0700)]
Merge "Fix issue #
4500511: Holo effect background doesn't reach top of screen anymore" into honeycomb-mr2
Dianne Hackborn [Wed, 1 Jun 2011 19:28:20 +0000 (12:28 -0700)]
Fix issue #
4500511: Holo effect background doesn't reach top of screen anymore
Change-Id: Iebefe924e71206f3e6388eaee64f7b1416bc3239
Justin Koh [Wed, 1 Jun 2011 01:51:51 +0000 (18:51 -0700)]
Framework: bugfix for menu selector not showing up properly.
Menu selector wasn't showing up properly because selector state wasn't updated after touch mode. Added this to resurrectselection call.
http://b/issue?id=
4372583
TESTED = runs on M4.
Change-Id: I349c3b86f4e8a1a02a20494b547859d0c12867ee
Adam Powell [Wed, 1 Jun 2011 17:29:58 +0000 (10:29 -0700)]
am
8656ba12: Merge "Fix bug
4501658 - adjust toast frame padding" into honeycomb-mr2
* commit '
8656ba1298da98dde9ff6517aa06b86317a65bf7':
Fix bug
4501658 - adjust toast frame padding
Adam Powell [Wed, 1 Jun 2011 17:27:54 +0000 (10:27 -0700)]
Merge "Fix bug
4501658 - adjust toast frame padding" into honeycomb-mr2
Scott Main [Wed, 1 Jun 2011 16:50:21 +0000 (09:50 -0700)]
am
f5992953: docs: fix typos
* commit '
f5992953e410a7ce4028e17f50474679b30d2a2a':
docs: fix typos
Scott Main [Wed, 1 Jun 2011 16:46:04 +0000 (09:46 -0700)]
docs: fix typos
Change-Id: I59a34a84075c63715a6b4aaf6d90acead321ea90
Robert Greenwalt [Wed, 1 Jun 2011 16:01:22 +0000 (09:01 -0700)]
Merge "Remove redundent getCurrentCdmaDataConnectionState" into honeycomb-LTE
Dianne Hackborn [Wed, 1 Jun 2011 01:30:01 +0000 (18:30 -0700)]
am
fd206560: Merge "Forgot this file." into honeycomb-mr2
* commit '
fd20656067c611d3fed3bce31c757691ca0abaf4':
Forgot this file.
Dianne Hackborn [Wed, 1 Jun 2011 01:28:50 +0000 (18:28 -0700)]
Merge "Forgot this file." into honeycomb-mr2
Dianne Hackborn [Wed, 1 Jun 2011 01:27:49 +0000 (18:27 -0700)]
Forgot this file.
Change-Id: I8aa457d8d81d283f8cc36f68eca33fcb3a86ccad
Dianne Hackborn [Wed, 1 Jun 2011 01:08:27 +0000 (18:08 -0700)]
am
75d6b3c2: Merge "Fix issue #
4502672: Wrong xml resources used for homescreen widgets." into honeycomb-mr2
* commit '
75d6b3c2a24224e41e87685db0d9d0b8abea091d':
Fix issue #
4502672: Wrong xml resources used for homescreen widgets.
Dianne Hackborn [Wed, 1 Jun 2011 01:05:26 +0000 (18:05 -0700)]
Merge "Fix issue #
4502672: Wrong xml resources used for homescreen widgets." into honeycomb-mr2
Dianne Hackborn [Wed, 1 Jun 2011 00:59:49 +0000 (17:59 -0700)]
Fix issue #
4502672: Wrong xml resources used for homescreen widgets.
There was a race in the system process between applying the initial
configuration and executing code in higher-level system services
like the app widget service that relies on the config. For some
reason it starting showing up more after my code changes; it should
now be completely fixed.
Also fix the activity starting window to run in compatibility mode
if its application is going to be in compatibility mode.
And some various cleanup and small fixes.
Change-Id: I0566933bf1bbb4259c1d99a60c0a3c19af1542e5
Adam Powell [Wed, 1 Jun 2011 00:59:02 +0000 (17:59 -0700)]
Fix bug
4501658 - adjust toast frame padding
Change-Id: I32fa68e27724ddb20f09a0ac99a497a97c425600
Joe Malin [Tue, 31 May 2011 23:40:59 +0000 (16:40 -0700)]
am
d40a5d5c: Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f
* commit '
d40a5d5cb754b132d6c10ae78a6214f38ed23f3d':
Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f
Joe Malin [Wed, 25 May 2011 21:53:23 +0000 (14:53 -0700)]
Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f
Change-Id: I48ddc26d4fc8e2e44627cfb0e98d9f0b596042b6
Robert Greenwalt [Thu, 26 May 2011 23:37:20 +0000 (16:37 -0700)]
Remove redundent getCurrentCdmaDataConnectionState
replace with existing and generic getCurrentDataConnectionState.
bug:
3487138
Change-Id: I8a5e85afd316252eedeacb2a042450124702defd
Jeff Brown [Tue, 31 May 2011 22:44:04 +0000 (15:44 -0700)]
am
c272d427: Merge "Use ViewConfiguration to seed input system configuration." into honeycomb-mr2
* commit '
c272d4279493000928b8b7c6dbcf2d2b7d8d08b2':
Use ViewConfiguration to seed input system configuration.
Jeff Brown [Tue, 31 May 2011 22:44:01 +0000 (15:44 -0700)]
am
d854304c: Merge "Button state should reflect actual buttons. (DO NOT MERGE)" into honeycomb-mr2
* commit '
d854304c2bcadbda37a7f1b24723dbc0030073ca':
Button state should reflect actual buttons. (DO NOT MERGE)
Jeff Brown [Tue, 31 May 2011 22:42:18 +0000 (15:42 -0700)]
Merge "Use ViewConfiguration to seed input system configuration." into honeycomb-mr2
Jeff Brown [Tue, 31 May 2011 22:42:08 +0000 (15:42 -0700)]
Merge "Button state should reflect actual buttons. (DO NOT MERGE)" into honeycomb-mr2
Jeff Brown [Fri, 27 May 2011 02:17:02 +0000 (19:17 -0700)]
Use ViewConfiguration to seed input system configuration.
Fix bug where the pointer presentation would be updated on
any input reader timeout rather than only when a pointer gesture
is in progress.
Bug:
4124987
Change-Id: Ie9bba4a0b3228d55e45e65fa2ede5cd6ba887a08
Jeff Brown [Tue, 31 May 2011 22:00:18 +0000 (15:00 -0700)]
Button state should reflect actual buttons. (DO NOT MERGE)
Bug:
4124987
Change-Id: If0585bd1432c8c61ed0c9a6a4f6de4a62e3f6e53
Amith Yamasani [Tue, 31 May 2011 21:02:11 +0000 (14:02 -0700)]
am
0119a67e: Merge "Use Holo background and proper padding for App Permissions UI." into honeycomb-mr2
* commit '
0119a67e72790fb14b05130e18fa0785b4fa8531':
Use Holo background and proper padding for App Permissions UI.
Amith Yamasani [Tue, 31 May 2011 20:58:34 +0000 (13:58 -0700)]
Merge "Use Holo background and proper padding for App Permissions UI." into honeycomb-mr2
Amith Yamasani [Tue, 31 May 2011 20:03:59 +0000 (13:03 -0700)]
Use Holo background and proper padding for App Permissions UI.
Bug:
4515158
Change-Id: I47a8f2fbdc2547dd08e199ccbfa51710048963ae
Tadashi G. Takaoka [Tue, 31 May 2011 07:18:54 +0000 (00:18 -0700)]
am
8ede6274: Fix input type judgment of WebTextView (DO NOT MERGE)
* commit '
8ede62745faa02265f927941d1195b6c1bf05ebb':
Fix input type judgment of WebTextView (DO NOT MERGE)
Tadashi G. Takaoka [Sat, 28 May 2011 14:40:19 +0000 (23:40 +0900)]
Fix input type judgment of WebTextView (DO NOT MERGE)
Bug:
4490948
Change-Id: I232b8f1301128f1c77d72d92777a45c63f215a9c
satok [Sat, 28 May 2011 07:02:54 +0000 (00:02 -0700)]
am
5485ff61: Reduce the number of notification icons on narrow screens.
* commit '
5485ff6141ccebad2c171a9a51ffdbcb72703bd7':
Reduce the number of notification icons on narrow screens.
satok [Fri, 27 May 2011 10:15:01 +0000 (19:15 +0900)]
Reduce the number of notification icons on narrow screens.
For devices with minimum width between 600 and 720 dp, show
only 3 icons (and then, only in portrait). All other
configurations will show 5.
Bug:
4501374
Change-Id: I88168560fc2876c26cd3eb57f2db0b0cfe8b4fdd
Kazuhiro Ondo [Fri, 27 May 2011 22:01:51 +0000 (17:01 -0500)]
Further fix for SIM detection.
Refining SIM ready condition on UICC w/ multiple apps.
Also migration for RIL to use SIM_READY indication in case of UICC
presence instead of current NV_READY message.
Change-Id: I3445a628e2d32a24292e6a69785fe72422481221
Dianne Hackborn [Sat, 28 May 2011 00:12:53 +0000 (17:12 -0700)]
am
78470718: Fix various places that were using the wrong display metrics.
* commit '
784707187d96b731df5256c1c2adb0aaf9037239':
Fix various places that were using the wrong display metrics.
Dianne Hackborn [Sat, 28 May 2011 00:09:19 +0000 (17:09 -0700)]
Fix various places that were using the wrong display metrics.
Change-Id: I1ac2a0c4a1b7c851dbc99d26f295c7dd49b0bd5c
Dianne Hackborn [Fri, 27 May 2011 23:58:33 +0000 (16:58 -0700)]
am
8ea5e1d7: Fix compat mode bugs when updating apps.
* commit '
8ea5e1d79eb1f05ee7628b0d45ea8fc8eea5330d':
Fix compat mode bugs when updating apps.
Dianne Hackborn [Fri, 27 May 2011 23:45:31 +0000 (16:45 -0700)]
Fix compat mode bugs when updating apps.
No longer accidentally puts an app into compatibility mode.
Also various cleanup, freezing screen while switching between modes.
Change-Id: Ic1b3958be7800189a93f68e9dee3c5adfc45fe57
Dianne Hackborn [Fri, 27 May 2011 21:23:11 +0000 (14:23 -0700)]
am
b96cbbd1: Add "tv" density for 720p screens.
* commit '
b96cbbd11c4590bec846212c33361e02293f18b5':
Add "tv" density for 720p screens.
Dianne Hackborn [Fri, 27 May 2011 20:40:26 +0000 (13:40 -0700)]
Add "tv" density for 720p screens.
Change-Id: I028969b007f2fceea66947d77a2ae31ef1d1a630
Dianne Hackborn [Fri, 27 May 2011 19:42:56 +0000 (12:42 -0700)]
am
ff762299: Merge "Small fixes and cleanup of resource config handling." into honeycomb-mr2
* commit '
ff7622992f39d8e401ab23c5ce6a84f318906e52':
Small fixes and cleanup of resource config handling.
Dianne Hackborn [Fri, 27 May 2011 19:40:39 +0000 (12:40 -0700)]
Merge "Small fixes and cleanup of resource config handling." into honeycomb-mr2
Dianne Hackborn [Fri, 27 May 2011 19:09:11 +0000 (12:09 -0700)]
Small fixes and cleanup of resource config handling.
Change-Id: I402c31b68f2b4825cb4c610a65ee8e1da471c7bb
James Dong [Fri, 27 May 2011 18:29:46 +0000 (11:29 -0700)]
am
95f397ad: Merge "Revert "DO NOT MERGE Correctly implement the CLEAR xfermode."" into honeycomb-mr2
* commit '
95f397adb13aa69b15b53bb089078d4dbdb269f1':
Revert "DO NOT MERGE Correctly implement the CLEAR xfermode."
James Dong [Fri, 27 May 2011 18:26:24 +0000 (11:26 -0700)]
Merge "Revert "DO NOT MERGE Correctly implement the CLEAR xfermode."" into honeycomb-mr2
James Dong [Fri, 27 May 2011 18:17:39 +0000 (11:17 -0700)]
Revert "DO NOT MERGE Correctly implement the CLEAR xfermode."
This reverts commit
e324197ecd14591d7db0572f50c0d21bbd269bb4.
Tadashi G. Takaoka [Fri, 27 May 2011 17:48:52 +0000 (10:48 -0700)]
am
241c000c: Merge "Fix InputType determination of WebTextView (DO NOT MERGE)" into honeycomb-mr2
* commit '
241c000cfb9299b4c6cfe3c7c1610f950d1a6e58':
Fix InputType determination of WebTextView (DO NOT MERGE)
Tadashi G. Takaoka [Fri, 27 May 2011 17:47:12 +0000 (10:47 -0700)]
Merge "Fix InputType determination of WebTextView (DO NOT MERGE)" into honeycomb-mr2
Scott Main [Fri, 27 May 2011 17:23:01 +0000 (10:23 -0700)]
am
f128d5d4: Merge "docs: adjust what\'s visible for online and offline docs" into honeycomb-mr2
* commit '
f128d5d49b95971d580b07dfdbeb513a0eb3d2df':
docs: adjust what's visible for online and offline docs
Scott Main [Fri, 27 May 2011 17:17:41 +0000 (10:17 -0700)]
Merge "docs: adjust what's visible for online and offline docs" into honeycomb-mr2
Scott Main [Fri, 27 May 2011 16:53:27 +0000 (09:53 -0700)]
docs: adjust what's visible for online and offline docs
Change-Id: Ie7490973001530098d5001d9ef5e4dbfab86ed08
Tadashi G. Takaoka [Fri, 27 May 2011 12:53:52 +0000 (21:53 +0900)]
Fix InputType determination of WebTextView (DO NOT MERGE)
The InpuType from <input type="email" /> has been broken.
Change-Id: Ie37de69682410cdd58c29910d483e924f5b614b6
Related-Bug:
4490948
Cherry-pick: Ibd7f2977a177f1d97e3a29ac44220e5136bbd653
Wink Saville [Fri, 27 May 2011 16:03:48 +0000 (09:03 -0700)]
Merge "DataConnection FailCause should use errorCode rather than ordinal." into honeycomb-LTE
Ramesh Sudini [Fri, 27 May 2011 14:23:01 +0000 (09:23 -0500)]
DataConnection FailCause should use errorCode rather than ordinal.
Change-Id: I45c5bca73b04f74eee7ab4858c8e28350e0ffb89