Commit Graph

24906 Commits

Author SHA1 Message Date
Yu Shan Emily Lau
c9f2c1d7e8 Merge "Suppress the unsupported camera recording size (ie QVGA and SQVGA)" 2010-12-06 10:14:16 -08:00
Fred Quintana
f0ac1cfc86 Merge "add caching to the AccountManagerService" 2010-12-06 09:55:54 -08:00
Robert Greenwalt
55e52e3e04 Merge "Don't clobber the net hostname if it's already set." 2010-12-06 09:54:16 -08:00
Iain Merrick
c4b91d0497 Merge "Call flushCookieStore() from CookieSyncManager." 2010-12-06 05:40:48 -08:00
satok
7ca57ea784 Merge "Fix null pointer exception" 2010-12-05 21:38:30 -08:00
Jason Sams
174a6c9dd8 Merge "Prevent message overrun in LocklessCommandFifo." 2010-12-05 19:54:18 -08:00
Adam Powell
fe08222c03 Merge "Add dividers to action bar navigation. Lighter dividers for holo themes." 2010-12-05 16:49:40 -08:00
Dianne Hackborn
cbef6ddfd3 Merge "Fix up API definitions in master." 2010-12-05 14:12:19 -08:00
James Dong
f0e7dcba61 Merge "Replace MediaMetadataRetriever.captureFrame() with MediaMetadataRetriever.getFrameAtTime()" 2010-12-05 14:07:58 -08:00
Adam Powell
390924d5da Merge "Fix bug 3214215 - ListView should stay scrolled to the bottom in transcript mode after a resize" 2010-12-05 13:54:07 -08:00
Adam Powell
7d41fe4e8c Merge "Add public style for tabby-looking views" 2010-12-05 13:13:19 -08:00
Dianne Hackborn
1bacbd9185 Merge "Update 9.xml to match the real GB 9.xml." 2010-12-05 13:11:57 -08:00
Shimeng (Simon) Wang
5e5138c88b Merge "Make sure the returned web view width is at least 0." 2010-12-03 18:22:29 -08:00
Romain Guy
09f6be55ff Merge "Don't render degenerate triangles in 9patches. Bug #3251983" 2010-12-03 16:49:45 -08:00
Joe Onorato
545f5d0ee8 Merge "make screencap able to save pngs." 2010-12-03 16:49:39 -08:00
James Dong
0fe4dc6a27 Merge "Prepare for publishing MediaMetadataRetriever as public API" 2010-12-03 15:36:06 -08:00
Chet Haase
4bb4ca416e Merge "Fix invalidation issue for optimized/GL case." 2010-12-03 15:17:01 -08:00
Adam Powell
368bbee5e9 Merge "Fix bug 3248342 - resource not found for non-xlarge" 2010-12-03 14:42:11 -08:00
Irfan Sheriff
630421c188 Merge "Fix configuration change handling" 2010-12-03 14:29:08 -08:00
Jim Miller
44f9b1d1d2 Merge "Fix 3201849: Remove builder pattern from DrawableHolder setters" 2010-12-03 14:21:42 -08:00
Dianne Hackborn
cb64238d53 Merge "Fix issue #3175809: system_server crash with SEGV_MAPERR (IKXEVEREST-1372)" 2010-12-03 13:16:38 -08:00
Xavier Ducrohet
cc75abe972 Merge "LayoutLib: Animation support in insert/move/removeChild actions." 2010-12-03 12:27:27 -08:00
Xavier Ducrohet
fb8a2e8806 Merge "LayoutLib: Create new layoutparams when moving a child" 2010-12-03 12:27:14 -08:00
Wink Saville
ad2cb389a1 Merge "Cleanup logging." 2010-12-03 12:16:50 -08:00
Jeff Brown
a78549f464 Merge "Add method for sending wallpaper commands directly to an engine." 2010-12-03 11:52:38 -08:00
Gilles Debunne
9015204447 Merge "Removed unused text_select_handle asset" 2010-12-03 11:33:51 -08:00
Kenny Root
ca2cd7c428 Merge "Move disk usage utilities to its own library" 2010-12-03 11:23:48 -08:00
Amith Yamasani
90fed4f627 Merge "Use SearchView in SearchDialog for legacy apps using the old model." 2010-12-03 11:22:48 -08:00
Steve Block
1c4ae39b5b Merge "Update WebView.addJavascriptInterface() to ignore null instances" 2010-12-03 03:38:00 -08:00
Ben Murdoch
450a84de9c Merge "Add a value for the dimensions of xlarge app icons." 2010-12-03 03:05:54 -08:00
Bjorn Bringert
fd150bb907 Merge "Only decrement mRemaining once in read()." 2010-12-03 01:28:05 -08:00
Wink Saville
cb15287ce0 Merge "Add reason field to DEACTIVATE_DATA_CALL request." 2010-12-02 21:43:00 -08:00
satok
b5ed87349d Merge "Make the size of "shirt pocket" 0 when the icon of "shirt pocket" is invisible" 2010-12-02 19:23:29 -08:00
Xavier Ducrohet
74fce51121 Merge "LayoutLib: Update to use the new moveChild API." 2010-12-02 18:06:23 -08:00
Hung-ying Tyan
081b96a751 am 7da1ffc9: am e2abd103: Merge "Set AudioGroup mode according to audio settings" into gingerbread
* commit '7da1ffc9d2a51ef6120389a06351fd770ab45f46':
  Set AudioGroup mode according to audio settings
2010-12-02 18:02:58 -08:00
Hung-ying Tyan
d76844ac80 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
33f4f32967 Merge "Set AudioGroup mode according to audio settings" into gingerbread 2010-12-02 17:50:33 -08:00
Joe Onorato
889e10549e Merge "Tweak the settings panel assets / layout. Not done yet." 2010-12-02 17:29:41 -08:00
Joe Onorato
5b20c1212b Merge "Make AbsSeekBar support having setThumb called after initialization is done." 2010-12-02 17:29:29 -08:00
Joe Onorato
f2c71034ac Merge "Brightness and volume controls in the quick settings panel." 2010-12-02 17:29:12 -08:00
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