53095 Commits

Author SHA1 Message Date
Alex Sakhartchouk
9347d9ad92 Merge "Adding ability to read back fbo data to renderscript" 2011-06-16 15:15:14 -07:00
Irfan Sheriff
e1f9064e35 Fix network state handling
Change I242cda97 introduced a regression where network state
was being modified on any supplicant state change.

Revert the old behavior of only changeing network detailed state
based on supplicant state change in a disconnected state

Bug: 4690073
Change-Id: I927cc5fa36b862cc54661b033939f543cd15d31f
2011-06-16 15:02:17 -07:00
Dianne Hackborn
4bd44535fe am 810dc598: am f1c5dbbd: am abd4dffc: Merge "New orientation handling. Only impacts SDK (aapt dump badging)." into honeycomb-mr2
* commit '810dc5980c504a89974c07fcbd28a2b5dffb47de':
  New orientation handling.  Only impacts SDK (aapt dump badging).
2011-06-16 14:57:59 -07:00
Dianne Hackborn
810dc5980c am f1c5dbbd: am abd4dffc: Merge "New orientation handling. Only impacts SDK (aapt dump badging)." into honeycomb-mr2
* commit 'f1c5dbbd457bb14d3673508aaba497cdc328a1ef':
  New orientation handling.  Only impacts SDK (aapt dump badging).
2011-06-16 14:55:01 -07:00
Robert Greenwalt
e472fd2b31 am 9bf1a0c3: (-s ours) am 62385d5e: am 6b93f976: Merge "DO NOT MERGE" into honeycomb-mr2
* commit '9bf1a0c3c7e3c26df170519867c5daeee959791e':
  DO NOT MERGE
2011-06-16 14:54:33 -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
Robert Greenwalt
9bf1a0c3c7 am 62385d5e: am 6b93f976: Merge "DO NOT MERGE" into honeycomb-mr2
* commit '62385d5e3183d35b22618fb91bb2dfa0de7e5fd4':
  DO NOT MERGE
2011-06-16 14:50:22 -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
Fabrice Di Meglio
c1f9486a3e Merge "Update getLayoutDirectionFromLocale() for using ICU" 2011-06-16 14:41:50 -07:00
Fabrice Di Meglio
c01924f156 Update getLayoutDirectionFromLocale() for using ICU
- now relying on ICU.getScript() and ICU.addLikelySubtags() for getting the locale script
- clean unit tests imports

Change-Id: Icdc45fa78490d1e2dde0e83bca0feea8aa205cdf
2011-06-16 14:40:31 -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
Chet Haase
b47f2f9533 Merge "Fix crash in ViewPropertyAnimator for unparented view." 2011-06-16 14:06:36 -07:00
Xavier Ducrohet
dd9f7750e3 Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base 2011-06-16 14:04:57 -07:00
Xavier Ducrohet
9340ab4a21 am 0be8522b: am d1abd94f: am 04ce8111: Bring in more layout lib changes from hc-mr1.
* commit '0be8522b430aca8d90023d7c7e5ef510aa48adc7':
  Bring in more layout lib changes from hc-mr1.
2011-06-16 14:04:18 -07:00
Jeff Sharkey
2242af25df Add permission to fix NetworkPolicy tests.
Change-Id: I4d5265b2b08c1ec0c42b71ad0ceeb9952094caa0
2011-06-16 14:03:43 -07:00
Chet Haase
3a000a52d6 Fix crash in ViewPropertyAnimator for unparented view.
Mechanism for removing possible earlier animations should
call removeCallbacks on the view, not on the (possibly null)
handler of the view.

Change-Id: I76c6f0bea5e009be9197a6e49e9360ed9ef1a9cb
2011-06-16 14:03:08 -07:00
Xavier Ducrohet
0be8522b43 am d1abd94f: am 04ce8111: Bring in more layout lib changes from hc-mr1.
* commit 'd1abd94f57c0162186c57aea98790e8fa281e0a2':
  Bring in more layout lib changes from hc-mr1.
2011-06-16 13:55:30 -07:00
RoboErik
da67237225 Merge "Add DroidDocs to Events class" 2011-06-16 13:51:16 -07:00
RoboErik
fe37b49dd4 Add DroidDocs to Events class
Change-Id: I85b14e8a553a1bc160d05a9f076d4aea77e9a39f
2011-06-16 13:40:02 -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
Jeff Sharkey
ad4c9ed7de Merge "DownloadManager flags for network policy." 2011-06-16 13:39:02 -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
John Reck
179cfcf654 Merge "Inline SeekBarPreference" 2011-06-16 13:21:52 -07:00
Jeff Sharkey
1a30395358 DownloadManager flags for network policy.
Handful of DownloadManager flags to record when a download was paused
because of NetworkPolicyManager rules.

Change-Id: I99fc47f529cb6c8a42dbeca049e0cd0f1556eac4
2011-06-16 13:04:34 -07:00
Robert Greenwalt
4f1f7d3158 am 241b65ac: am 5f350512: Merge "Reset connections AFTER we take down the network." into honeycomb-LTE
* commit '241b65aca93e263f0869c5bec4ad1dbda0dec6db':
  Reset connections AFTER we take down the network.
2011-06-16 12:50:46 -07:00
John Wang
1766974b02 am 03cbb58e: am ff42c04d: Merge "Support SIM permanently disabled state." into honeycomb-LTE
* commit '03cbb58e2418dc22ae18a8648404382da4ee46e8':
  Support SIM permanently disabled state.
2011-06-16 12:49:17 -07:00
Robert Greenwalt
241b65aca9 am 5f350512: Merge "Reset connections AFTER we take down the network." into honeycomb-LTE
* commit '5f3505121b761dbd3bba62d1603fbab49de139b9':
  Reset connections AFTER we take down the network.
2011-06-16 12:42:15 -07:00
Mathias Agopian
19f913a887 am 35e6d686: (-s ours) am 0887b8c2: am 8e18668d: revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)
* commit '35e6d6867c63ad254e95325206aa7a927edd6797':
  revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)
2011-06-16 12:41:00 -07:00
Mathias Agopian
73b054ae37 am 552bd670: (-s ours) am d5244e0a: am 52a43990: Revert "revert surfaceflinger leak fix as it uncovered a crasher on xoom"
* commit '552bd670071b519d97124621a3c11dc98062c12b':
  Revert "revert surfaceflinger leak fix as it uncovered a crasher on xoom"
2011-06-16 12:40:44 -07:00
Mathias Agopian
21bd76157e am 85c14352: (-s ours) am 7ecdeb6e: am d20d72d1: Merge "revert surfaceflinger leak fix as it uncovered a crasher on xoom" into honeycomb-mr2
* commit '85c14352a4f8946a6908eac140936080536fa575':
  revert surfaceflinger leak fix as it uncovered a crasher on xoom
2011-06-16 12:39:48 -07:00
John Wang
03cbb58e24 am ff42c04d: Merge "Support SIM permanently disabled state." into honeycomb-LTE
* commit 'ff42c04d15e000f6295e796e154cc60c54aa078b':
  Support SIM permanently disabled state.
2011-06-16 12:34:34 -07:00
John Reck
014fea2a66 Inline SeekBarPreference
Dialog-based SeekBarPreference renamed to SeekBarDialogPreference
 New inline SeekBarPreference added

Change-Id: I7a5d8f7aa554c4af4086a9bcc74cf07879c8523c
2011-06-16 12:34:02 -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
Philip Milne
b6a6d59547 Merge "Future-proofing: change Alignment interface to abstract class and add a parameter for measurementType." 2011-06-16 11:18:42 -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
Alex Sakhartchouk
8650c32907 Adding ability to read back fbo data to renderscript
Change-Id: Ie684c26cbcde22f2483b43415dfc39a3de22c5a1
2011-06-16 11:05:13 -07:00
Chia-chi Yeh
d6f69d0e52 Merge "VPN: migrate from generic Bundle to our own Parcelable VpnConfig." 2011-06-16 10:34:34 -07:00
Gloria Wang
464c120266 Merge "-Fix some typo -Remove one unnecessary memory allocation" 2011-06-16 10:23:04 -07:00
Jean-Baptiste Queru
ce6f85ec40 Merge f28f1de3 - regen current.txt
Change-Id: I7875932a0634542251f53855b4e8620a089de05f
2011-06-16 10:21:18 -07:00
Daniel Sandler
396263fc97 Make the Notify Builder test usable on phones.
Change-Id: Ibaa3b2b99bde7dfd3d9fc6bc4c0068fc1d7b914d
2011-06-16 13:02:02 -04:00
Eric Fischer
b0733e2c4f am a5608e3a: (-s ours) am c0e84cf3: am 5e451faa: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit 'a5608e3a67a86f55e8c5ce971934f32c398f2525':
  Import revised translations.  DO NOT MERGE
2011-06-16 09:31:53 -07:00
Irfan Sheriff
32d24f8fe7 am 030a8c65: am a4644307: (-s ours) am df1734e3: Fix lease duration handling
* commit '030a8c65dff975e19b78d957dceee61e73451ea7':
  Fix lease duration handling
2011-06-16 09:31:21 -07:00
Narayan Kamath
edd12149f0 Merge "Don't enforce defaults any more in the TextToSpeech API." 2011-06-16 03:05:07 -07:00
Narayan Kamath
c3edf2a01a Don't enforce defaults any more in the TextToSpeech API.
This has been discussed in an email thread. This brings the
text to speech API in line with other android APIs.

The user can set default speech rates / languages and
engine preferences, which the API obeys BUT these can be
overriden by individual apps (much like intent.setComponent
and intent.setClassName can be used to launch a specific
handler for a given intent).

Also, all installed engines are enabled by default. The
user is shown the "data privacy" warning every time an
installed engine is set to the default.

Change-Id: I24f5f331b3a7cc7ce1a62962192e3a452bdca9d4
2011-06-16 10:31:45 +01:00
Kenny Root
9266847e6b Merge "Fix crash determining direction of invalid locale" 2011-06-16 02:30:37 -07:00