OSDN Git Service
Jean-Baptiste Queru [Wed, 15 Jun 2011 21:25:37 +0000 (14:25 -0700)]
Merge
5137711109783dcbb20143d3e5cab2fa931218dd
Change-Id: I5046a54648bdeea6f9661c46329d7b502f2f52b9
Mathias Agopian [Wed, 15 Jun 2011 21:13:04 +0000 (14:13 -0700)]
am
afffa8fa: fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
* commit '
afffa8fa9f82a7343e1158bf921931fd3e3df615':
fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
Irfan Sheriff [Wed, 15 Jun 2011 21:07:54 +0000 (14:07 -0700)]
am
5af3405f: am
ecda5461: Merge "Fix lease duration handling" into honeycomb-mr2
* commit '
5af3405f0d24c853bd10eb239c081e31972d3e1d':
Fix lease duration handling
Irfan Sheriff [Wed, 15 Jun 2011 21:04:23 +0000 (14:04 -0700)]
am
ecda5461: Merge "Fix lease duration handling" into honeycomb-mr2
* commit '
ecda5461603b6de77beb045dfdf82dad7ae48d61':
Fix lease duration handling
Irfan Sheriff [Wed, 15 Jun 2011 21:00:23 +0000 (14:00 -0700)]
Merge "Fix lease duration handling" into honeycomb-mr2
Wink Saville [Wed, 15 Jun 2011 20:58:20 +0000 (13:58 -0700)]
am
4d6233b2: Merge "Clean up some debug statements." into honeycomb-LTE
* commit '
4d6233b2edd24c83efe10f4403456b8d0c87241a':
Clean up some debug statements.
Wink Saville [Wed, 15 Jun 2011 20:55:06 +0000 (13:55 -0700)]
Merge "Clean up some debug statements." into honeycomb-LTE
Wink Saville [Wed, 15 Jun 2011 20:45:29 +0000 (13:45 -0700)]
Clean up some debug statements.
Change-Id: Id60020f09dd858f2d2c83bdd8f8d4384e5bfc934
Dianne Hackborn [Wed, 15 Jun 2011 20:44:16 +0000 (13:44 -0700)]
am
3dc1b5e2: am
ed31bbf6: Clean up some edge cases in the compat mode UI:
* commit '
3dc1b5e26fac2c6a6161d617f99fd901ee2ffc9e':
Clean up some edge cases in the compat mode UI:
Irfan Sheriff [Fri, 10 Jun 2011 23:18:25 +0000 (16:18 -0700)]
Fix lease duration handling
Convert lease time in seconds to long before alarm
set up and add sanity check
Change-Id: I99524c97d9a643ffa8234d016d0e819a284977a1
Dianne Hackborn [Wed, 15 Jun 2011 19:35:57 +0000 (12:35 -0700)]
am
ed31bbf6: Clean up some edge cases in the compat mode UI:
* commit '
ed31bbf65267c1f383dd0dff37acd034f3b9b59f':
Clean up some edge cases in the compat mode UI:
Marco Nelissen [Wed, 15 Jun 2011 19:20:57 +0000 (12:20 -0700)]
am
d8f9a83c: resolved conflicts for merge of
d027329c to gingerbread-plus-aosp
* commit '
d8f9a83cab34de38981dc3ba5ca9df8dda02dbc0':
Ignore duplicate WAP push PDU source/destination port if configured
Dianne Hackborn [Wed, 15 Jun 2011 18:16:06 +0000 (11:16 -0700)]
Clean up some edge cases in the compat mode UI:
- Don't put up multiple dialogs if a switch happens between activities
that both can use compat mode.
- Remove the help dialog if the user switches away from an app that
can use compat mode.
- Don't set the "don't show" preference until the user explicitly hits
the button.
- Hide the compat mode switch UI if the compat mode button is hidden.
Change-Id: I8dd2aab1385a264232a9256284d4a75b8e058e47
Marco Nelissen [Wed, 15 Jun 2011 15:33:09 +0000 (08:33 -0700)]
resolved conflicts for merge of
d027329c to gingerbread-plus-aosp
Change-Id: I169c415bf998b9935ab36812511573db05717b91
Daniel Sandler [Wed, 15 Jun 2011 13:25:35 +0000 (06:25 -0700)]
am
fbb09347: am
5994bff9: Merge "One-time-only compatibility mode explanation dialog." into honeycomb-mr2
* commit '
fbb093479362865da833b89643a8f58347278bc3':
One-time-only compatibility mode explanation dialog.
Daniel Sandler [Wed, 15 Jun 2011 13:25:24 +0000 (06:25 -0700)]
am
2fdf5880: am
97d5081a: Merge "Final UI for compatibility mode." into honeycomb-mr2
* commit '
2fdf5880611c333e172d4e0cc2c4259bca324699':
Final UI for compatibility mode.
Daniel Sandler [Wed, 15 Jun 2011 13:15:11 +0000 (06:15 -0700)]
am
5994bff9: Merge "One-time-only compatibility mode explanation dialog." into honeycomb-mr2
* commit '
5994bff92472b3bdcd5754d8a9156b49269a9c1d':
One-time-only compatibility mode explanation dialog.
Daniel Sandler [Wed, 15 Jun 2011 13:15:07 +0000 (06:15 -0700)]
am
97d5081a: Merge "Final UI for compatibility mode." into honeycomb-mr2
* commit '
97d5081ac331884fe0f6f2e5814d4862a974fbe3':
Final UI for compatibility mode.
Daniel Sandler [Wed, 15 Jun 2011 13:10:32 +0000 (06:10 -0700)]
Merge "One-time-only compatibility mode explanation dialog." into honeycomb-mr2
Daniel Sandler [Wed, 15 Jun 2011 13:10:27 +0000 (06:10 -0700)]
Merge "Final UI for compatibility mode." into honeycomb-mr2
Daniel Sandler [Wed, 15 Jun 2011 05:03:02 +0000 (01:03 -0400)]
One-time-only compatibility mode explanation dialog.
Don't miss it!
Bug:
4595256
Change-Id: I80c0949e6118e3ea3af089d4cad160ce63e7d8ce
Dianne Hackborn [Wed, 15 Jun 2011 04:50:56 +0000 (21:50 -0700)]
am
abe5bd23: am
a9551706: Testing done, compatibility mode no longer on by default.
* commit '
abe5bd23c341da035e9905d9e50c1d6bccf229dc':
Testing done, compatibility mode no longer on by default.
Dianne Hackborn [Wed, 15 Jun 2011 04:47:51 +0000 (21:47 -0700)]
am
a9551706: Testing done, compatibility mode no longer on by default.
* commit '
a9551706a279a798c91d8ef593b2acb16a30c682':
Testing done, compatibility mode no longer on by default.
Daniel Sandler [Tue, 14 Jun 2011 15:30:28 +0000 (11:30 -0400)]
Final UI for compatibility mode.
Bug:
4595256
Change-Id: Idaa96393fb809c828b5f661f29e8b687fdf3d104
Dianne Hackborn [Wed, 15 Jun 2011 04:05:03 +0000 (21:05 -0700)]
Testing done, compatibility mode no longer on by default.
Change-Id: I5bcc98d2b3a1a02ca788ab61440f0aa5d4f7fb4e
Dianne Hackborn [Wed, 15 Jun 2011 03:57:48 +0000 (20:57 -0700)]
am
baa89d38: am
f930232f: Fix a major problem in fragment lifecycle.
* commit '
baa89d3839f70bd31e5219c636ac24a4cc29928d':
Fix a major problem in fragment lifecycle.
Dianne Hackborn [Wed, 15 Jun 2011 03:54:40 +0000 (20:54 -0700)]
am
f930232f: Fix a major problem in fragment lifecycle.
* commit '
f930232fd1c8d301d91853c8fe5dca43979ac807':
Fix a major problem in fragment lifecycle.
Dianne Hackborn [Wed, 15 Jun 2011 01:36:14 +0000 (18:36 -0700)]
Fix a major problem in fragment lifecycle.
When animating away a fragment, we were not putting it through
the last part of its lifecycle (onDestroy() etc).
Also, retained fragments that have a target were broken. Oops.
Change-Id: I5a669b77a2f24b581cde2a0959acf62edb65e326
Dianne Hackborn [Wed, 15 Jun 2011 02:22:42 +0000 (19:22 -0700)]
am
027e9e28: am
4e04380d: Merge "Fix issue #
4592768: Xoom display does not resize when..." into honeycomb-mr2
* commit '
027e9e28b2880b8e50912d7c25e68e8f196bb66b':
Fix issue #
4592768: Xoom display does not resize when...
Dianne Hackborn [Wed, 15 Jun 2011 02:19:25 +0000 (19:19 -0700)]
am
4e04380d: Merge "Fix issue #
4592768: Xoom display does not resize when..." into honeycomb-mr2
* commit '
4e04380d0a42347013808ee2058c786582ad548f':
Fix issue #
4592768: Xoom display does not resize when...
Dianne Hackborn [Wed, 15 Jun 2011 02:16:46 +0000 (19:16 -0700)]
Merge "Fix issue #
4592768: Xoom display does not resize when..." into honeycomb-mr2
Robert Ly [Wed, 15 Jun 2011 00:52:55 +0000 (17:52 -0700)]
am
b481a600: am
c7731e07: Merge "cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d" into honeycomb-mr2
* commit '
b481a6007f3c0e9f50ddb2e126fc5d8188961b25':
cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d
Robert Ly [Wed, 15 Jun 2011 00:51:08 +0000 (17:51 -0700)]
am
4963cd0b: am
1a3e7cf2: Merge "cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc" into honeycomb-mr2
* commit '
4963cd0bd1d63fe5a444b2299758d2a2696776f1':
cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc
Robert Ly [Wed, 15 Jun 2011 00:47:51 +0000 (17:47 -0700)]
am
c7731e07: Merge "cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d" into honeycomb-mr2
* commit '
c7731e070e09007fdd002fd44dfe35bdeffbaac5':
cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d
Robert Ly [Wed, 15 Jun 2011 00:46:07 +0000 (17:46 -0700)]
am
1a3e7cf2: Merge "cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc" into honeycomb-mr2
* commit '
1a3e7cf259ef8eecdea236b3cba1608e1bd871e3':
cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc
Robert Ly [Wed, 15 Jun 2011 00:45:04 +0000 (17:45 -0700)]
Merge "cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d" into honeycomb-mr2
Robert Ly [Wed, 15 Jun 2011 00:43:38 +0000 (17:43 -0700)]
Merge "cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc" into honeycomb-mr2
Dianne Hackborn [Tue, 14 Jun 2011 23:45:21 +0000 (16:45 -0700)]
Fix issue #
4592768: Xoom display does not resize when...
...plugging in HDMI cable connected to a HDMI monitor
Change-Id: If3394e972131aa5124db2d1abf23b2214512773a
Robert Ly [Tue, 14 Jun 2011 23:41:55 +0000 (16:41 -0700)]
am
1dbb7075: am
8467cd7f: Merge "cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac" into honeycomb-mr2
* commit '
1dbb707592f0aff35e5ca1115f7ee278a5977c42':
cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac
Robert Ly [Tue, 14 Jun 2011 23:41:52 +0000 (16:41 -0700)]
am
17cddaf2: am
409b9a4c: Merge "Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7"" into honeycomb-mr2
* commit '
17cddaf2a64c8392a8e852283e720d3abdaca9b3':
Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7"
Robert Ly [Tue, 14 Jun 2011 23:41:49 +0000 (16:41 -0700)]
am
b5c31b8a: am
194f4745: Merge "Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"" into honeycomb-mr2
* commit '
b5c31b8a11d4f898b0f9aa6eaf7a89195d800409':
Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"
Robert Ly [Tue, 14 Jun 2011 23:38:08 +0000 (16:38 -0700)]
am
8467cd7f: Merge "cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac" into honeycomb-mr2
* commit '
8467cd7f90a23c345b41cfcdcc62f1f8e3716c37':
cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac
Robert Ly [Tue, 14 Jun 2011 23:38:05 +0000 (16:38 -0700)]
am
409b9a4c: Merge "Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7"" into honeycomb-mr2
* commit '
409b9a4cad1d2dad43e647fc63a4ab1f3435d437':
Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7"
Robert Ly [Tue, 14 Jun 2011 23:38:02 +0000 (16:38 -0700)]
am
194f4745: Merge "Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"" into honeycomb-mr2
* commit '
194f47451ce3a0d346e362dfd8753057f41c765d':
Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"
Robert Ly [Tue, 14 Jun 2011 23:36:17 +0000 (16:36 -0700)]
Merge "cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac" into honeycomb-mr2
Robert Ly [Tue, 14 Jun 2011 23:35:22 +0000 (16:35 -0700)]
Merge "Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7"" into honeycomb-mr2
Robert Ly [Tue, 14 Jun 2011 23:35:12 +0000 (16:35 -0700)]
Merge "Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"" into honeycomb-mr2
Amith Yamasani [Tue, 14 Jun 2011 22:42:36 +0000 (15:42 -0700)]
am
eb5e633a: am
608a200d: Merge "Stability fixes for PreferenceFragments." into honeycomb-mr2
* commit '
eb5e633a2488456874f829263fa6cb96588d25aa':
Stability fixes for PreferenceFragments.
Amith Yamasani [Tue, 14 Jun 2011 22:38:31 +0000 (15:38 -0700)]
am
608a200d: Merge "Stability fixes for PreferenceFragments." into honeycomb-mr2
* commit '
608a200d2ed19540bb356d54e96f72c8c6b089b1':
Stability fixes for PreferenceFragments.
Amith Yamasani [Tue, 14 Jun 2011 22:35:13 +0000 (15:35 -0700)]
Merge "Stability fixes for PreferenceFragments." into honeycomb-mr2
Dianne Hackborn [Tue, 14 Jun 2011 22:22:12 +0000 (15:22 -0700)]
am
7c7f8e18: am
0a8a2324: Merge "Fix issue #
4603422: Compatibility mode button doesn\'t always update" into honeycomb-mr2
* commit '
7c7f8e18dee8b582ec8e30a1412903ceec2ef5f5':
Fix issue #
4603422: Compatibility mode button doesn't always update
Dianne Hackborn [Tue, 14 Jun 2011 22:14:34 +0000 (15:14 -0700)]
am
0a8a2324: Merge "Fix issue #
4603422: Compatibility mode button doesn\'t always update" into honeycomb-mr2
* commit '
0a8a2324239d7604e2a68349585aa67b59b25f4c':
Fix issue #
4603422: Compatibility mode button doesn't always update
Robert Ly [Tue, 14 Jun 2011 22:13:21 +0000 (15:13 -0700)]
am
5d730c92: am
86ef7977: Merge "cherrypick from hc mr1 Change-Id: I106cddd6e22d72c48edeaadbf296b0453813d06a" into honeycomb-mr2
* commit '
5d730c9237fdf3252a9aa0c01c1653bae69f4f39':
cherrypick from hc mr1 Change-Id: I106cddd6e22d72c48edeaadbf296b0453813d06a
Dianne Hackborn [Tue, 14 Jun 2011 22:12:01 +0000 (15:12 -0700)]
Merge "Fix issue #
4603422: Compatibility mode button doesn't always update" into honeycomb-mr2
Robert Ly [Tue, 14 Jun 2011 22:10:07 +0000 (15:10 -0700)]
am
86ef7977: Merge "cherrypick from hc mr1 Change-Id: I106cddd6e22d72c48edeaadbf296b0453813d06a" into honeycomb-mr2
* commit '
86ef7977a95d6e1783f646d96992582d1dbf080a':
cherrypick from hc mr1 Change-Id: I106cddd6e22d72c48edeaadbf296b0453813d06a
Robert Ly [Tue, 14 Jun 2011 22:09:41 +0000 (15:09 -0700)]
Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"
This reverts commit
1431fd98b1a9b69a8b9a03d07bc408aefe30c28e
Amith Yamasani [Tue, 14 Jun 2011 22:07:49 +0000 (15:07 -0700)]
Stability fixes for PreferenceFragments.
Unregister the click listener as early as possible, so that clicks
don't get delivered after the activity is detached.
Bug:
4599586
This should also fix:
4603030,
4601105,
4598715,
4598712.
Change-Id: I7bcff719bed14ea61b482bd6d29ae1fa5e322e41
Robert Ly [Tue, 14 Jun 2011 22:06:42 +0000 (15:06 -0700)]
Merge "cherrypick from hc mr1 Change-Id: I106cddd6e22d72c48edeaadbf296b0453813d06a" into honeycomb-mr2
Dianne Hackborn [Tue, 14 Jun 2011 22:00:32 +0000 (15:00 -0700)]
Fix issue #
4603422: Compatibility mode button doesn't always update
We now tell the system bar every time the top activity has changed for
it to re-evaluate its UI state.
Also fix issue #:
4607102 Low rider notifications. It turns out this
was due to the change in the dialog asset; the notification UI was relying
on this having a lot of padding to make it sit above the status bar.
Now we have an explicitly mechanism to set how much it overlaps (or doesn't)
the status bar.
Change-Id: Iab5ebd86e620ff4fc4cd77206e18af962ec2830e
Robert Ly [Tue, 14 Jun 2011 22:04:22 +0000 (15:04 -0700)]
am
b658dfb8: am
cbd31aec: Merge "cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e" into honeycomb-mr2
* commit '
b658dfb8f4363643b9426649ffc8e48be5c332f6':
cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e
Robert Ly [Tue, 14 Jun 2011 22:02:42 +0000 (15:02 -0700)]
Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7"
This reverts commit
f25be17f6413417aa6a1e3a5a791302099d15008
Robert Ly [Tue, 14 Jun 2011 22:02:28 +0000 (15:02 -0700)]
am
cbfab050: am
a91d6552: Merge "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2
* commit '
cbfab050756555a2f7d707522a9d044bcaa4e0c8':
cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb
Robert Ly [Tue, 14 Jun 2011 22:02:25 +0000 (15:02 -0700)]
am
4cd4c820: am
9fa54704: Merge "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2
* commit '
4cd4c82073a6066bb94cce089cd259d19969c0fd':
cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7
Robert Ly [Tue, 14 Jun 2011 22:01:48 +0000 (15:01 -0700)]
am
cbd31aec: Merge "cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e" into honeycomb-mr2
* commit '
cbd31aec9f4a7367d440bfb0c9683bd481461995':
cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e
Robert Ly [Tue, 14 Jun 2011 21:58:32 +0000 (14:58 -0700)]
Merge "cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e" into honeycomb-mr2
Robert Ly [Tue, 14 Jun 2011 21:58:11 +0000 (14:58 -0700)]
am
a91d6552: Merge "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2
* commit '
a91d6552913c02538b3f97e774e9771cfbef9dec':
cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb
Robert Ly [Tue, 14 Jun 2011 21:58:08 +0000 (14:58 -0700)]
am
9fa54704: Merge "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2
* commit '
9fa54704492234aed15ccdb29aae9261674811e3':
cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7
Robert Ly [Tue, 14 Jun 2011 21:56:00 +0000 (14:56 -0700)]
Merge "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2
Robert Ly [Tue, 14 Jun 2011 21:55:35 +0000 (14:55 -0700)]
Merge "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2
Wink Saville [Tue, 14 Jun 2011 21:48:51 +0000 (14:48 -0700)]
am
fbef26eb: Merge "Enforce provision check for CSIM record only." into honeycomb-LTE
* commit '
fbef26eb55cf8a5b5a25a2b748bf16b54d398abc':
Enforce provision check for CSIM record only.
Wink Saville [Tue, 14 Jun 2011 21:47:07 +0000 (14:47 -0700)]
am
c2d17d3b: Merge "Make APN re-connect delay configuable" into honeycomb-LTE
* commit '
c2d17d3bea02991df378237ea7058ccedb7c6a14':
Make APN re-connect delay configuable
Wink Saville [Tue, 14 Jun 2011 21:47:04 +0000 (14:47 -0700)]
am
82c1a5de: Merge "Revert "CDMALTE: Get roaming status based on SID/NID"" into honeycomb-LTE
* commit '
82c1a5dea305d56eb77efa7d9a730307ff6af28a':
Revert "CDMALTE: Get roaming status based on SID/NID"
Wink Saville [Tue, 14 Jun 2011 21:44:31 +0000 (14:44 -0700)]
Merge "Enforce provision check for CSIM record only." into honeycomb-LTE
Wink Saville [Tue, 14 Jun 2011 21:44:23 +0000 (14:44 -0700)]
Merge "Make APN re-connect delay configuable" into honeycomb-LTE
Wink Saville [Tue, 14 Jun 2011 21:44:12 +0000 (14:44 -0700)]
Merge "Revert "CDMALTE: Get roaming status based on SID/NID"" into honeycomb-LTE
Kazuhiro Ondo [Tue, 14 Jun 2011 18:49:02 +0000 (13:49 -0500)]
Enforce provision check for CSIM record only.
Change-Id: I94bb6dd9191b24b0bd8c0e7d6267de5cd4b82be8
Kazuhiro Ondo [Tue, 14 Jun 2011 05:47:24 +0000 (00:47 -0500)]
Make APN re-connect delay configuable
Add configurability on hard coded timer.
Change-Id: Ic9a6ee43d9da3bd45f862aa3a21f05d836b402e3
Kazuhiro Ondo [Tue, 14 Jun 2011 02:53:37 +0000 (21:53 -0500)]
Revert "CDMALTE: Get roaming status based on SID/NID"
This reverts commit
3fc9055c7f3bc25948f17bc29582abae72fe7de1.
Mathias Agopian [Tue, 14 Jun 2011 20:30:34 +0000 (13:30 -0700)]
am
a9007fbd: am
69b4587b: DO NOT MERGE. may fix build on some version of gcc
* commit '
a9007fbdae6671f66535da4b9dad04b19aaf9186':
DO NOT MERGE. may fix build on some version of gcc
Mathias Agopian [Tue, 14 Jun 2011 20:26:38 +0000 (13:26 -0700)]
am
69b4587b: DO NOT MERGE. may fix build on some version of gcc
* commit '
69b4587bfbb3e98f793959d9123340360fa233a2':
DO NOT MERGE. may fix build on some version of gcc
Mathias Agopian [Tue, 14 Jun 2011 18:50:22 +0000 (11:50 -0700)]
DO NOT MERGE. may fix build on some version of gcc
Change-Id: Iff6d9ab3a7caf58f65fc3f60633a3bd577b7af25
Robert Ly [Tue, 14 Jun 2011 18:50:19 +0000 (11:50 -0700)]
cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7
Conflicts:
docs/html/guide/topics/usb/adk.jd
Change-Id: I09b7fafd5d946a9e0d42c025089bdab717c8ca3e
Dianne Hackborn [Tue, 14 Jun 2011 18:42:09 +0000 (11:42 -0700)]
am
74c48f2b: am
700a1f25: Merge "Update resources documentation with new qualifiers." into honeycomb-mr2
* commit '
74c48f2b2b7084e1bfddb2dddf7587b0cf821ea6':
Update resources documentation with new qualifiers.
Dianne Hackborn [Tue, 14 Jun 2011 18:40:06 +0000 (11:40 -0700)]
am
6c0533f9: am
c5193c62: Merge "Add new landscape and portrait orientation features." into honeycomb-mr2
* commit '
6c0533f994e7991b3bd60cab48362e8e2e6d86f0':
Add new landscape and portrait orientation features.
Dianne Hackborn [Tue, 14 Jun 2011 18:38:01 +0000 (11:38 -0700)]
am
700a1f25: Merge "Update resources documentation with new qualifiers." into honeycomb-mr2
* commit '
700a1f25719138b94c453beb6325e627a11a9883':
Update resources documentation with new qualifiers.
Dianne Hackborn [Tue, 14 Jun 2011 18:36:05 +0000 (11:36 -0700)]
am
c5193c62: Merge "Add new landscape and portrait orientation features." into honeycomb-mr2
* commit '
c5193c6285d7094fb86dcb5cd56f44a3788af7c2':
Add new landscape and portrait orientation features.
Robert Ly [Thu, 9 Jun 2011 05:23:42 +0000 (22:23 -0700)]
cherrypick from hc mr1 Change-Id: I106cddd6e22d72c48edeaadbf296b0453813d06a
Change-Id: I8b7848139e93df385d0727f9536be73124687cc7
Dianne Hackborn [Tue, 14 Jun 2011 18:27:09 +0000 (11:27 -0700)]
Merge "Update resources documentation with new qualifiers." into honeycomb-mr2
Robert Ly [Tue, 14 Jun 2011 18:26:39 +0000 (11:26 -0700)]
cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb
Conflicts:
docs/html/sdk/sdk_toc.cs
Change-Id: I03be3486734960c4c691d4d2abe6b17c5114b1a9
Dianne Hackborn [Tue, 14 Jun 2011 18:24:29 +0000 (11:24 -0700)]
Merge "Add new landscape and portrait orientation features." into honeycomb-mr2
Dianne Hackborn [Tue, 14 Jun 2011 02:33:22 +0000 (19:33 -0700)]
Add new landscape and portrait orientation features.
Updates aapt to know about these. Also updates aapt badging to:
- No longer crash due to the change to how we match unspecified
configuration resources.
- Report the new "smallest screen" supported screen configs.
- Infer old screen size buckets based on new smallest width attrs.
- Report all of the different labels and icons in an app.
Change-Id: I7376042b817391bd070f549cebbc7f03be4635c8
Robert Ly [Fri, 27 May 2011 23:54:03 +0000 (16:54 -0700)]
cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac
Change-Id: I7a1ca07b5aac9979b710e78b4d0e33f78ac18cee
Robert Ly [Tue, 7 Jun 2011 18:17:27 +0000 (11:17 -0700)]
cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d
Change-Id: I88d74001d58176ac9ca24265512d92646c345488
John Wang [Tue, 14 Jun 2011 17:05:40 +0000 (10:05 -0700)]
am
49572479: Update sim missing message in lock screen.
* commit '
49572479a9cb479f2b323f011c1a9f8142ec1a46':
Update sim missing message in lock screen.
Dianne Hackborn [Tue, 14 Jun 2011 05:01:13 +0000 (22:01 -0700)]
Update resources documentation with new qualifiers.
Change-Id: I4a3e0d3ece64d8a177157e469c39dbb282094373
John Wang [Mon, 13 Jun 2011 23:17:39 +0000 (16:17 -0700)]
Update sim missing message in lock screen.
Update SIM missing message to include SIM corrupted situation.
bug:
4392059
Change-Id: Icf2f8d801a2e2761a309442209118a6a71a4c633
Derek Sollenberger [Mon, 16 May 2011 17:09:42 +0000 (13:09 -0400)]
Updates resulting from the Skia merge (revision 1327)
Change-Id: I1d2cecbad6c30e6ebc9579093404742f17e14e84
Mathias Agopian [Mon, 13 Jun 2011 21:15:00 +0000 (14:15 -0700)]
am
77079399: am
a9c9a4ba: fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
* commit '
77079399fca3e9c71e2ac06f3da26934e1c278b9':
fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
Mathias Agopian [Mon, 13 Jun 2011 21:13:21 +0000 (14:13 -0700)]
am
a9c9a4ba: fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
* commit '
a9c9a4baf24700e8817d47d8ea8da1742caea0b5':
fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
Mathias Agopian [Mon, 13 Jun 2011 01:05:53 +0000 (18:05 -0700)]
fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
Bug:
4595257
Change-Id: I4773cf4fe59b2509db0ed733739eb6961d473b25