49827 Commits

Author SHA1 Message Date
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
69ff6a47c6 am a6632992: am 04295266: add api level 13 flag for docs
* commit 'a6632992135cf25b273abf7f239d7d378c936007':
  add api level 13 flag for docs
2011-06-21 10:42:41 -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
Jaikumar Ganesh
d762f063be DO NOT MERGE Incoming Bluetooth Connection requests - dialog.
This sends the intents to the Settings app to show
the dialogs for the incoming connection requests.

Change-Id: Ibe267f7cda28ce2a46c25800df2e8ac685b0b9e6
2011-06-21 09:27:12 -07:00
Daniel Sandler
e89d4b5d69 am e0da3f3b: am 444336dd: Merge "Fix crazy notification panel background." into honeycomb-mr2
* commit 'e0da3f3bc9aaefbf3e3737b69e91b7823f639751':
  Fix crazy notification panel background.
2011-06-20 17:34:33 -07:00
Scott Main
fe8e2fb32f am de937ac0: am bb64fa1e: docs: fix a couple typos
* commit 'de937ac00900de7d9c3f15328778647401eb836e':
  docs: fix a couple typos
2011-06-20 17:32:40 -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
Scott Main
35837c3234 am 20fe290e: am beeb7762: docs: fix broken link
* commit '20fe290e2c9fdaca94eb334187daf971796afd0d':
  docs: fix broken link
2011-06-20 17:30:15 -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
e813ea5a11 am 4906376f: Just a random fix.
* commit '4906376f58d617083034c5899d06a73b7c1cc114':
  Just a random fix.
2011-06-20 16:46:20 -07:00
Nick Pelly
6ce7039482 am 6f1a8edc: am 17523abb: NFC Adapter Extras API update.
* commit '6f1a8edcc00db40a8ad300e15a23f7f1de298c3b':
  NFC Adapter Extras API update.
2011-06-20 15:58:40 -07:00
Nick Pelly
6f1a8edcc0 am 17523abb: NFC Adapter Extras API update.
* commit '17523abb45b7f77f35af53e895d74be13f2314e0':
  NFC Adapter Extras API update.
2011-06-20 15:54:07 -07:00
Scott Main
ea41e8d067 docs: add Lenevo driver info
Change-Id: I5ffe82d26375c76cccd3aaa493448de454cdab1c
2011-06-20 15:50:12 -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
Conley Owens
587e9563d6 am c1b62e3b: am bf5adfa5: Merge "Check if we are in daylight time when calculating timezone"
* commit 'c1b62e3ba91d69dd75569b480aec55be8f808331':
  Check if we are in daylight time when calculating timezone
2011-06-20 13:20:49 -07:00
Conley Owens
c1b62e3ba9 am bf5adfa5: Merge "Check if we are in daylight time when calculating timezone"
* commit 'bf5adfa5e558827fbb4771720433887bb3cbaefd':
  Check if we are in daylight time when calculating timezone
2011-06-20 13:04:45 -07:00
Robert Greenwalt
7a652bc86a resolved conflicts for merge of b427f0e6 to honeycomb-plus-aosp
Change-Id: I8e287fd814b4a3ca72014ea060a1de043d1b4713
2011-06-20 12:15:24 -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
Conley Owens
bf5adfa5e5 Merge "Check if we are in daylight time when calculating timezone" 2011-06-20 11:01:41 -07:00
Robert Ly
b2dba9910b am d1a19b10: am c7c1ba50: Merge "cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2
* commit 'd1a19b10ef0bb0369fa7ed9a16fb8f8d6320e05f':
  cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7
2011-06-20 09:51:08 -07:00
Robert Ly
5520ec6f89 am 152e5f56: am 329e0b90: Merge "cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2
* commit '152e5f56762c9db80d2b65fda8b13e3914f05d86':
  cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb
2011-06-20 09:50:39 -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
Jean-Baptiste Queru
49b7338514 am ff3ead50: (-s ours) am e3b05d09: Merge "Tweaks for forward-compatibility"
* commit 'ff3ead5072721bfb24202ff9b041cc4291f34e21':
  Tweaks for forward-compatibility
2011-06-20 09:14:31 -07:00
Jean-Baptiste Queru
ff3ead5072 am e3b05d09: Merge "Tweaks for forward-compatibility"
* commit 'e3b05d09163257b888c86f2a560e10c48f4cf029':
  Tweaks for forward-compatibility
2011-06-20 09:05:07 -07:00
Jean-Baptiste Queru
e3b05d0916 Merge "Tweaks for forward-compatibility" 2011-06-18 09:45:53 -07:00
Jean-Baptiste Queru
84d0ccf16c Tweaks for forward-compatibility
Change-Id: Iec525edc186e78d5d865f82dd5b1f56263c22e86
2011-06-18 09:42:04 -07:00
Raphael Moll
865c3bef54 Laoutlib_creator: keep original of delegate methods.
For specific methods, Layoublib_create can rewrite the implementation
of a method to invoke a delegate instead of the original code. This
allows layoutlib to implement native code or override existing behavior.

This patch also 'saves' the original implementation of a rewritten
method so that the delegate can access the original implementation
as needed. Obviously this is only done for non-native methods.

Given a non-native SomeClass.MethodName, we generate 2 methods:
- A copy of the original method named "SomeClass.MethodName_original".
  The content is the original method as-is from the reader.
- A brand new implementation of SomeClass.MethodName which calls to a
  non-existing method named "SomeClass_delegate.MethodName".
  The implementation of this 'delegate' method is done in layoutlib_brigde.

Change-Id: I5ca2cd3ac55991a8e8a51c417e75ee447bf9e9e6
2011-06-17 19:07:13 -07:00
Nick Pelly
17523abb45 NFC Adapter Extras API update.
Remove
o registerTearDownApdus()
o deregisterTearDownApdus()
They were already NO-OPS, and don't work in the general case.

Add
o authenticate(byte[] token)
This future proofs us for a more flexible access control scheme.

Change-Id: I4cb67ceeb63d61cbc333c9b244a96d8687402168
2011-06-17 14:51:40 -07:00
Xavier Ducrohet
ea5f0d0543 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.

Change-Id: I015111263d2a2bee76834978ae71eef79defdae3
2011-06-16 18:26:25 -07:00
Xavier Ducrohet
d6465e10c2 CherryPick 06942bc4 from hc-mr1. do not merge.
Layoutlib - use the new getParser callback when possible.

Change-Id: I72b867aa573fcc07d610f139da3c90b1b654633c
2011-06-16 18:26:25 -07:00
Xavier Ducrohet
6b62c82848 CherryPick 988eeeb5 from hc-mr1. do not merge.
Support for custom declare-styleable attr with enum/flag in layoutlib.

Change-Id: I8a5b7cc629d61996ffade9aabd9d4d10961eb411
2011-06-16 18:26:24 -07:00
Mathias Agopian
ec15afca08 DO NOT MERGE. may fix build on some version of gcc
Change-Id: Id99d390862731fd3fbc009dbffdf1d2a59dbe348
2011-06-16 18:26:14 -07:00
Mathias Agopian
3b916233cb am 48294b0d: am e7d3ee9d: Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
* commit '48294b0d9388cff632f0e6ae5220305d342c76fb':
  Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
2011-06-16 18:15:19 -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
e21217af64 am c6b32054: am c826f92e: Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2
* commit 'c6b32054c67901b0627ad99e4bd8b15c5cc2fb90':
  Revert "Do not merge. Return null id for Non-phone device."
2011-06-16 17:14: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