Danny Fernandes
23dea9a139
am 1734e835: am 5e1f3e41: Merge "Fixed 3419090 Throwing exception for unsupported video codec profiles and level" into honeycomb
...
* commit '1734e8350f1aadbebf8234e3c470a9d4d0c96e8f':
Fixed 3419090 Throwing exception for unsupported video codec profiles and level
2011-02-07 13:46:06 -08:00
Jean-Michel Trivi
5211339e1f
am 03a9de05: am aa9c0273: Merge "Bug 3424058 increase IME key clicks by 7dB for spacebar and standard keys" into honeycomb
...
* commit '03a9de055203f49170400105d9b2a758ca5aecdd':
Bug 3424058 increase IME key clicks by 7dB for spacebar and standard keys
2011-02-07 13:45:50 -08:00
Mike Cleron
9ac50056dd
am c1467908: am b8578741: Merge "Fix issue #3424823 : 4-corner trick causes runtime restart" into honeycomb
...
* commit 'c14679089376fb7df28eb0a829518b33abb1d794':
Fix issue #3424823 : 4-corner trick causes runtime restart
2011-02-07 13:45:21 -08:00
Xavier Ducrohet
9e56a73c3d
am 487742ea: am 331e93e5: Merge "LayoutLib: render system/title/action bars." into honeycomb
...
* commit '487742ea06ecde2120c86da4dff95a94eed93555':
LayoutLib: render system/title/action bars.
2011-02-07 13:45:07 -08:00
Patrick Scott
f01e3b5b8f
am 01b7a98c: am 160c18a4: Merge "Need a public way to wait for cookie operations." into honeycomb
...
* commit '01b7a98c31f3d4587fb6739c8c6b35530177c20c':
Need a public way to wait for cookie operations.
2011-02-07 13:44:41 -08:00
Brad Fitzpatrick
987cc804bd
am be806fe8: am cc8f87e9: am f664d6f9: am b083d3b8: Merge "Initialize resampling buffer per track."
...
* commit 'be806fe8c1c7bb3ae70ae27dce41d672410af26a':
Initialize resampling buffer per track.
2011-02-07 13:44:12 -08:00
Joe Onorato
91445d73e0
am 3162211b: am 2742c9c2: am 163c28b5: Merge "Managed dialogs should run on the same thread as their activity." into gingerbread
...
* commit '3162211bc78c98836f0c9d76a8e94741e4255bed':
Managed dialogs should run on the same thread as their activity.
2011-02-07 13:43:50 -08:00
Jean-Michel Trivi
d4a4680a23
am 11468815: am 23c907ca: Bug 3424058 Refix broken asset for "audible selection" sound effect
...
* commit '114688153f56b2bc6b17cbf81120a481408d6f81':
Bug 3424058 Refix broken asset for "audible selection" sound effect
2011-02-07 13:43:30 -08:00
Dheeraj Sharma
0b180a7fae
am d5924e9d: am 67ec9aa8: Hardware Video Decoder Flag Enabled for Thumbnail extraction and RenderFrame
...
* commit 'd5924e9d3a370c2816613d4420b622b857da4f00':
Hardware Video Decoder Flag Enabled for Thumbnail extraction and RenderFrame
2011-02-07 13:43:02 -08:00
Romain Guy
3e4ac8967d
am 80038fbc: am ba27cf75: Merge "Empty the clip rect when intersection is empty. Bug #3410035 " into honeycomb
...
* commit '80038fbcf629936852afba0054b26939a3a9835a':
Empty the clip rect when intersection is empty. Bug #3410035
2011-02-07 13:42:47 -08:00
Romain Guy
e28d3e1c41
am 7846d403: am 1c0ab385: Merge "Open the location settings when clicking the GPS notification." into honeycomb
...
* commit '7846d4039ffa42583021152863c245eedcf0d46a':
Open the location settings when clicking the GPS notification.
2011-02-07 13:42:23 -08:00
Dheeraj Sharma
4d3cd2c23e
am 6a9cb7dd: am e05c33fe: Merge "Modification for using Software decoder for thumbnail generation in JNI" into honeycomb
...
* commit '6a9cb7ddec346145b4563e06ff0940199758f888':
Modification for using Software decoder for thumbnail generation in JNI
2011-02-07 13:42:06 -08:00
Romain Guy
f0907fe6d4
am 9732d9e6: am 43703325: Merge "New default wallpaper" into honeycomb
...
* commit '9732d9e6ea78b9418cdef0054252d71292812f23':
New default wallpaper
2011-02-07 13:41:42 -08:00
Mike Cleron
85cabc2eb3
am 9cfa9c7a: am f6141980: Merge changes I46acd27a,I70b322e1 into honeycomb
...
* commit '9cfa9c7a3f5f23dec6ef4575407c1076d1b3c479':
aa is better than cc
Prevent ProgressBar from slowing down everything. bug #3422568
2011-02-07 13:41:21 -08:00
Daniel Sandler
8a2cea735d
Merge "resolved conflicts for merge of 31796297 to master"
2011-02-07 13:14:52 -08:00
Daniel Sandler
32cd1d5053
resolved conflicts for merge of 31796297 to master
...
Change-Id: Ice632b3378f8f67c186245fdb63b022ade864ba1
2011-02-07 16:12:16 -05:00
Andreas Huber
c442bbe264
Merge "Display a single (still-)frame of video after seeking while paused."
2011-02-07 13:10:01 -08:00
Alon Albert
f313e95821
Merge "Move handing of a "cancel" inside try-finally block"
2011-02-07 12:20:36 -08:00
Mike Lockwood
7da5fd29da
Merge "MTP: Add support for querying all objects in GetObjectPropList"
2011-02-07 12:14:13 -08:00
Dianne Hackborn
40e7a989e7
Merge "Fix COMPONENT_ENABLED_STATE check (copy from HC)"
2011-02-07 12:11:12 -08:00
Andreas Huber
0a84f4fef9
Display a single (still-)frame of video after seeking while paused.
...
Change-Id: Ia78bf29ba6d649043e70c49913725cecdf918c03
related-to-bug: 3392259
2011-02-07 11:43:12 -08:00
Scott Main
eef224badd
am b1ef1c80: am b65b2df6: cherrypick Change-Id: Ie0c6540a3a6d86780718e2918b8dffcda37d925c docs: Rewrite of App Fundamentals.. Part 3 This introduces two new docs:
...
* commit 'b1ef1c80210deec80e0055fc33c8188561732895':
cherrypick Change-Id: Ie0c6540a3a6d86780718e2918b8dffcda37d925c docs: Rewrite of App Fundamentals.. Part 3 This introduces two new docs:
2011-02-07 11:41:07 -08:00
Eric Laurent
ced2c59678
am a37a81d7: am e6955f8e: Merge "Issue 3371080: fix VolumePanel in mute state" into honeycomb
...
* commit 'a37a81d705bd9abaf1110fecd176a74d32ac2016':
Issue 3371080: fix VolumePanel in mute state
2011-02-07 11:40:51 -08:00
Jim Miller
f44ca4664f
am 6b590c8f: am 0d47ac11: Merge "Fix 3419077: Allow subclasses to change SeekBarPreference action buttons." into honeycomb
...
* commit '6b590c8fd36c20961e9f4ab36bfc03e82f5abf24':
Fix 3419077: Allow subclasses to change SeekBarPreference action buttons.
2011-02-07 11:40:38 -08:00
Jim Miller
6572cfe8dc
am da983f73: am 4ce0cad1: Merge "Issue 3371080: fix volume update in mute state." into honeycomb
...
* commit 'da983f734c608fde57ea4f213d8640490a2f3a84':
Issue 3371080: fix volume update in mute state.
2011-02-07 11:40:21 -08:00
Scott Main
1514a5ec5a
am be779cb7: am 4fe3e53e: update menu dev guide with more info about action bar
...
* commit 'be779cb745758bd22429f5e1ac2f5a99d5eb1b62':
update menu dev guide with more info about action bar
2011-02-07 11:40:04 -08:00
Dianne Hackborn
7da70821f7
am 94baff47: am 1b1962f3: Merge "Fix issue #3420898 : More wallpaper issues" into honeycomb
...
* commit '94baff47975fb3ae1380333f23fc2de2dc65eb86':
Fix issue #3420898 : More wallpaper issues
2011-02-07 11:39:45 -08:00
Gil Dobjanschi
9d967a5530
am 99ec3e7f: am 7dd5763d: Merge "Bug fix: 3421011 ANR during delete video clip" into honeycomb
...
* commit '99ec3e7f27ec7767d1f1a2c596ff2bddb7907a9c':
Bug fix: 3421011 ANR during delete video clip
2011-02-07 11:39:27 -08:00
Chet Haase
69d792f34a
am 38e8c353: am 59301777: Merge "Fix leak in reused display lists" into honeycomb
...
* commit '38e8c35322e41708e5b1f2260d7d67ff525d8560':
Fix leak in reused display lists
2011-02-07 11:38:47 -08:00
Rebecca Schultz Zavin
91d1079d6b
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base
2011-02-07 11:38:34 -08:00
Adam Powell
e7175e848b
am 86ce6866: am c1be7ac9: Merge "Asset updates for dialog frames and seek bar thumbs" into honeycomb
...
* commit '86ce68668c700bd4090d6ef74df3483ce9fea957':
Asset updates for dialog frames and seek bar thumbs
2011-02-07 11:38:25 -08:00
Justin Ho
b843c687a7
am 6d1fbba6: am 40523b1b: Merge "Updating default wallpaper" into honeycomb
...
* commit '6d1fbba68608dfd8d91d14d67bc34255a14ee4ac':
Updating default wallpaper
2011-02-07 11:38:04 -08:00
Justin Ho
6da8239f5e
am a9b9f9c8: am b3e00457: Merge "Updated notification area layout Bumping clock up 1px Swapping in new Bluetooth icons" into honeycomb
...
* commit 'a9b9f9c816b2dac559cd06a756587f92e6f2215c':
Updated notification area layout Bumping clock up 1px Swapping in new Bluetooth icons
2011-02-07 11:37:48 -08:00
Nick Pelly
996d493967
am 7c95a2c2: am 062443f2: am 40684946: Merge "Fix docs type that broke build." into gingerbread
...
* commit '7c95a2c2471e1ae2308f8a00927e08f321bf8059':
Fix docs type that broke build.
2011-02-07 11:37:28 -08:00
Romain Guy
0e6fe4f31a
am a9c369d0: am 87465f02: Merge "Fixes cache misses and extra allocations. Bug #3421454 " into honeycomb
...
* commit 'a9c369d0fbe2b995f456877b2368aac95f810558':
Fixes cache misses and extra allocations. Bug #3421454
2011-02-07 11:37:12 -08:00
Jean-Baptiste Queru
44053049e1
am c3a9bfde: am 501dbaea: am 6dbdcd55: am db71bda6: Merge from gingerbread
...
* commit 'c3a9bfde60dd4585358a1cf98d302b1a36f39281':
2011-02-07 11:36:55 -08:00
Jack Palevich
70a1875635
Extend recycled bitmap check to all GLUtils APIs.
...
Change-Id: I9ea0022b167af2153190b6642aa303232e257379
2011-02-07 11:36:47 -08:00
Amith Yamasani
9edc5c056f
am 9589ac6c: am 823fbbba: Merge "Expanded volume panel with sliders and mute buttons." into honeycomb
...
* commit '9589ac6c3f63a632e078adcc8ef742412af2014c':
Expanded volume panel with sliders and mute buttons.
2011-02-07 11:36:32 -08:00
Scott Main
8903f04708
am 6a7ca8f8: am 51768f4b: am 779f7410: Merge "cherrypick Change-Id: I6053e6f20045b0ecba4b964f9bfb87c3241d3a91 update dashboard" into gingerbread
...
* commit '6a7ca8f807c842fe5f4ed14df25f4f919b6ab116':
cherrypick Change-Id: I6053e6f20045b0ecba4b964f9bfb87c3241d3a91 update dashboard
2011-02-07 11:36:04 -08:00
Nick Pelly
ca3a704acc
am 3bb7b0c2: am 5394ef06: am 630ac8df: Merge "NFC documentation overhaul." into gingerbread
...
* commit '3bb7b0c2b3d448a60b64eba37c998d1f7c7424e2':
NFC documentation overhaul.
2011-02-07 11:35:47 -08:00
Mathias Agopian
4462ae5220
am e5b6c284: am 33e9cb47: Merge "fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep" into honeycomb
...
* commit 'e5b6c284b6070a3ca9ac1d33b56baba95775ced5':
fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep
2011-02-07 11:35:20 -08:00
Mike Lockwood
4356d81b34
MTP: Add support for querying all objects in GetObjectPropList
...
Change-Id: I1f31971c4c777462f485e52fac016dc0fff48ad9
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-07 13:58:08 -05:00
Justin Ho
e44e28fa11
am 0c3169cf: am 60a008ed: Updated volume dialog assets
...
* commit '0c3169cf208b253b1f3f41ca82796a464eeec464':
Updated volume dialog assets
2011-02-07 10:57:19 -08:00
Alon Albert
9257ec0563
Move handing of a "cancel" inside try-finally block
...
Bug: 3417906
Change-Id: I87e41c0cdad74e2ba72a7b4d1f059e72d106e105
2011-02-07 10:53:26 -08:00
Jean-Baptiste Queru
0d4c1fe368
am b6bf10e4: Merge 917d9ea1
...
* commit 'b6bf10e4bd2c17838a00091c3b8efb2f91ce3457':
Fix the Multi-page SMS sending error to several receipents
2011-02-07 10:48:25 -08:00
Justin Ho
f04b353573
am fc05bc3b: am cc84ea17: Merge "Updated default wallpaper" into honeycomb
...
* commit 'fc05bc3b36c665a0da2661d57a2c5a68245e6a68':
Updated default wallpaper
2011-02-07 10:48:07 -08:00
Justin Ho
1e29cc9676
am bf13e077: am e8d2b985: Merge "Scrubbing OGGs and updating all WAVs" into honeycomb
...
* commit 'bf13e0774e67f03433f5088a7d2c2fe6ee25e0c8':
Scrubbing OGGs and updating all WAVs
2011-02-07 10:47:39 -08:00
Justin Ho
6d9aa80ae9
am efba660d: am 97e1dbab: Merge "Adding remaining volume dialog assets" into honeycomb
...
* commit 'efba660d8efb8ed2f8c31c4aeea81b32016ad601':
Adding remaining volume dialog assets
2011-02-07 10:47:17 -08:00
Justin Ho
073da9da1d
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base
2011-02-07 10:47:01 -08:00
Justin Ho
4a01756c99
am 8bdfcaa0: am 9b95d352: Updated Talk notification icon Bug: 3362749
...
* commit '8bdfcaa0c452dba14b1dc03d9a78728bb39e72a0':
Updated Talk notification icon Bug: 3362749
2011-02-07 10:46:47 -08:00