48502 Commits

Author SHA1 Message Date
Irfan Sheriff
c74eacde30 resolved conflicts for merge of 267a6181 to honeycomb-LTE
Change-Id: I95d459c937f788ed15f178e85692e1c393bdaa04
2011-06-22 07:11:42 -07:00
Irfan Sheriff
885c3c11cf am bc4ddef4: Merge "DO NOT MERGE Revert "Fix lease duration handling"" into honeycomb-mr2
* commit 'bc4ddef479011e200d0273fe73c22922a85de1fe':
  DO NOT MERGE Revert "Fix lease duration handling"
2011-06-21 14:29:42 -07:00
Irfan Sheriff
267a6181a5 Merge "DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine"" into honeycomb-mr2 2011-06-21 14:23:17 -07:00
Irfan Sheriff
bc4ddef479 Merge "DO NOT MERGE Revert "Fix lease duration handling"" into honeycomb-mr2 2011-06-21 14:23:09 -07:00
Irfan Sheriff
58d1bb497e DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine"
This reverts commit fe3b33d4ead06c546202753e38188db5e2eaa7fa.

Change-Id: I3a9ae1f0d17e7a154d27d4f3f3eb1efa21a34f64
2011-06-21 11:38:23 -07:00
Bruno Oliveira
f1c71771a2 am da61eab8: Merge "Integrating RandomMusicPlayer sample into tree." into honeycomb-mr2
* commit 'da61eab862dabe00f95c784a01c019e4f7776b23':
  Integrating RandomMusicPlayer sample into tree.
2011-06-21 11:11:18 -07:00
Bruno Oliveira
da61eab862 Merge "Integrating RandomMusicPlayer sample into tree." into honeycomb-mr2 2011-06-21 11:07:47 -07:00
Irfan Sheriff
7dd1200589 DO NOT MERGE Revert "Fix lease duration handling"
This reverts commit 56878760c3f0255dbcc8d78572f784b96ee36cb0.
2011-06-21 11:01:54 -07:00
Scott Main
a663299213 am 04295266: add api level 13 flag for docs
* commit '04295266b03f3c588b8be6b6be409d59f757b27b':
  add api level 13 flag for docs
2011-06-21 10:31:09 -07:00
Scott Main
04295266b0 add api level 13 flag for docs
Change-Id: I03a7739c923b1f38de6b4e77374daed438559548
2011-06-21 10:17:18 -07:00
Daniel Sandler
e0da3f3bc9 am 444336dd: Merge "Fix crazy notification panel background." into honeycomb-mr2
* commit '444336dd5f233c59e5a222d366d2498c888664b5':
  Fix crazy notification panel background.
2011-06-20 17:30:38 -07:00
Daniel Sandler
444336dd5f Merge "Fix crazy notification panel background." into honeycomb-mr2 2011-06-20 17:29:24 -07:00
Scott Main
de937ac009 am bb64fa1e: docs: fix a couple typos
* commit 'bb64fa1e3dde8910397d159eaa300c4444b0073c':
  docs: fix a couple typos
2011-06-20 17:28:41 -07:00
Scott Main
20fe290e2c am beeb7762: docs: fix broken link
* commit 'beeb776209446ea45252af5bbc1fe8a463b2001b':
  docs: fix broken link
2011-06-20 17:26:48 -07:00
Scott Main
bb64fa1e3d docs: fix a couple typos
Change-Id: I65e9b59eb48985f21eeea5d0d944b0d8e8b92023
2011-06-20 17:22:50 -07:00
Scott Main
beeb776209 docs: fix broken link
Change-Id: I5ac2eed824cef817d309b4e4794c430882db5de8
2011-06-20 17:17:39 -07:00
Robert Greenwalt
4906376f58 Just a random fix.
Don't re-lookup something - use the local holding the early lookup.

Change-Id: I6d9fac89651c99a84060238c8a6f6a936b1167ea
2011-06-20 14:15:56 -07:00
Robert Greenwalt
b427f0e696 Merge "Fix tethering upstream determination." into honeycomb-LTE 2011-06-20 11:47:49 -07:00
Daniel Sandler
f1dd26b6fd Fix crazy notification panel background.
The compatibility mode dialog (shown only once, ever) was clobbering its layout params.

Bug: 4723617
Change-Id: I7899293b72c8e480a97a10a88f62754ff415f343
2011-06-20 14:44:35 -04:00
Robert Greenwalt
ccf83af101 Fix tethering upstream determination.
Used to use iface names, but on mobile ifaces are multipurpose.
Refined to use ConnectivityService types.
bug:4530116

Change-Id: Iaa632d5f540d27ffff683bd7d94f8004bf422e71
2011-06-20 11:09:23 -07:00
Robert Ly
d1a19b10ef am c7c1ba50: Merge "cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2
* commit 'c7c1ba5071456a813abbdadfdbe94287b06877e7':
  cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7
2011-06-20 09:44:59 -07:00
Robert Ly
152e5f5676 am 329e0b90: Merge "cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2
* commit '329e0b9020f3b8cd1265c265cdf00b438960cbe1':
  cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb
2011-06-20 09:44:55 -07:00
Robert Ly
c7c1ba5071 Merge "cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2 2011-06-20 09:37:51 -07:00
Robert Ly
329e0b9020 Merge "cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2 2011-06-20 09:37:36 -07:00
Mathias Agopian
48294b0d93 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)
2011-06-16 18:09:56 -07:00
Mathias Agopian
e7d3ee9d81 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
2011-06-16 17:22:28 -07:00
John Wang
c6b32054c6 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."
2011-06-16 16:50:05 -07:00
John Wang
c826f92e6f Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2 2011-06-16 16:47:18 -07:00
John Wang
fe9aa2706f Revert "Do not merge. Return null id for Non-phone device."
This reverts commit cea03df201dc6659654234bc5fbfebf1b6a06e42
2011-06-16 16:30:02 -07:00
Dianne Hackborn
9a73c4d3a9 am 2f04883f: SDK only: integrate new sample code, deprecating along the way.
* commit '2f04883ff880966d63d1aa4a1c7b05e497cfcc58':
  SDK only: integrate new sample code, deprecating along the way.
2011-06-16 15:22:10 -07:00
Dianne Hackborn
2f04883ff8 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
2011-06-16 14:52:00 -07:00
Dianne Hackborn
f1c5dbbd45 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).
2011-06-16 14:49:08 -07:00
Dianne Hackborn
abd4dffc86 Merge "New orientation handling. Only impacts SDK (aapt dump badging)." into honeycomb-mr2 2011-06-16 14:47:53 -07:00
Robert Greenwalt
62385d5e31 am 6b93f976: Merge "DO NOT MERGE" into honeycomb-mr2
* commit '6b93f976c0cec32be39b3a17ea8195c4ac6b8052':
  DO NOT MERGE
2011-06-16 14:44:57 -07:00
Robert Greenwalt
6b93f976c0 Merge "DO NOT MERGE" into honeycomb-mr2 2011-06-16 14:40:25 -07:00
Robert Greenwalt
5a3e91f870 DO NOT MERGE
backport of change 113518 from honeycomb-LTE.  Fixes NPE in the
statusbar.

bug:4518551
Change-Id: I9a85e6799d12052e7bc8c54d651bee789d885a2f
2011-06-16 14:21:04 -07:00
Xavier Ducrohet
d1abd94f57 am 04ce8111: Bring in more layout lib changes from hc-mr1.
* commit '04ce81113107d2bfa0b8248b13145b4cf24cb943':
  Bring in more layout lib changes from hc-mr1.
2011-06-16 13:39:31 -07:00
Xavier Ducrohet
04ce811131 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.
2011-06-16 13:23:53 -07:00
Robert Greenwalt
5f3505121b Merge "Reset connections AFTER we take down the network." into honeycomb-LTE 2011-06-16 11:34:03 -07:00
Robert Greenwalt
ec896c6a86 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
2011-06-16 11:26:54 -07:00
John Wang
ff42c04d15 Merge "Support SIM permanently disabled state." into honeycomb-LTE 2011-06-16 11:22:53 -07:00
Dianne Hackborn
f77ae6e65a 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
2011-06-16 11:13:20 -07:00
Robert Ly
235ac0160f cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb
Change-Id: Ic18859f171d03f8562ad91761da40a55b59f47ea
2011-06-16 11:05:46 -07:00
Robert Ly
5c0213c967 cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7
Change-Id: Ica88f38229a66bfad60cbaf5db4bf94cd99c1d19
2011-06-16 11:00:47 -07:00
Mathias Agopian
0887b8c2e5 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)
2011-06-15 22:40:07 -07:00
Mathias Agopian
d5244e0a88 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"
2011-06-15 22:09:39 -07:00
Mathias Agopian
8e18668d14 revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)
This reverts commit 52a43990880b27808bcf562afcc4209d34728e6e.

Change-Id: I1856a48f863b051395b8091ddfd1e01292fa1b1e
2011-06-15 20:45:32 -07:00
Mathias Agopian
52a4399088 Revert "revert surfaceflinger leak fix as it uncovered a crasher on xoom"
This reverts commit af6edba59e250adbdfa5b3c3be134f70d8c38a16.

Change-Id: I7793d3ca8a4d20a2b188364f47854328ab5f586d
2011-06-15 20:42:25 -07:00
Mathias Agopian
7ecdeb6e54 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
2011-06-15 20:18:24 -07:00
Mathias Agopian
d20d72d193 Merge "revert surfaceflinger leak fix as it uncovered a crasher on xoom" into honeycomb-mr2 2011-06-15 20:16:15 -07:00