OSDN Git Service
Jaikumar Ganesh [Mon, 6 Jun 2011 18:34:11 +0000 (11:34 -0700)]
am
58ada2f3: am
94062517: Merge "Require bonding and encryption for PBAP server"
* commit '
58ada2f3bbab749fb5a813fb8f82eee347080405':
Require bonding and encryption for PBAP server
Jean-Baptiste Queru [Mon, 6 Jun 2011 18:33:52 +0000 (11:33 -0700)]
am
54ab72e1: am
038e8f99: Merge "Adding support for parsing of SMS-CB pdus in UMTS format."
* commit '
54ab72e1c389905adb074bd7c799a33b4f513679':
Adding support for parsing of SMS-CB pdus in UMTS format.
Marco Nelissen [Mon, 6 Jun 2011 16:55:15 +0000 (09:55 -0700)]
resolved conflicts for merge of
b9783b49 to honeycomb-plus-aosp
Change-Id: I1d86ea56b3d1d1b69f6671e5b0df0ca3f0c79643
Wink Saville [Sat, 4 Jun 2011 13:24:40 +0000 (06:24 -0700)]
am
6ff5ba00: Merge "Add FileUtils.checksumCrc32" into honeycomb-LTE
* commit '
6ff5ba00b07b32f3c82bce2c412e5e8f30c202bc':
Add FileUtils.checksumCrc32
Wink Saville [Sat, 4 Jun 2011 13:15:21 +0000 (06:15 -0700)]
Merge "Add FileUtils.checksumCrc32" into honeycomb-LTE
Dianne Hackborn [Sat, 4 Jun 2011 00:57:33 +0000 (17:57 -0700)]
am
b4815f47: am
bd754205: Merge "Fix to not lose state when saving a deactivated fragment." into honeycomb-mr2
* commit '
b4815f47e6d612da6e2d0650a2d8f103626e3ec7':
Fix to not lose state when saving a deactivated fragment.
Dianne Hackborn [Sat, 4 Jun 2011 00:54:28 +0000 (17:54 -0700)]
am
bd754205: Merge "Fix to not lose state when saving a deactivated fragment." into honeycomb-mr2
* commit '
bd754205d0b59315582855329649dad925a04b82':
Fix to not lose state when saving a deactivated fragment.
Dianne Hackborn [Sat, 4 Jun 2011 00:52:23 +0000 (17:52 -0700)]
Merge "Fix to not lose state when saving a deactivated fragment." into honeycomb-mr2
Roman Nurik [Sat, 4 Jun 2011 00:40:11 +0000 (17:40 -0700)]
am
07613835: am
e7d60078: Add old blog posts as articles, batch 1
* commit '
076138357027189f1bb90caf8c2e1a09497d78ac':
Add old blog posts as articles, batch 1
Dianne Hackborn [Sat, 4 Jun 2011 00:34:45 +0000 (17:34 -0700)]
Fix to not lose state when saving a deactivated fragment.
Also deactivating a fragment shouldn't put it in the exiting state.
Change-Id: I514f3589ee7bbbee131cd7b4a48803e99b212bd0
Roman Nurik [Sat, 4 Jun 2011 00:27:03 +0000 (17:27 -0700)]
am
e7d60078: Add old blog posts as articles, batch 1
* commit '
e7d6007872af7f27b62bfb46aadf2b7a07c0eac0':
Add old blog posts as articles, batch 1
Wink Saville [Sat, 4 Jun 2011 00:03:51 +0000 (17:03 -0700)]
Add FileUtils.checksumCrc32
Change-Id: Ic6bffcb66554d7af38cea68648d9431fda8ef10d
Roman Nurik [Thu, 19 May 2011 00:50:39 +0000 (17:50 -0700)]
Add old blog posts as articles, batch 1
Change-Id: Ibe1bcf1ceef2eb1a1b4bc0c1b2451ed69838ee3a
Dianne Hackborn [Fri, 3 Jun 2011 23:27:36 +0000 (16:27 -0700)]
am
dddd6b15: am
185e3e24: Fix when managed cursors are required.
* commit '
dddd6b15d5274a6138facec9f553336fac5f6de6':
Fix when managed cursors are required.
Dianne Hackborn [Fri, 3 Jun 2011 23:23:15 +0000 (16:23 -0700)]
am
185e3e24: Fix when managed cursors are required.
* commit '
185e3e243ee1da136bcace854026b8abaf0c4c86':
Fix when managed cursors are required.
Robert Greenwalt [Fri, 3 Jun 2011 22:46:08 +0000 (15:46 -0700)]
am
80a19e67: Merge "Promote Telephony\'s isDataPossible." into honeycomb-LTE
* commit '
80a19e67d1cd3710dbbfa52767a994512d20f694':
Promote Telephony's isDataPossible.
Robert Greenwalt [Fri, 3 Jun 2011 22:42:48 +0000 (15:42 -0700)]
Merge "Promote Telephony's isDataPossible." into honeycomb-LTE
Dianne Hackborn [Fri, 3 Jun 2011 22:26:01 +0000 (15:26 -0700)]
Fix when managed cursors are required.
Only do this when we are actually restarting, not when we
are just resuming after a pause.
Change-Id: I32fd263917b03776efca8e096d0343107721398d
John Wang [Fri, 3 Jun 2011 21:09:13 +0000 (14:09 -0700)]
am
3b71239a: Merge "Add supplyPuk to do SIM puk unlock." into honeycomb-LTE
* commit '
3b71239aca01fb029d9acd2c606b7be9b8f32d66':
Add supplyPuk to do SIM puk unlock.
John Wang [Fri, 3 Jun 2011 21:01:59 +0000 (14:01 -0700)]
Merge "Add supplyPuk to do SIM puk unlock." into honeycomb-LTE
Kazuhiro Ondo [Fri, 3 Jun 2011 19:19:23 +0000 (12:19 -0700)]
am
77c94113: Data recovery failure due to apn/dc state stuck in "disconnecting"
* commit '
77c9411306b6b3d210d22214d596272c9728cf5e':
Data recovery failure due to apn/dc state stuck in "disconnecting"
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:26:17 +0000 (11:26 -0700)]
am
f5699b82: am
b4b44bd3: DO NOT MERGE. Restore status bar on phones.
* commit '
f5699b82adef34b0b6bd88554c6a017f8662985e':
DO NOT MERGE. Restore status bar on phones.
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:35:58 +0000 (10:35 -0700)]
am
00afa11c: am
0538e621: Merge "Tap timeout removed on paste. Relying on position only." into honeycomb-mr2
* commit '
00afa11c1565da7ad6721db08a4da7c2ec1eacc0':
Tap timeout removed on paste. Relying on position only.
Andy Stadler [Fri, 3 Jun 2011 17:33:13 +0000 (10:33 -0700)]
am
c22d145a: am
3148557c: Merge "DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()" into honeycomb-mr2
* commit '
c22d145a9f26314e23ea678e96766755268e878b':
DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()
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:21:07 +0000 (10:21 -0700)]
am
5b4e2440: Merge "Refactor ServiceStateTracker handling of radio technology." into honeycomb-LTE
* commit '
5b4e24400a4f1a6c67efd08ab2cda3389f78144e':
Refactor ServiceStateTracker handling of radio technology.
Wink Saville [Fri, 3 Jun 2011 17:16:11 +0000 (10:16 -0700)]
Merge "Refactor ServiceStateTracker handling of radio technology." into honeycomb-LTE
Robert Greenwalt [Thu, 2 Jun 2011 23:12:02 +0000 (16:12 -0700)]
Promote Telephony's isDataPossible.
bug:
3481357
Change-Id: I83cb40cd5bb86d98abbb7152190b2277470fa160
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:25:14 +0000 (23:25 -0700)]
am
e10de072: am
be96408b: (Do not merge) Backport a fix for InputMethodManager.java
* commit '
e10de072d50cbe6984151cbbdba4dd2f2e8310b9':
(Do not merge) Backport a fix for InputMethodManager.java
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:33:22 +0000 (19:33 -0700)]
am
758b67b1: am
b46ed763: Add new Fragment API for explicitly saving/restoring state.
* commit '
758b67b12386a6ea52d520aef455c3150c9bae03':
Add new Fragment API for explicitly saving/restoring state.
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:24:28 +0000 (18:24 -0700)]
am
2e543dc1: Merge "CdmaLte: Use SPN from SIM card if SIM card is presend" into honeycomb-LTE
* commit '
2e543dc188c3c2e8f8a785e403c95b7e22fa6262':
CdmaLte: Use SPN from SIM card if SIM card is presend
Wink Saville [Fri, 3 Jun 2011 01:24:20 +0000 (18:24 -0700)]
am
1076f5ff: Merge "Read CSIM records in LTE on CDMA mode" into honeycomb-LTE
* commit '
1076f5ff27d35a5a807043bdea49aa40404d9c6b':
Read CSIM records in LTE on CDMA mode
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
John Wang [Fri, 3 Jun 2011 00:49:49 +0000 (17:49 -0700)]
Add supplyPuk to do SIM puk unlock.
Change-Id: I48654091ac3133a0c405448871b0a2f1ed3ded4b
Jeff Brown [Fri, 3 Jun 2011 00:34:03 +0000 (17:34 -0700)]
am
c8812761: am
e1718de6: Merge "Add a preference panel for mouse speed." into honeycomb-mr2
* commit '
c8812761609e532cceb400b112ed9982149c2490':
Add a preference panel for mouse speed.
Jeff Brown [Fri, 3 Jun 2011 00:33:55 +0000 (17:33 -0700)]
am
8186a5f0: am
10c3f367: Merge "Implement pointer acceleration." into honeycomb-mr2
* commit '
8186a5f065fac2b82c90cd18d79cd234bc221402':
Implement pointer acceleration.
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:56:17 +0000 (10:56 -0700)]
am
5b8342cf: am
a8629089: Merge "cherrypick Change-Id: I7a3612a1bc22cf53d382f787fa43fe222978d35e docs: add \'animator\' resource info" into honeycomb-mr2
* commit '
5b8342cf193a0255b254a5d833e6a2fac04b4b10':
cherrypick Change-Id: I7a3612a1bc22cf53d382f787fa43fe222978d35e docs: add 'animator' resource info
Scott Main [Thu, 2 Jun 2011 17:56:14 +0000 (10:56 -0700)]
am
d5335253: am
b8236751: Merge "cherry pick Change-Id: Id082021be2c27476f106285d0dd68d9e0f5bb514 docs: release notes for adt 11" into honeycomb-mr2
* commit '
d5335253cb55a48c0921fb23bb8dee7217f475aa':
cherry pick Change-Id: Id082021be2c27476f106285d0dd68d9e0f5bb514 docs: release notes for adt 11
Scott Main [Thu, 2 Jun 2011 17:55:49 +0000 (10:55 -0700)]
am
b04ac7ac: am
0d5ed597: Merge "Cherry pick Change-Id: Ie9d68854926544749dde4edfeac9be2ece38560b docs: fix broken links" into honeycomb-mr2
* commit '
b04ac7ac0b3fcc8a16f7f81476a99a4dc44f8ae0':
Cherry pick Change-Id: Ie9d68854926544749dde4edfeac9be2ece38560b docs: fix broken links
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:34:31 +0000 (22:34 -0700)]
am
a5f88510: am
2969b511: Merge "Add new supports-screen API to set maximum allowed size." into honeycomb-mr2
* commit '
a5f8851019605be26dd9a628280092e27f8a5f31':
Add new supports-screen API to set maximum allowed size.
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 02:09:02 +0000 (19:09 -0700)]
am
ce214df9: am
f58e6c98: Merge "doc typo" into honeycomb-mr2
* commit '
ce214df999cffd7f135ed33008b00f9c5c81ef7b':
doc typo
Dianne Hackborn [Thu, 2 Jun 2011 02:08:53 +0000 (19:08 -0700)]
am
8b9a2b6c: am
e6676351: Work around OpenFeint bug.
* commit '
8b9a2b6cbd9cf37e9f5aa1bfc7106c67a5e89202':
Work around OpenFeint bug.
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:53:15 +0000 (12:53 -0700)]
am
036c40f4: am
fa8ee177: Merge "Framework: bugfix for menu selector not showing up properly." into honeycomb-mr2
* commit '
036c40f443a6d83881bc336a94b5da41bbc0bbcc':
Framework: bugfix for menu selector not showing up properly.
Dianne Hackborn [Wed, 1 Jun 2011 19:51:08 +0000 (12:51 -0700)]
am
7cae137e: am
79841acb: Merge "Compatibility mode never needed for normal size screens." into honeycomb-mr2
* commit '
7cae137ed155f2d311f020bbb3e75730344fd5fc':
Compatibility mode never needed for normal size screens.
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:43:35 +0000 (12:43 -0700)]
am
13e2bef4: am
80cf4e79: Merge "Fix issue #
4500511: Holo effect background doesn\'t reach top of screen anymore" into honeycomb-mr2
* commit '
13e2bef4f67c5bc5ce93aade1431ae3332d361f0':
Fix issue #
4500511: Holo effect background doesn't reach top of screen anymore
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:33:46 +0000 (10:33 -0700)]
am
ca234a07: am
8656ba12: Merge "Fix bug
4501658 - adjust toast frame padding" into honeycomb-mr2
* commit '
ca234a0765e3b43ab202f29caceba68b7c5363df':
Fix bug
4501658 - adjust toast frame padding
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:54:00 +0000 (09:54 -0700)]
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:12:07 +0000 (09:12 -0700)]
am
ddae8936: Merge "Remove redundent getCurrentCdmaDataConnectionState" into honeycomb-LTE
* commit '
ddae89368129397c8df55bcdef9fcf36e4ff5fa5':
Remove redundent getCurrentCdmaDataConnectionState
OSDN Git Service
