Robert Greenwalt
7b97c239ce
Merge "Make getDataEnabled take more into account."
2010-11-12 08:50:50 -08:00
Gil Dobjanschi
d01cc474a2
Merge "Invalidate transitions when an image media item duration changes."
2010-11-11 19:09:25 -08:00
Jeff Brown
4ebaba73ad
Merge "Add new keycodes initially used for GoogleTV devices."
2010-11-11 18:47:57 -08:00
Adam Powell
48e5897b33
Merge "Bug 3183184 - add fade-out for selectable item backgrounds"
2010-11-11 18:41:33 -08:00
Jason Bayer
af34db4dcb
Add new keycodes initially used for GoogleTV devices.
...
Change-Id: I1b901037d6d401931dd3ec6f7d5e1e6ad165d1c9
2010-11-11 18:36:11 -08:00
Xavier Ducrohet
60d1ea99f7
Merge "Misc fix in layoutlib bridge + View.isIneditMode as delegate."
2010-11-11 17:43:28 -08:00
Eric Laurent
f0a08011a8
Merge "Temporary workaround for issue 3187563"
2010-11-11 17:24:27 -08:00
Andreas Huber
3227e05d24
Merge "Increase the prefetcher's low water mark so it restarts fetching data earlier."
2010-11-11 17:15:52 -08:00
Scott Main
b3e7e635a2
am 16555c60: am d6b9d078: Merge "docs: misc changes to sdk setup docs update sdk manager screenshot; update info about new manager UI; more info about the windows installer;" into gingerbread
...
* commit '16555c60f7231b014375cbc62fd83b1c53879984':
docs: misc changes to sdk setup docs update sdk manager screenshot; update info about new manager UI; more info about the windows installer;
2010-11-11 17:12:32 -08:00
Wink Saville
250898e271
Merge "GsmServiceStateTracker#getPhone should be protected not public."
2010-11-11 17:04:38 -08:00
Scott Main
e7d586668c
am d6b9d078: Merge "docs: misc changes to sdk setup docs update sdk manager screenshot; update info about new manager UI; more info about the windows installer;" into gingerbread
...
* commit 'd6b9d078ecf1b4d7cc57375830cf2ce390fc893c':
docs: misc changes to sdk setup docs update sdk manager screenshot; update info about new manager UI; more info about the windows installer;
2010-11-11 17:02:54 -08:00
Scott Main
20fd8e71ab
Merge "docs: misc changes to sdk setup docs update sdk manager screenshot; update info about new manager UI; more info about the windows installer;" into gingerbread
2010-11-11 16:56:19 -08:00
Elliott Hughes
b29272a4d4
Merge "Use deliberately public API rather than org.apache cruft."
2010-11-11 16:54:07 -08:00
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
