Commit Graph

24866 Commits

Author SHA1 Message Date
Joe Onorato
24b26c0766 Merge "New SeekBar assets." 2010-12-02 17:29:02 -08:00
Joe Onorato
de463ed34b Merge "Show the operator or wifi ssid in the status bar panel." 2010-12-02 17:28:47 -08:00
Romain Guy
ebb3927950 Merge "Correctly index transparent quads when generating 9patch meshes. Bug #3250026" 2010-12-02 17:15:05 -08:00
Gilles Debunne
a05de480f2 Merge "Fix in vertical measurement in text lines with different text sizes" 2010-12-02 16:47:50 -08:00
Xia Wang
189a31474e Merge "Add Wi-Fi connection test for static IP" 2010-12-02 16:39:53 -08:00
Brad Fitzpatrick
ae28fc8d30 Merge "sampling profiler hz -> ms" 2010-12-02 16:10:02 -08:00
Jeff Brown
80cdb94144 Merge "Improve support for external keyboards." 2010-12-02 16:03:05 -08:00
Jeff Brown
db360642ed 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
Jean-Baptiste Queru
6ef38d73d6 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
438267d997 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
a4130babac resolved conflicts for merge of bf1439c5 to stage-korg-master
Change-Id: Iab543a7ee449025f1df5d58afaa8f8fdd4809c99
2010-12-02 15:16:53 -08:00
James Dong
399980ff1f 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
7a039f9994 Merge "Preserve flags field of event passed to injectKeyEvent()" 2010-12-02 14:56:13 -08:00
Gil Dobjanschi
a63c34a576 Merge "Remove the VideoEditorTestImpl" 2010-12-02 14:55:48 -08:00
Fabrice Di Meglio
b57721fa7c Merge "Add better SQL exception handling to the Sync framework (see bug #3202693)" 2010-12-02 14:32:20 -08:00
Eric Fischer
1945ef5b26 Merge "Rename Indonesian and Hebrew translations to match Locale.java conventions" 2010-12-02 14:29:03 -08:00
Joe Onorato
3dacce6387 Merge "Integrating updated SystemUI assets" 2010-12-02 14:23:20 -08:00
Russell Brenner
4a378f0d44 Merge "Merge WebKit at r72274: Update WebKit revision number" 2010-12-02 14:11:41 -08:00
Andreas Huber
396b1b0254 Merge "Squashed commit of the following:" 2010-12-02 14:04:55 -08:00
Adam Powell
f51ba070bc Merge "Fix bug 3248786 - silly monkeys." 2010-12-02 14:03:13 -08:00
Xia Wang
45bd5cdc04 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
Xia Wang
784a43fef7 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
147abbd117 Merge "Restore Wi-Fi configuration after the test. DO NOT MERGE" into gingerbread 2010-12-02 13:40:23 -08:00
Gil Dobjanschi
c4c53f3eaf Merge "Added a callback interface to the generatePreview method." 2010-12-02 13:39:06 -08:00
Xavier Ducrohet
458641b5e4 Merge "Layoutlib: update with new add/movechild API." 2010-12-02 12:37:44 -08:00
Robert Greenwalt
93f5629981 Merge "Load persisted global proxy settings." 2010-12-02 12:30:02 -08:00
Xavier Ducrohet
990cbfff28 Merge "LayoutLib: Reuse canvas when possible." 2010-12-02 12:16:01 -08:00
Louis Huemiller
500f22d794 Merge "Remove const_cast to layer handle" 2010-12-02 10:31:19 -08:00
Gilles Debunne
a3a1ec93c6 Merge "Customized text selection action mode." 2010-12-02 10:25:43 -08:00
James Dong
b085566f85 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
James Dong
dc76df85d7 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
11cdf95594 Merge "Be conservative in estimating the file size limit." into gingerbread 2010-12-02 10:13:36 -08:00
Wink Saville
a6606a3fc2 Merge "Remove the need for a token parameter from AsyncChannel." 2010-12-02 09:51:05 -08:00
Mike Lockwood
d4443ac29e Merge "PTP: Add android.provider.Ptp to the public API" 2010-12-02 09:19:01 -08:00
Jean-Baptiste Queru
3263f79a95 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
d8c9d737fb 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
34f9603301 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
9ee1ec38a6 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
4bdada2c61 Merge from open-source master
Change-Id: Ie25bbfbf12fa8902d9ba82cf2d4ed4c60d439e39
2010-12-02 07:55:06 -08:00
Jean-Baptiste Queru
af8964280b Merge from open-source master
Change-Id: Ie45ea6581abd02be0cd7cffed05c0a0b6e65c338
2010-12-02 07:54:57 -08:00
Mike Lockwood
7b787b329f Merge "MediaScanner: Fix path mismatch in code that check for missing files in postScan()" 2010-12-02 07:38:37 -08:00
Mike Lockwood
2b432577db Merge "MTP: Add support for multiple properties in GetObjectPropList command" 2010-12-02 06:53:12 -08:00
Daniel Sandler
8c113bf332 Merge "Do not allow lights out mode for old apps." 2010-12-02 05:32:35 -08:00
Michael Jurka
326a48d0d6 Merge "Revert "Re-add performance optimization in View"" 2010-12-02 00:09:28 -08:00
Eric Fischer
55f0d7fdb3 Merge "Import revised translations." 2010-12-01 17:00:16 -08:00
Xavier Ducrohet
3f1e7e78ff Merge "LayoutLib: implement insert/move/removeChild." 2010-12-01 16:36:58 -08:00
Eric Laurent
1cff4690e2 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
6532eb1215 Merge "Resurrect SamplingProfilerIntegration" 2010-12-01 16:23:58 -08:00
Eric Laurent
51e91ae24e 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
Eric Laurent
8217671a50 Merge "Fix issue 2641884: Bluetooth volume is dependent on in call volume." into gingerbread 2010-12-01 15:59:31 -08:00