37293 Commits

Author SHA1 Message Date
Hung-ying Tyan
7da1ffc9d2 am e2abd103: Merge "Set AudioGroup mode according to audio settings" into gingerbread
* commit 'e2abd103a2d311738ff1dd1e1d9b8e6c52aa870c':
  Set AudioGroup mode according to audio settings
2010-12-02 17:56:40 -08:00
Hung-ying Tyan
e2abd103a2 Merge "Set AudioGroup mode according to audio settings" into gingerbread 2010-12-02 17:50:33 -08:00
Xavier Ducrohet
3c78f2de35 LayoutLib: Update to use the new moveChild API.
Also, return supported capabilities.

Change-Id: I824120d50f2865a667dc6c81d455ae19321966b6
2010-12-02 17:49:11 -08:00
Joe Onorato
4276ca78f2 Merge "Tweak the settings panel assets / layout. Not done yet." 2010-12-02 17:29:41 -08:00
Joe Onorato
4d83413fff Merge "Make AbsSeekBar support having setThumb called after initialization is done." 2010-12-02 17:29:29 -08:00
Joe Onorato
c91d580258 Merge "Brightness and volume controls in the quick settings panel." 2010-12-02 17:29:12 -08:00
Joe Onorato
ea686131ee Merge "New SeekBar assets." 2010-12-02 17:29:02 -08:00
Joe Onorato
3d5d628872 Merge "Show the operator or wifi ssid in the status bar panel." 2010-12-02 17:28:47 -08:00
Romain Guy
9d0161799c Merge "Correctly index transparent quads when generating 9patch meshes. Bug #3250026" 2010-12-02 17:15:05 -08:00
Romain Guy
bd41a11078 Correctly index transparent quads when generating 9patch meshes.
Bug #3250026

Change-Id: Id7e051e9ed81f6b4e7748756503d8055ac7d531a
2010-12-02 17:16:26 -08:00
Joe Onorato
75362101ac Tweak the settings panel assets / layout. Not done yet.
Change-Id: Ib014947f1260cb290818b7af0151fe0c165950c6
2010-12-02 16:52:18 -08:00
Joe Onorato
2e585f7e22 Make AbsSeekBar support having setThumb called after initialization is done.
Change-Id: Ic7c2e1a4ec067f50a95aaff924bbd7bc453a575f
2010-12-02 16:52:17 -08:00
Joe Onorato
1e28f4110f Brightness and volume controls in the quick settings panel.
Change-Id: I2d2394c84a2783772f16dbeb88664381917e0ead
2010-12-02 16:52:16 -08:00
Joe Onorato
df7cc31ad0 New SeekBar assets.
Change-Id: Ic4a470ea29be04e6f7c91b3ab72f4b814a40b8e0
2010-12-02 16:52:15 -08:00
Joe Onorato
355ebc09d2 Show the operator or wifi ssid in the status bar panel.
Change-Id: Ia2983bce35c5f2ab706995777c80e96cc9a4c2ae
2010-12-02 16:52:14 -08:00
Gilles Debunne
9d5055a2bc Merge "Fix in vertical measurement in text lines with different text sizes" 2010-12-02 16:47:50 -08:00
Xia Wang
3c3743c541 Merge "Add Wi-Fi connection test for static IP" 2010-12-02 16:39:53 -08:00
Xia Wang
a42a1e6b6f Add Wi-Fi connection test for static IP
- Add support in access point parser to support static ip settings
- Add Wi-Fi test with static IP configuration
- Use WifiManager new APIs
- Fix issue: if the expected AP is not in the scan list, retry scanning.
  Maximum is 5.
- Fix issue: wait for wifi state change before connecting to AP.

Change-Id: Id09b921c8a6a4b14f3c65cdea0b58c7e6f395520
2010-12-02 16:25:26 -08:00
Gilles Debunne
0bb000931b Fix in vertical measurement in text lines with different text sizes
The last span of the TextLine was defining the FontMetrics, instead of
min/maxing the different values.

Bug 3220698

Change-Id: I7394b1699a15aeee4cc38462d561faf329d3e1f6
2010-12-02 16:18:54 -08:00
Kazuhiro Ondo
6ef74b1b07 Add reason field to DEACTIVATE_DATA_CALL request.
Commit 323f059d65db8413ee2ca8ce04533bc00e4f84e4 introduced a side effect that
PPP and MIP cannot be disconnected gracefully in case of 1X data calls.
The new disconnect reason field in DEACTIVATE_DATA_CALL will help RIL and Modem
to know whether the disconnect was done for modem shutdown or not. And
the followings can be achieved at the same time.

- Graceful PPP termination
- MIP de-registration
- RF Release Order with "Power Down De-registration" if modem is powered off.

(Also cleaned up the deprecated functions for setup/deactivate default PDP)

Change-Id: If79842ad05827326b6994e1148a6ae68b4467c45
2010-12-02 16:15:22 -08:00
Brad Fitzpatrick
bcee0ef7ea Merge "sampling profiler hz -> ms" 2010-12-02 16:10:02 -08:00
Jeff Brown
fddcb06174 Merge "Improve support for external keyboards." 2010-12-02 16:03:05 -08:00
Jeff Brown
9065504a63 Improve support for external keyboards.
Use Vendor ID, Product ID and optionally the Version to
locate keymaps and configuration files for external devices.

Moved virtual key definition parsing to native code so that
EventHub can identify touch screens with virtual keys and load
the appropriate key layout file.

Cleaned up a lot of old code in EventHub.

Fixed a regression in ViewRoot's fallback event handling.

Fixed a minor bug in FileMap that caused it to try to munmap
or close invalid handled when released if the attempt to map
the file failed.

Added a couple of new String8 conveniences for formatting strings.

Modified Tokenizer to fall back to open+read when mmap fails since
we can't mmap sysfs files as needed to open the virtual key
definition files in /sys/board_properties/.

Change-Id: I6ca5e5f9547619fd082ddac47e87ce185da69ee6
2010-12-02 16:01:32 -08:00
Brad Fitzpatrick
d7ad0d2837 sampling profiler hz -> ms
Goes along with def41ec2e8 / Ifcfc343

Change-Id: Ia5cc90e6f8d83dcdf40802859002507980310d06
2010-12-02 15:30:23 -08:00
Jean-Baptiste Queru
cd5e8b60ca am a30c12a1: am 4a88013a: resolved conflicts for merge of bf1439c5 to stage-korg-master
* commit 'a30c12a18326ed4d608382cd4f970a6e15a58bf5':
  Preserve flags field of event passed to injectKeyEvent()
2010-12-02 15:25:18 -08:00
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