37197 Commits

Author SHA1 Message Date
Andreas Huber
0a218eab61 Merge "Squashed commit of the following:" 2010-12-02 14:04:55 -08:00
Adam Powell
2523a8b31e Merge "Fix bug 3248786 - silly monkeys." 2010-12-02 14:03:13 -08:00
Xia Wang
9c25dc7840 am 5343f5a8: (-s ours) am 3591bebd: Merge "Restore Wi-Fi configuration after the test. DO NOT MERGE" into gingerbread
* commit '5343f5a84e66cc0806d20c16b96e612e80131ac2':
  Restore Wi-Fi configuration after the test. DO NOT MERGE
2010-12-02 13:48:53 -08:00
Adam Powell
049dd3d4a4 Fix bug 3248786 - silly monkeys.
Change-Id: I41306cae06a7b4fd3852e0760ae668c8d6eacc5d
2010-12-02 13:45:30 -08:00
Xia Wang
5343f5a84e am 3591bebd: Merge "Restore Wi-Fi configuration after the test. DO NOT MERGE" into gingerbread
* commit '3591bebd5957a8547fc54659179a19440636e7f9':
  Restore Wi-Fi configuration after the test. DO NOT MERGE
2010-12-02 13:44:54 -08:00
Xia Wang
3591bebd59 Merge "Restore Wi-Fi configuration after the test. DO NOT MERGE" into gingerbread 2010-12-02 13:40:23 -08:00
Gil Dobjanschi
cd023f98fa Merge "Added a callback interface to the generatePreview method." 2010-12-02 13:39:06 -08:00
Andreas Huber
b5c6afc208 Squashed commit of the following:
commit de99ae4a523ff5ec40b47071f22fdde1a4b2a0bf
Author: Andreas Huber <andih@google.com>
Date:   Thu Dec 2 13:18:40 2010 -0800

    Scan for sync words to find H.264 frame/AAC frame boundaries if PES packets do not start with them.

    Change-Id: If2861982ecb3006fac806105dbfcd1d43c2a4205

commit be23791ff0d037aa7073589cdc8bfc362e1c281d
Author: Andreas Huber <andih@google.com>
Date:   Thu Dec 2 13:12:39 2010 -0800

    Properly expand relative key URLs and strip surrounding quotes in the M3UParser.

    Change-Id: I013a6d83a64f095d090e5c7730298bdac7d03ab4

commit 0f1d8f65effe0cc42a265dd91d8b91dce6534325
Author: Andreas Huber <andih@google.com>
Date:   Thu Dec 2 13:11:27 2010 -0800

    Ugly hack that assumes that any http url containing "m3u8" refers to an httplive stream.

    Change-Id: I05d7bbc5dab0f9822558122b5b9dc2a109ed8518

commit 255f0d5cdb1072ecd66b47ee614bf574f1388e5a
Author: Andreas Huber <andih@google.com>
Date:   Thu Dec 2 13:10:56 2010 -0800

    Add one more mimetype "application/x-mpegurl" to identify httplive playlists.

    Change-Id: I63fd3b8c2539c9ee23c077df533157af78b10863

Change-Id: I135687383009dbe32d690c9ba8dea60159adc616
2010-12-02 13:27:47 -08:00
Gil Dobjanschi
786ecf849c Added a callback interface to the generatePreview method.
Change-Id: I7ba678aba47f232e1c320bb36decf59f80f3755d
2010-12-02 13:13:15 -08:00
Xavier Ducrohet
e6744db78e Merge "Layoutlib: update with new add/movechild API." 2010-12-02 12:37:44 -08:00
Robert Greenwalt
c8f16ec9c8 Merge "Load persisted global proxy settings." 2010-12-02 12:30:02 -08:00
Xavier Ducrohet
c8aec064f9 Layoutlib: update with new add/movechild API.
Change-Id: I33e3a07cd7db7fe996d1f52b84b4b3bf21065a51
2010-12-02 12:26:23 -08:00
Robert Greenwalt
b7090d68be Load persisted global proxy settings.
Was persisted before, but not loaded at boot.

Change-Id: I6d6b69ede3d212a8266847d73d07a037ae917788
2010-12-02 12:19:17 -08:00
Xavier Ducrohet
a69a3b2662 Merge "LayoutLib: Reuse canvas when possible." 2010-12-02 12:16:01 -08:00
Xavier Ducrohet
9eb6d412af LayoutLib: Reuse canvas when possible.
Also moved the prepare/cleanupThread methods to Bridge
as they are not really specific to the scene anymore.

Change-Id: I7b93821913ce4d2fcbe3d8be489be6533ff87e57
2010-12-02 10:58:19 -08:00
Romain Guy
5e3af5fcba Rescale ColorMatrix' vector to the [0..1] range
Bug #3246354

Change-Id: Idea7a1e6633c71119628315d65315076bc445eb0
2010-12-02 10:41:47 -08:00
Louis Huemiller
d4b7b63706 Merge "Remove const_cast to layer handle" 2010-12-02 10:31:19 -08:00
Gilles Debunne
e4cc316b1d Merge "Customized text selection action mode." 2010-12-02 10:25:43 -08:00
James Dong
6785699f19 am 80639875: am d4c5478a: Merge "Be conservative in estimating the file size limit." into gingerbread
* commit '806398755fdc63438b607856574e5b885ad98e6b':
  Be conservative in estimating the file size limit.
2010-12-02 10:24:24 -08:00
Gilles Debunne
f4dceb1946 Customized text selection action mode.
Refactored to use a custom Callback instance instead.

This instance can be shared by different TextView, which no longer have to
be overloaded.

Change-Id: I4749905d8e2057dab2b3ded62bd7c388d13d4e57
2010-12-02 10:24:03 -08:00
James Dong
806398755f am d4c5478a: Merge "Be conservative in estimating the file size limit." into gingerbread
* commit 'd4c5478a8664f64ff66db9ae25250afac78b7a74':
  Be conservative in estimating the file size limit.
2010-12-02 10:21:06 -08:00
James Dong
d4c5478a86 Merge "Be conservative in estimating the file size limit." into gingerbread 2010-12-02 10:13:36 -08:00
Wink Saville
d66c63e56e Merge "Remove the need for a token parameter from AsyncChannel." 2010-12-02 09:51:05 -08:00
Mike Lockwood
97c40a9dee Merge "PTP: Add android.provider.Ptp to the public API" 2010-12-02 09:19:01 -08:00
Mike Lockwood
1474c7a2b6 PTP: Add android.provider.Ptp to the public API
This will allow 3rd party apps to access files on digital cameras via the PTP protocol

BUG: 3210830

Change-Id: I06dbf2842a7eea2e0749e2124bb7b7a65e8901c0
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-02 12:13:37 -05:00
Jean-Baptiste Queru
edebb2fe1d am b087ceea: am 40eade14: Merge from open-source master
* commit 'b087ceead79bcb304e5793c6ae9109ce590847dc':
  Fix crash by "adb shell pm list permissions -f|-s"
2010-12-02 08:03:25 -08:00
Jean-Baptiste Queru
0d76ca7a97 am 5561ecff: am 077bc4ac: Merge from open-source master
* commit '5561ecff7bdcb8a8f377d442ca64ee87ee1356b8':
  Fix HTTP redirect missing statuscode 303 and 307
2010-12-02 08:03:21 -08:00
Jean-Baptiste Queru
b087ceead7 am 40eade14: Merge from open-source master
* commit '40eade14bb87d24903588de04449fdfe2e1795cb':
  Fix crash by "adb shell pm list permissions -f|-s"
2010-12-02 07:59:52 -08:00
Jean-Baptiste Queru
5561ecff7b am 077bc4ac: Merge from open-source master
* commit '077bc4ac019ad33abd613448e11d3ad501218991':
  Fix HTTP redirect missing statuscode 303 and 307
2010-12-02 07:59:49 -08:00
Jean-Baptiste Queru
40eade14bb Merge from open-source master
Change-Id: Ie25bbfbf12fa8902d9ba82cf2d4ed4c60d439e39
2010-12-02 07:55:06 -08:00
Jean-Baptiste Queru
077bc4ac01 Merge from open-source master
Change-Id: Ie45ea6581abd02be0cd7cffed05c0a0b6e65c338
2010-12-02 07:54:57 -08:00
Mike Lockwood
23f1538035 Merge "MediaScanner: Fix path mismatch in code that check for missing files in postScan()" 2010-12-02 07:38:37 -08:00
Mike Lockwood
f45853af50 MediaScanner: Fix path mismatch in code that check for missing files in postScan()
BUG: 3213640

Change-Id: I102d6c9ae95adadb855e2199380117808ccaa1ee
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-02 10:35:49 -05:00
Mike Lockwood
f474e38287 Merge "MTP: Add support for multiple properties in GetObjectPropList command" 2010-12-02 06:53:12 -08:00
Daniel Sandler
29c9b290b2 Merge "Do not allow lights out mode for old apps." 2010-12-02 05:32:35 -08:00
Mike Lockwood
7d7fb63071 MTP: Add support for multiple properties in GetObjectPropList command
Change-Id: Ib469a6c8141937aaa3e811345056195117abb4b2
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-02 08:16:12 -05:00
Romain Guy
eeb55e673f Don't reset ListView when changing the divider drawable.
Bug #3245172

Change-Id: I36e20bc63e503ffff9c2354e7cc48e5574bb0c4a
2010-12-02 00:12:46 -08:00
Romain Guy
7d69594580 Skip DIRTY_OPAQUE optimizations when ViewRoot changes the dirty region.
Bug #3159481

Change-Id: I97d6517f4648b3efe8b13a277e0374844a4d8455
2010-12-02 00:11:12 -08:00
Michael Jurka
23fe0ce427 Merge "Revert "Re-add performance optimization in View"" 2010-12-02 00:09:28 -08:00
Michael Jurka
67f23ba649 Revert "Re-add performance optimization in View"
Found reproducible cases of Launcher freezing up due to this change

This reverts commit 62490bd358cd001e00cb643cf3879d736c448788.

Change-Id: I1b10e05ee9f0c43566b53c7a11e61fc168d17a75
2010-12-02 00:06:26 -08:00
Adam Powell
fcca00accb Update themes; dialogs, metrics
Add divider attributes to LinearLayout, plus styles for borderless
buttons. Update text field assets.

Change-Id: I673acab1692cc028a0327e8c154069253a4d52e8
2010-12-01 23:23:21 -08:00
Wink Saville
cfce303cbd Remove the need for a token parameter from AsyncChannel.
By returning the channel object it self it is unnecessary
to have a token. Also, no current code needed it, if its
needed in the future it can be added back.

Change-Id: Ie1d2a1e885f9cd74e95663711ccefb760811bf16
2010-12-01 23:20:25 -08:00
Daniel Sandler
59485d7442 Do not allow lights out mode for old apps.
Legacy applications using FLAG_FULLSCREEN do so principally
to get as much screen real estate as possible; reducing
clutter is usually a secondary concern. The new UI style
takes care of the latter for the most part, and the former
is irrelevant because the xlarge system bar never goes away.

Lights out---and with it the disappearance of important
systemwide navigation controls---is probably *not* something
these apps are expecting!  Consider a game: it might want
FLAG_FULLSCREEN on phone to take over your entire display,
but might also rely on menu (to pause the game or bring up
options) and home (to allow you to exit). Lights out makes
these tasks much harder on the user because those buttons
aren't visible anymore.

So, to mitigate this potentially confusing situation, we now
disable lights out for fullscreen legacy apps.

[Hack, er, cleverness alert: We use NEEDS_MENU_KEY as a
shorthand for "legacy app." This flag is set by
pre-Honeycomb apps by default, but even an app built against
the current API can request this flag; be forewarned that if
you do, you won't get lights out mode in this particular
system bar implementation when you use FLAG_FULLSCREEN.]

Change-Id: If90d8354114ba45f9485b935b87ee575a30b9f87
2010-12-02 01:27:23 -05:00
Eric Fischer
dcafdb2e9b Merge "Import revised translations." 2010-12-01 17:00:16 -08:00
Xavier Ducrohet
b63eef7662 Merge "LayoutLib: implement insert/move/removeChild." 2010-12-01 16:36:58 -08:00
Eric Laurent
2aeaa3e0e2 am ed98a7c7: am 78d81851: Merge "Fix issue 2641884: Bluetooth volume is dependent on in call volume." into gingerbread
* commit 'ed98a7c776e0a7a20390b3d51f8f7ab7d292a7d0':
  Fix issue 2641884: Bluetooth volume is dependent on in call volume.
2010-12-01 16:30:42 -08:00
Brian Carlstrom
db1a3ba219 Merge "Resurrect SamplingProfilerIntegration" 2010-12-01 16:23:58 -08:00
Xavier Ducrohet
c14e7dd8ba LayoutLib: implement insert/move/removeChild.
Change-Id: I1c05ff4dc80e5ee4ea67d322acaf9c94276f84e1
2010-12-01 16:14:38 -08:00
Dianne Hackborn
30c9bd8955 Implement issue #3189564: New API to create an activity.
Change-Id: I7aef83324d653130eb3b2a148ba089d7347e6ba6
2010-12-01 16:13:44 -08:00
Eric Laurent
ed98a7c776 am 78d81851: Merge "Fix issue 2641884: Bluetooth volume is dependent on in call volume." into gingerbread
* commit '78d81851a8ef6691541215afb19e5bc690a4c3c0':
  Fix issue 2641884: Bluetooth volume is dependent on in call volume.
2010-12-01 16:04:09 -08:00