drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
37,526 Commits 1 Branch 0 Tags
Commit Graph

37526 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
a30c12a183 am 4a88013a: resolved conflicts for merge of bf1439c5 to stage-korg-master 
* commit '4a88013a4a06a9ea80e8419f94694936e6b013f0':
  Preserve flags field of event passed to injectKeyEvent()
 2010-12-02 15:21:35 -08:00
Jean-Baptiste Queru
4a88013a4a resolved conflicts for merge of bf1439c5 to stage-korg-master 
Change-Id: Iab543a7ee449025f1df5d58afaa8f8fdd4809c99
 2010-12-02 15:16:53 -08:00
James Dong
ded695bb30 Merge "If camera source uses the metadata, we must use HW encoder Software video encoders are not able to deal with non-YUV metadata in the video buffer sent from camera" 2010-12-02 15:01:46 -08:00
Jean-Baptiste Queru
bf1439c513 Merge "Preserve flags field of event passed to injectKeyEvent()" 2010-12-02 14:56:13 -08:00
Gil Dobjanschi
f3332a1d87 Merge "Remove the VideoEditorTestImpl" 2010-12-02 14:55:48 -08:00
James Dong
6312dd6d2b If camera source uses the metadata, we must use HW encoder 
Software video encoders are not able to deal with non-YUV metadata in the video buffer sent from camera

bug - 3242213

Change-Id: I97361ed88b2a687190e5129459011afff7f32c2d
 2010-12-02 14:50:07 -08:00
Fabrice Di Meglio
ac92fb05ff Merge "Add better SQL exception handling to the Sync framework (see bug #3202693)" 2010-12-02 14:32:20 -08:00
Eric Fischer
d6a46103bf Merge "Rename Indonesian and Hebrew translations to match Locale.java conventions" 2010-12-02 14:29:03 -08:00
Fabrice Di Meglio
eca53640a8 Add better SQL exception handling to the Sync framework (see bug #3202693) 
- do the reply.writeNoException() only if there are NO exceptions
- before, the code could actually generate an exception when asking for the count or the index,
and then the exception could not be unmaarshalled because we previously calling reply.writeNoException()

Change-Id: I241120878c3fc10fea5fbaeb74f9124b1413a3d4
 2010-12-02 14:28:32 -08:00
Joe Onorato
66fba93c22 Merge "Integrating updated SystemUI assets" 2010-12-02 14:23:20 -08:00
Russell Brenner
fdc676f6d6 Merge "Merge WebKit at r72274: Update WebKit revision number" 2010-12-02 14:11:41 -08:00
Justin Ho
73a3aec4a6 Integrating updated SystemUI assets 
Change-Id: I2683c16c30a543cc3365fa9f3a93a238aac272ed
 2010-12-02 14:11:06 -08:00
Russell Brenner
a9de7616c3 Merge WebKit at r72274: Update WebKit revision number 
Change-Id: Ia0b6e349b06f5cdbf81cfa4eb2cbbc2a55c41ee3
 2010-12-02 14:07:32 -08:00
Eric Fischer
d09a98173b Rename Indonesian and Hebrew translations to match Locale.java conventions 
Change-Id: Icf4f1896d13a4b6bf86503b16bde189f1834fdcc
 2010-12-02 14:05:29 -08:00
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
Gil Dobjanschi
731e46575a Remove the VideoEditorTestImpl 
Change-Id: I16302716f4aa32f69f48c9f4cc5732b421c1a675
 2010-12-02 13:50:49 -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
Steve Block
544295eebc Update WebView.addJavascriptInterface() to ignore null instances 
Bug: 3247571
Change-Id: If6a108fe926e45dc3e298f197f6534c575c560e2
 2010-12-02 18:40:06 +00: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
Mike Playle
c6ded10dd1 Preserve flags field of event passed to injectKeyEvent() 
This patch allows users of WindowManagerService.injectKeyEvent() to
set flags on the key event being injected.

In particular this allows long presses (FLAG_LONG_PRESS) to be
injected into the window manager.
 2010-12-02 16:25:46 +00: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
Jeff Hamilton
609b3e429a Merge remote branch 'ohd/gingerbread' into merge 2010-12-02 09:41:16 -06: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