Commit Graph

24467 Commits

Author SHA1 Message Date
Vasu Nori
ffe02b28b8 Merge "add column to downloads table to store error msg when a download fails" 2010-11-11 16:35:43 -08:00
Adam Powell
561f948488 Merge "First pass at styling progress bars for Holo." 2010-11-11 16:04:09 -08:00
Eric Fischer
7cbf69580c am 9acf04ab: (-s ours) am 3082e5fe: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '9acf04ab6a6327449f46e83679ec54967e092944':
  Import revised translations.  DO NOT MERGE
2010-11-11 15:53:19 -08:00
Eric Fischer
5cd36d686e am 3082e5fe: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '3082e5fed04c42301c89de8df36e9d62f0937dec':
  Import revised translations.  DO NOT MERGE
2010-11-11 15:49:03 -08:00
Andreas Huber
1d5fc1057e Merge "Make sure the prefetcher is actively fetching data if we pause playback due to cache underrun." 2010-11-11 15:45:04 -08:00
Eric Fischer
ed89fde066 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-11-11 15:44:04 -08:00
Romain Guy
093dc91077 Merge "Free resources only from the GL context thread. Bug #3179882" 2010-11-11 15:42:35 -08:00
Jaikumar Ganesh
4c32038a19 Merge "Fix crash in dump function." 2010-11-11 15:38:21 -08:00
Jamie Gennis
4ba398df17 Merge "Implement reducing the buffer count of a Surface." 2010-11-11 15:26:21 -08:00
Mathias Agopian
8ebed10a5b am 792b847e: am fcab475c: Merge "record the last event received regardless of having clients or not" into gingerbread
* commit '792b847ee117c3c21b2859635caa7e7ec39d9c20':
  record the last event received regardless of having clients or not
2010-11-11 14:52:37 -08:00
Mathias Agopian
0a06765508 am fcab475c: Merge "record the last event received regardless of having clients or not" into gingerbread
* commit 'fcab475c906da5c159bc56a32c2610f6f55eafd9':
  record the last event received regardless of having clients or not
2010-11-11 14:49:35 -08:00
Mathias Agopian
4732dee8a8 Merge "record the last event received regardless of having clients or not" into gingerbread 2010-11-11 14:44:08 -08:00
Jamie Gennis
54cc83e8a4 Implement reducing the buffer count of a Surface.
Change-Id: I7f979c60c06d654aa8265002836277434bc1a64f
Bug: 3095167
2010-11-11 14:06:38 -08:00
James Dong
3496c82f71 Merge "Fix memory leak when 0-memcpy quirk is used" 2010-11-11 14:06:30 -08:00
Chet Haase
25634858b3 Merge "Add invalidation to Drawable when its properties change" 2010-11-11 14:04:10 -08:00
Jamie Gennis
044358d11c Merge "Fix a compile warning in the Surface class." 2010-11-11 13:50:43 -08:00
Jamie Gennis
1149493426 Merge "Remove a problematic empty update optimization." 2010-11-11 13:49:38 -08:00
Gilles Debunne
286ad727d1 Merge "Lock screen should not display password." 2010-11-11 13:46:17 -08:00
Jamie Gennis
e9ebae24b9 Fix a compile warning in the Surface class.
Change-Id: Id744e71d2cd23c287925a5090e13a6d9908cdd99
2010-11-11 13:41:43 -08:00
Mike Lockwood
61c7284382 Merge "MediaFile: Recognize MPG file extension as MPEG video" 2010-11-11 13:15:57 -08:00
Xavier Ducrohet
0c9f55886b Merge "Layoutlib: New bridge implementation using the new API 5." 2010-11-11 12:25:01 -08:00
Steve Block
608b15efae Merge changes Ib82f897a,I2d689d0f
* changes:
  Fix EventSender mouse events to correctly convert from screen coordinates
  Refactor EventSenderImpl.MousePoint
2010-11-11 12:19:28 -08:00
Romain Guy
cd0aa764b7 Merge "Reduce number of GL calls when drawing with shaders." 2010-11-11 12:18:03 -08:00
Leon Scroggins
45216994a0 Merge "Ensure that text passed in is non-null." 2010-11-11 11:41:07 -08:00
Brad Fitzpatrick
633e9d6d68 Merge "StrictMode.Span support" 2010-11-11 11:33:18 -08:00
Jaikumar Ganesh
3fc4d4fd63 Merge "Make AUDIO_STATE_CONNECTING in BluetoothHeadset public." 2010-11-11 11:20:14 -08:00
Scott Main
27ecc860b8 am 93896ad8: am dfb12218: docs: revise adding components with info about platform-tools
* commit '93896ad8792ba53d1990d61ee6193339f7b5d51d':
  docs: revise adding components with info about platform-tools
2010-11-11 11:03:28 -08:00
Scott Main
28ab211dab am dfb12218: docs: revise adding components with info about platform-tools
* commit 'dfb122180c7028764136ac3a4fa07104f601de84':
  docs: revise adding components with info about platform-tools
2010-11-11 11:00:44 -08:00
Eric Fischer
92d19f8990 Merge "Import revised translations." 2010-11-11 10:28:30 -08:00
James Dong
5e2d741451 Merge "Fix testWAVSeekToEnd() testcase" 2010-11-11 09:58:44 -08:00
Amith Yamasani
82d6359f3b am f8d2aff4: am db65907a: Merge "Adding pan behavior on preference dialog."
* commit 'f8d2aff41d347e029c9c0b1f51f20c92cd1cce8e':
  Adding pan behavior on preference dialog.
2010-11-11 09:10:51 -08:00
Amith Yamasani
b92039e82b am db65907a: Merge "Adding pan behavior on preference dialog."
* commit 'db65907a2148f053e51f941979f0f7694acd5923':
  Adding pan behavior on preference dialog.
2010-11-11 09:06:02 -08:00
Steve Block
3c68d32162 Merge "Remove the failing expectation for fast/encoding/char-encoding.html for DRT" 2010-11-11 08:56:02 -08:00
Amith Yamasani
2d79e36cd1 Merge "Adding pan behavior on preference dialog." 2010-11-11 08:50:52 -08:00
Mike Lockwood
cc41fe7f5c Merge "MTP: Add missing call to closedir() in recursive delete code" 2010-11-11 08:44:19 -08:00
John Wang
8b8b35405f am 1ed7d65b: am fac4a689: Merge "Fix the audio mode glitch during hangup." into gingerbread
* commit '1ed7d65b5d781d10de91a199fbd94d6d445d1def':
  Fix the audio mode glitch during hangup.
2010-11-10 19:32:42 -08:00
John Wang
6e3ab4c9c4 am fac4a689: Merge "Fix the audio mode glitch during hangup." into gingerbread
* commit 'fac4a689f86b0d46a2c76cec0a6ce2f4bac2a22a':
  Fix the audio mode glitch during hangup.
2010-11-10 19:28:31 -08:00
John Wang
b629c885d0 Merge "Fix the audio mode glitch during hangup." into gingerbread 2010-11-10 19:11:20 -08:00
Romain Guy
0a44b63075 Merge "Add new runtime debug flags." 2010-11-10 19:06:17 -08:00
Dianne Hackborn
e6571ff277 am 63f40387: am 34594e75: Merge "Fix issue #3177284: Account for wake lock power usage on Crespo" into gingerbread
* commit '63f40387d931b5cd555b4743a4d8ff4f1ccf9558':
  Fix issue #3177284: Account for wake lock power usage on Crespo
2010-11-10 18:06:55 -08:00
Dianne Hackborn
543ccefc88 am 34594e75: Merge "Fix issue #3177284: Account for wake lock power usage on Crespo" into gingerbread
* commit '34594e75e4a7962840f34c0b57116ecf1497f118':
  Fix issue #3177284: Account for wake lock power usage on Crespo
2010-11-10 18:01:21 -08:00
Dianne Hackborn
bb356a2721 Merge "Fix issue #3177284: Account for wake lock power usage on Crespo" into gingerbread 2010-11-10 17:58:28 -08:00
Adam Cohen
7684aa7c94 Merge "Adding widget auto-advance capability" 2010-11-10 17:26:10 -08:00
Adam Powell
e781f173de Merge "Refine AbsListView transcript mode behavior." 2010-11-10 17:21:23 -08:00
Jim Shuma
5501172387 Merge "Fix summary for FragmentTransaction.show()" 2010-11-10 16:11:32 -08:00
Jeff Brown
6a026cea05 am 5314335c: (-s ours) am 00e5dd44: Merge "Fix JNI reference leak in NativeActivity. (DO NOT MERGE)" into gingerbread
* commit '5314335c9e28673923ad034e5f8a5ba765552a08':
  Fix JNI reference leak in NativeActivity. (DO NOT MERGE)
2010-11-10 16:09:02 -08:00
Jeff Brown
86ec841f92 am 00e5dd44: Merge "Fix JNI reference leak in NativeActivity. (DO NOT MERGE)" into gingerbread
* commit '00e5dd44f6d014fff8c65b9c718f5641f5eae4bb':
  Fix JNI reference leak in NativeActivity. (DO NOT MERGE)
2010-11-10 16:04:13 -08:00
Jeff Brown
82a517475a Merge "Fix JNI reference leak in NativeActivity. (DO NOT MERGE)" into gingerbread 2010-11-10 16:00:37 -08:00
Scott Main
5d9a8d6ecb am d4b5d85e: (-s ours) am 77f5c954: resolved conflicts for merge of 5a726729 to gingerbread
* commit 'd4b5d85e2cbf8fb7150a0b0030132e28d7e4d9e2':
  docs: remove "new" tags from sample apps
2010-11-10 15:10:13 -08:00
Jamie Gennis
37b126a3b2 Remove a problematic empty update optimization.
This change removes an optimization from SurfaceFlinger that skipped
composition when it got window updates that had an empty dirty region.
This optimization caused problems because it would skip the hwcomposer
set call, which could leave the window's previous frame buffer bound to
an overlay plane.  When the application subsequently dequeued and tried
to lock its next buffer (which would be the buffer currently bound to
the overlay), the lock call would block until the next hwcomposer set
call (which may never happen).

Change-Id: I563b626a1d52c1f30eb82489eae0ceb4edc79936
Bug: 3138752
2010-11-10 15:09:09 -08:00