Adam Powell
aa4fa2c5b7
Merge "Sync holo button bar styles with UX."
2011-05-26 18:56:08 -07:00
Romain Guy
afe68c689f
Merge "Remove extraneous log."
2011-05-26 18:49:30 -07:00
Romain Guy
bc7cdb6783
Remove extraneous log.
...
Change-Id: I91b248410d69836c7a3b56eb0867224ccb4a5336
2011-05-26 18:48:49 -07:00
Adam Powell
15a7b814e9
Sync holo button bar styles with UX.
...
Change-Id: I9588f1beb014262bf71d97521b0f371c85977923
2011-05-26 18:40:52 -07:00
Romain Guy
8eed7aded7
Merge "Fix texture coordinates for sub-bitmap rendering."
2011-05-26 18:40:13 -07:00
Romain Guy
1e59f9d10d
Fix texture coordinates for sub-bitmap rendering.
...
Change-Id: I05a31775e03f5b223a55a5144d420351abac89be
2011-05-26 18:39:34 -07:00
Matthew Xie
a860764402
Merge "Add wide band speech feature flag"
2011-05-26 18:13:08 -07:00
Romain Guy
f9187df698
Merge "Correctly implement the CLEAR xfermode."
2011-05-26 16:43:26 -07:00
Romain Guy
f504a2fa14
Correctly implement the CLEAR xfermode.
...
The previous implementation was using glBlendFunc with the parameters
GL_ZERO/GL_ZERO which doesn't work for text, paths and other alpha
sources (anti-aliasing.) The correct implementation is GL_ZERO/
GL_ONE_MINUS_SRC_ALPHA.
Change-Id: I4cca65e57b6a37bbf5a41d382cb0648ee8e11e79
2011-05-26 16:40:55 -07:00
Jason Sams
0d92e3441f
Merge "Start splitting allocation into hal and core."
2011-05-26 16:37:09 -07:00
Jason Sams
7e8aae7f76
Start splitting allocation into hal and core.
...
Change-Id: Ic506abb0469238cb0471eb1401cfcb7b2fbbe4bb
2011-05-26 16:33:01 -07:00
Huahui Wu
18773812cf
Merge "b/4452171 Dumping video playbacks to files."
2011-05-26 16:31:28 -07:00
Adam Powell
73d0a60628
Merge "Fix bug 4487948 - action bar tabs + configuration change = :("
2011-05-26 15:47:21 -07:00
Adam Powell
25151e4792
Fix bug 4487948 - action bar tabs + configuration change = :(
...
Change-Id: If7f622865ae5597cd9fb664a2952481da5c7e09a
2011-05-26 15:44:59 -07:00
Eric Fischer
a524dbd4a9
Merge "Import revised translations."
2011-05-26 15:37:27 -07:00
Eric Fischer
8447a13f9c
Import revised translations.
...
Change-Id: I10a93a6f3a274354e88263d86a8855d1e7121f58
2011-05-26 15:34:01 -07:00
Matthew Xie
c3b8491868
Add wide band speech feature flag
...
Add a boolean flag resource to indicate if current platform supports
bluetooth wide band speech.
This is part of Handsfree 1.6 new feature change.
Bug 4449070
Change-Id: Iee5e969d030108382dd2fa6568ce3d80c6b611d6
2011-05-26 15:17:10 -07:00
Shimeng (Simon) Wang
09cb64bcd1
Fix zoom overview width and postscale for non-wide-viewport mode.
...
issue: 4396010
Change-Id: I90aefac9fdf53834c0774d5c1b37693413798689
2011-05-26 15:09:12 -07:00
James Dong
03edf6b364
Merge "Extract embedded cover art (aka poster frame) in mp4 files"
2011-05-26 12:00:51 -07:00
James Dong
0be123918e
am c004a0c9: am 05e13b9e: am c1ded373: Merge "Revert "Use pread() to get the decrypted data for container based DRM file."" into honeycomb-mr2
...
* commit 'c004a0c925ea2c9c48bbf9670d2ebf96f432c90a':
Revert "Use pread() to get the decrypted data for container based DRM file."
2011-05-26 11:41:30 -07:00
Jeff Brown
93e179bbe7
am a1a56bd0: (-s ours) am 6ef142a0: am b416e241: Fix bug reporting presence of orientation axis. (DO NOT MERGE)
...
* commit 'a1a56bd0e3d730edab327495acd5d90b10a6f1e4':
Fix bug reporting presence of orientation axis. (DO NOT MERGE)
2011-05-26 11:41:12 -07:00
Jeff Brown
a1f585a34e
am 23e620b3: (-s ours) am 53c3d5b1: am 325bd07b: Add tap/drag touchpad gesture. (DO NOT MERGE)
...
* commit '23e620b32f9c243e124309681b95fe228feb53b8':
Add tap/drag touchpad gesture. (DO NOT MERGE)
2011-05-26 11:40:46 -07:00
Jeff Brown
91325dca95
am 3c2fb024: (-s ours) am 8148cc3e: am 86ea1f5f: Initial checkin of spot presentation for touchpad gestures. (DO NOT MERGE)
...
* commit '3c2fb0242b0ec21101959dfa08aad3162a523634':
Initial checkin of spot presentation for touchpad gestures. (DO NOT MERGE)
2011-05-26 11:40:20 -07:00
Jeff Brown
0cbf21f74b
am 13412d31: (-s ours) am e8dc05aa: am a6dbfdd3: Add a sprite controller. (DO NOT MERGE)
...
* commit '13412d31650366f41b1f3d9f429cb0a01dd575ef':
Add a sprite controller. (DO NOT MERGE)
2011-05-26 11:40:14 -07:00
Jeff Brown
49062975ec
am fbc67977: (-s ours) am d5358874: am 5ced76a1: Coalesce input events that arrive faster than 333Hz. (DO NOT MERGE)
...
* commit 'fbc67977aecfd94e8923e8eca3b859cd431c94b8':
Coalesce input events that arrive faster than 333Hz. (DO NOT MERGE)
2011-05-26 11:39:57 -07:00
Jeff Brown
f351119ddd
am e79397df: (-s ours) am dd2534c2: am 7157f6fe: Allow batching samples onto the pending motion event. (DO NOT MERGE)
...
* commit 'e79397df614d2a489906c44df214a4ea5c49c043':
Allow batching samples onto the pending motion event. (DO NOT MERGE)
2011-05-26 11:39:46 -07:00
Jeff Brown
6d60539f28
am da97f16c: (-s ours) am c5c7e047: am d0132e8e: Minor Alt-TAB / Recent Apps Dialog improvements. (DO NOT MERGE)
...
* commit 'da97f16c5d62d96c1b774a73da23bdc3e3e7b794':
Minor Alt-TAB / Recent Apps Dialog improvements. (DO NOT MERGE)
2011-05-26 11:39:35 -07:00
Jeff Brown
aaea75e175
am b9b9b3e2: (-s ours) am 6f37a7f9: am eea0aa25: Support primitive ALT-TAB style navigation using Recent Apps. (DO NOT MERGE)
...
* commit 'b9b9b3e271ce33f71797d6795bcccb5d0bcd6292':
Support primitive ALT-TAB style navigation using Recent Apps. (DO NOT MERGE)
2011-05-26 11:39:29 -07:00
Jeff Brown
bc6a993f02
am 14c45e2e: (-s ours) am 16f1d2ca: am 36001a9f: Merge "Support chorded fallback keys. (DO NOT MERGE)" into honeycomb-mr2
...
* commit '14c45e2ef99bf87848a379879dbf8f4090799307':
Support chorded fallback keys. (DO NOT MERGE)
2011-05-26 11:39:22 -07:00
Jeff Brown
cba044cb45
am 92693bce: (-s ours) am 32b7bcc8: am c2d200d4: Merge "Fix focused application handle. (DO NOT MERGE)" into honeycomb-mr2
...
* commit '92693bce936c1cdbfd9e1b81c4eaf1fe9cf5568e':
Fix focused application handle. (DO NOT MERGE)
2011-05-26 11:39:10 -07:00
Jeff Brown
7885f63950
am 54bd4cae: (-s ours) am 8ea6e641: am 266ea6b0: Merge "Optimize EventHub to process events in big chunks. (DO NOT MERGE)" into honeycomb-mr2
...
* commit '54bd4caeabc5daddfce56269949daccd8e7bf661':
Optimize EventHub to process events in big chunks. (DO NOT MERGE)
2011-05-26 11:38:58 -07:00
Jeff Brown
3d46889f89
am 8e5799ed: (-s ours) am af685f3b: am 85a7f99c: Merge "Refactor how timeouts are calculated. (DO NOT MERGE)" into honeycomb-mr2
...
* commit '8e5799ed16ab605d8de775e1644f1fa59ff6627e':
Refactor how timeouts are calculated. (DO NOT MERGE)
2011-05-26 11:38:48 -07:00
Jeff Brown
15291c6f55
am 7d0fb570: (-s ours) am 16330e24: am 94e838f6: Merge "Improve VelocityTracker numerical stability. (DO NOT MERGE)" into honeycomb-mr2
...
* commit '7d0fb57044576fd4bbaf9683997bab288c3b759c':
Improve VelocityTracker numerical stability. (DO NOT MERGE)
2011-05-26 11:38:35 -07:00
Jeff Brown
97683e8284
am 4e3ba25c: (-s ours) am 4bd89fb0: am 82e4373e: Merge "Use touch pad gestures to manipulate the pointer. (DO NOT MERGE)" into honeycomb-mr2
...
* commit '4e3ba25cc718bbc6db0a332c4105debc4b3552d3':
Use touch pad gestures to manipulate the pointer. (DO NOT MERGE)
2011-05-26 11:38:24 -07:00
James Dong
e8b26dcec7
Extract embedded cover art (aka poster frame) in mp4 files
...
Change-Id: Ic9421ee27b9aa3b27df00878b887de20f25d232b
2011-05-26 11:31:16 -07:00
Scott Main
3453b1c584
Merge "docs: add accepted values for setting status bar visibility"
2011-05-26 10:29:45 -07:00
Philip Milne
3f8956d82b
Introduction of GridLayout.
...
Change-Id: Ia2ec315e7d29dcc5aa13b080fc6ce00708e9c034
2011-05-26 09:28:26 -07:00
Andreas Huber
73a4b2b3be
Merge "Support mpeg1,2 audio and mpeg1,2,4 video content extraction from .ts streams."
2011-05-26 08:52:55 -07:00
Debashish Chatterjee
31beb6db09
Merge "framework/base changes to add new voicemail provider sample."
2011-05-26 07:45:28 -07:00
Daniel Sandler
8c1132e3ce
Merge "Framework support for Android Dreams."
2011-05-26 06:01:41 -07:00
satok
42c5a1666c
Fix internal variables and equals in SuggestionSpan
...
Bug: 4443922
- Instantiating other package's class for the name is complicated, so we changed the internal value for the notification target class from Class to String.
- Implement equals
Change-Id: Iaf7682be777f0027d33c9a3be4609ac01b6950ad
2011-05-26 19:21:35 +09:00
Joe Onorato
2a3c67c0e9
am cfb046de: am 2c09a9c0: am 5520610c: Merge "Make adb shell am display-size persistent." into honeycomb-mr2
...
* commit 'cfb046dead49568de6f6808a697e0508ef39a3a6':
Make adb shell am display-size persistent.
2011-05-25 21:29:07 -07:00
Dianne Hackborn
620d69d85b
am 103e74d9: am d6f29cd8: am 2a15eb55: Merge "Fix issue #4445007 : DPM initializes some values to 1, instead of 0" into honeycomb-mr2
...
* commit '103e74d9b1fdebbbc035da0567cd075554d4137d':
Fix issue #4445007 : DPM initializes some values to 1, instead of 0
2011-05-25 21:28:39 -07:00
Amith Yamasani
b3094dbe29
am 361c286d: (-s ours) am 5d9e0a1a: am 99a8e1d2: Merge "More preference item visual adjustments for smaller tablets. DO NOT MERGE" into honeycomb-mr2
...
* commit '361c286d095a22152750e73b01bfc6b1d2076a4d':
More preference item visual adjustments for smaller tablets. DO NOT MERGE
2011-05-25 21:28:31 -07:00
Russell Brenner
1711e463a4
am dd36e1bd: (-s ours) am 8b98284b: am 64796477: Merge "DO NOT MERGE-Refire the redraw event if webkit wasn\'t ready" into honeycomb-mr2
...
* commit 'dd36e1bde1e05cc9ece468693ea286536efad180':
DO NOT MERGE-Refire the redraw event if webkit wasn't ready
2011-05-25 21:27:41 -07:00
Mike Lockwood
af4932a2be
Merge "Environment: Fix default mount point for external storage"
2011-05-25 20:36:05 -07:00
Dianne Hackborn
b2771f1a41
Merge "resolved conflicts for merge of 77dd616e to master"
2011-05-25 20:35:04 -07:00
Mike Lockwood
d4bdc7b4da
Environment: Fix default mount point for external storage
...
/mnt/sdcard is the real mount point. /sdcard is just a symlink.
Change-Id: If584e5cd31238d5b263de5bd72e179d53875d8c3
Signed-off-by: Mike Lockwood <lockwood@android.com >
2011-05-25 23:33:50 -04:00
Gloria Wang
98472cced0
Merge "For out of band timed text support (timed text in a separate file)."
2011-05-25 20:11:25 -07:00
satok
f9f0100862
Add Apis to send notifications when the suggestion was picked
...
- Due to a strong request from VoiceIME
Bug: 4443922
Change-Id: Ia539de0acf66053e0349daec459d75e36805f6bf
2011-05-26 11:02:31 +09:00