OSDN Git Service
Mathias Agopian [Fri, 17 Jun 2011 01:09:56 +0000 (18:09 -0700)]
am
e7d3ee9d: Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
* commit '
e7d3ee9d81de13e992c7d063ca472d480956b0c6':
Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
Mathias Agopian [Fri, 17 Jun 2011 00:15:51 +0000 (17:15 -0700)]
Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
Also revert all dependent changes:
This reverts commit
8e18668d14adf601cbe5973030c310ec23d88461.
This reverts commit
69b4587bfbb3e98f793959d9123340360fa233a2.
This reverts commit
a9c9a4baf24700e8817d47d8ea8da1742caea0b5.
This reverts commit
2c0042b666a969091c931614f2fc0dce2f1cfac8.
This reverts commit
f6c8206735e7e078461e5f2aef6e1a1446fdd075.
This reverts commit
24855c09173a6caaec7dcedd0c2d7ce15121d39b.
Change-Id: I33e699640f3f59e42fa03c99a9a1b7af0d27d4d8
John Wang [Thu, 16 Jun 2011 23:50:05 +0000 (16:50 -0700)]
am
c826f92e: Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2
* commit '
c826f92e6f90f4157afd4ed69c6907ff768a0d6b':
Revert "Do not merge. Return null id for Non-phone device."
John Wang [Thu, 16 Jun 2011 23:47:18 +0000 (16:47 -0700)]
Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2
John Wang [Thu, 16 Jun 2011 23:30:02 +0000 (16:30 -0700)]
Revert "Do not merge. Return null id for Non-phone device."
This reverts commit
cea03df201dc6659654234bc5fbfebf1b6a06e42
Dianne Hackborn [Thu, 16 Jun 2011 22:22:10 +0000 (15:22 -0700)]
am
2f04883f: SDK only: integrate new sample code, deprecating along the way.
* commit '
2f04883ff880966d63d1aa4a1c7b05e497cfcc58':
SDK only: integrate new sample code, deprecating along the way.
Dianne Hackborn [Thu, 16 Jun 2011 20:31:57 +0000 (13:31 -0700)]
SDK only: integrate new sample code, deprecating along the way.
The new support library features and sample code for switching
between fragments using a TabHost now eliminates the utility of
the TabActivity class, so deprecate it. This also means there is
no longer any use in ActivityGroup or LocalActivityManager. Yay.
Also fix up things so the new support API demos are included in
the documentation.
Change-Id: I4f073b82787f32560ba1fa5b6a23746ecc8aecdc
Dianne Hackborn [Thu, 16 Jun 2011 21:49:08 +0000 (14:49 -0700)]
am
abd4dffc: Merge "New orientation handling. Only impacts SDK (aapt dump badging)." into honeycomb-mr2
* commit '
abd4dffc86202d48e50bd21807574fa861854dca':
New orientation handling. Only impacts SDK (aapt dump badging).
Dianne Hackborn [Thu, 16 Jun 2011 21:47:53 +0000 (14:47 -0700)]
Merge "New orientation handling. Only impacts SDK (aapt dump badging)." into honeycomb-mr2
Robert Greenwalt [Thu, 16 Jun 2011 21:44:57 +0000 (14:44 -0700)]
am
6b93f976: Merge "DO NOT MERGE" into honeycomb-mr2
* commit '
6b93f976c0cec32be39b3a17ea8195c4ac6b8052':
DO NOT MERGE
Robert Greenwalt [Thu, 16 Jun 2011 21:40:25 +0000 (14:40 -0700)]
Merge "DO NOT MERGE" into honeycomb-mr2
Robert Greenwalt [Thu, 16 Jun 2011 21:21:04 +0000 (14:21 -0700)]
DO NOT MERGE
backport of change 113518 from honeycomb-LTE. Fixes NPE in the
statusbar.
bug:
4518551
Change-Id: I9a85e6799d12052e7bc8c54d651bee789d885a2f
Xavier Ducrohet [Thu, 16 Jun 2011 20:39:31 +0000 (13:39 -0700)]
am
04ce8111: Bring in more layout lib changes from hc-mr1.
* commit '
04ce81113107d2bfa0b8248b13145b4cf24cb943':
Bring in more layout lib changes from hc-mr1.
Xavier Ducrohet [Fri, 10 Jun 2011 02:14:06 +0000 (19:14 -0700)]
Bring in more layout lib changes from hc-mr1.
fe051bb2 : Change the way the layoutlib instantiate its XmlPullParser.
A lot of the init code was duplicated so I made a ParserFactory class.
Also created an extension of the KXmlPullParser to override toString().
This allows easier debugging when dealing with multiple parsers (which
is always the case).
Also added some (disabled) debugging printf to deal with parser stack
as it can be tricky figuring out which parsers are in the stack at
which point.
8969147c : Fix case where the int[] attrs doesn't directly match a styleable.
In the case of the FastScroller the int[] is a custom mix of attr
instead of a int[] that exists as R.styleable.foo.
This makes our reflection based mechanism used to find the styleable
fail, so instead we search for each attribute separately (like
we probably should have done from the beginning).
0c264b35: Fix various cases of getDimension to report error if unit is missing.
if getDimention###() is called for a string that has no unit,
then an error is output through LayoutLog, but the rendering keeps
going by using dp as a default.
0beb7eea: Make (Bridge)TypedArray.getInteger() call out to getInt()
Only getInt() resolved attribute flags/enum and I'm not sure why
there's two to begin with.
Robert Greenwalt [Thu, 16 Jun 2011 18:34:03 +0000 (11:34 -0700)]
Merge "Reset connections AFTER we take down the network." into honeycomb-LTE
Robert Greenwalt [Wed, 15 Jun 2011 19:22:07 +0000 (12:22 -0700)]
Reset connections AFTER we take down the network.
If you do it before you have a race condition and some apps will
manage to reconnect on the dieing network before it goes and then
get no notification when it goes.
bug:
3408025
Change-Id: I5386ff313c759b3f687bc38731454ab43dbe76b8
John Wang [Thu, 16 Jun 2011 18:22:53 +0000 (11:22 -0700)]
Merge "Support SIM permanently disabled state." into honeycomb-LTE
Dianne Hackborn [Thu, 16 Jun 2011 18:11:23 +0000 (11:11 -0700)]
New orientation handling. Only impacts SDK (aapt dump badging).
This is a new way of determining whether an application requires
specific orientations, done by looking at any requirements in its
activity tags. Note that this won't catch all possible issues,
because applications can still force an orientation through Java
APIs, but the vast majority of applications that actually require
a specific orientation should be doing it this way because it the
easiest way and the only way to cleanly launch into the app from
a different orientation without doing some serious activity tricks.
Change-Id: I11d32104f6bc3d2a72aeeff1ca150b8f1c9f5588
Mathias Agopian [Thu, 16 Jun 2011 05:40:07 +0000 (22:40 -0700)]
am
8e18668d: revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)
* commit '
8e18668d14adf601cbe5973030c310ec23d88461':
revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)
Mathias Agopian [Thu, 16 Jun 2011 05:09:39 +0000 (22:09 -0700)]
am
52a43990: Revert "revert surfaceflinger leak fix as it uncovered a crasher on xoom"
* commit '
52a43990880b27808bcf562afcc4209d34728e6e':
Revert "revert surfaceflinger leak fix as it uncovered a crasher on xoom"
Mathias Agopian [Thu, 16 Jun 2011 03:42:47 +0000 (20:42 -0700)]
revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)
This reverts commit
52a43990880b27808bcf562afcc4209d34728e6e.
Change-Id: I1856a48f863b051395b8091ddfd1e01292fa1b1e
Mathias Agopian [Thu, 16 Jun 2011 03:41:24 +0000 (20:41 -0700)]
Revert "revert surfaceflinger leak fix as it uncovered a crasher on xoom"
This reverts commit
af6edba59e250adbdfa5b3c3be134f70d8c38a16.
Change-Id: I7793d3ca8a4d20a2b188364f47854328ab5f586d
Mathias Agopian [Thu, 16 Jun 2011 03:18:24 +0000 (20:18 -0700)]
am
d20d72d1: Merge "revert surfaceflinger leak fix as it uncovered a crasher on xoom" into honeycomb-mr2
* commit '
d20d72d193ab0d7f33c839d8bf9573b55abfebdc':
revert surfaceflinger leak fix as it uncovered a crasher on xoom
Mathias Agopian [Thu, 16 Jun 2011 03:16:15 +0000 (20:16 -0700)]
Merge "revert surfaceflinger leak fix as it uncovered a crasher on xoom" into honeycomb-mr2
Mathias Agopian [Thu, 16 Jun 2011 02:20:52 +0000 (19:20 -0700)]
revert surfaceflinger leak fix as it uncovered a crasher on xoom
Bug:
4600244
Change-Id: Ia68ebf0f243a051ff6a21b3863e3e5d259bbf7ac
Dianne Hackborn [Thu, 16 Jun 2011 00:10:33 +0000 (17:10 -0700)]
am
70921d61: Merge "We must keep up with the Joneses." into honeycomb-mr2
* commit '
70921d615496c5be8a19cbd1454378bb7d0201f3':
We must keep up with the Joneses.
Dianne Hackborn [Thu, 16 Jun 2011 00:08:04 +0000 (17:08 -0700)]
Merge "We must keep up with the Joneses." into honeycomb-mr2
Eric Fischer [Wed, 15 Jun 2011 23:41:44 +0000 (16:41 -0700)]
am
5e451faa: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit '
5e451faa0c22e943fb76d812f699d51fa11c5495':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 15 Jun 2011 23:38:43 +0000 (16:38 -0700)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
Dianne Hackborn [Wed, 15 Jun 2011 18:41:48 +0000 (11:41 -0700)]
We must keep up with the Joneses.
Change-Id: Ifa2ab0167c09ba18b24c8b6c618db807e17519f5
Eric Fischer [Wed, 15 Jun 2011 22:06:18 +0000 (15:06 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Iaff03724a335f856f7d28b1bc2c219f4208c4151
Justin Ho [Wed, 15 Jun 2011 21:56:03 +0000 (14:56 -0700)]
am
f4096041: Merge "Updated art for compat mode dialog." into honeycomb-mr2
* commit '
f409604122f959653fb789e9133e94a51e369693':
Updated art for compat mode dialog.
Justin Ho [Wed, 15 Jun 2011 21:52:52 +0000 (14:52 -0700)]
Merge "Updated art for compat mode dialog." into honeycomb-mr2
Wink Saville [Wed, 15 Jun 2011 21:31:16 +0000 (14:31 -0700)]
Merge "Always clear settings when entering Inactive state." into honeycomb-LTE
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: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
Daniel Sandler [Wed, 15 Jun 2011 19:00:10 +0000 (15:00 -0400)]
Updated art for compat mode dialog.
Also finalizes on the following language & ordering in the menu:
( ) Stretch to fill screen
( ) Zoom to fill screen
Bug:
4595256
Change-Id: Ie92b1e0d829341fd73043a562e78437af2b128ec
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:
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
Wink Saville [Wed, 15 Jun 2011 13:41:21 +0000 (06:41 -0700)]
Always clear settings when entering Inactive state.
Change-Id: I500b60a8122b790d60dbff5960b8c32500704b40
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: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: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: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: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
John Wang [Sat, 11 Jun 2011 00:23:51 +0000 (17:23 -0700)]
Support SIM permanently disabled state.
SIM card can get permanently disabled due to too many
PUK retries. The PERM_BLOCKED pin state of SIM application
represents this state.
This change decodes permanent disabled state and broadcasts it
via ICC_ABSENT intent with PERM_DISABLED reason. It also update
the lockscreen to show the prompt message.
bug:
4392059
Change-Id: I5e60dd65f48f42aa2e54db4cdebf803d6e666b99
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: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: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: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
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: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: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: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: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: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