drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
44,779 Commits 1 Branch 0 Tags
Commit Graph

44779 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Sams
f8cbf7297b Merge "cleanup headers for SDK. bug 3421901" into honeycomb 2011-02-07 13:59:45 -08:00
Xavier Ducrohet
96203e2dbe am 5ac53883: am 4dd2299d: LayoutLib: Update to latest API fix. 
* commit '5ac5388359652f45fd401dc269ac3e37b52216af':
  LayoutLib: Update to latest API fix.
 2011-02-07 13:52:04 -08:00
Xavier Ducrohet
8d3f4eb7cd am 80656fb7: am 62a99c0b: Merge "LayoutLib: Handle color state list in methods returning an int." into honeycomb 
* commit '80656fb71e98aa5aa2f9d7f010f2db4dfc0c9ff5':
  LayoutLib: Handle color state list in methods returning an int.
 2011-02-07 13:51:50 -08:00
Brad Fitzpatrick
45a59550b1 am bb756a90: am a62bf8bb: am b901c9ab: am 9204644d: Merge "Fix a race condition in NativeDaemonConnector" 
* commit 'bb756a90902ade5cf619f5fa65ec5505dcdf431a':
  Fix a race condition in NativeDaemonConnector
 2011-02-07 13:51:43 -08:00
Scott Main
97228942d8 am 602a891a: am b0f1cfff: Merge "docs: SearchView is iconified by default" into honeycomb 
* commit '602a891aea0392168e90f9dee61b33f45c698f34':
  docs: SearchView is iconified by default
 2011-02-07 13:51:36 -08:00
Dianne Hackborn
53595b1688 am 432ab6ac: am 6b497a04: am 4b7c1cac: am bb2e1ef8: Merge "Fixing possible race condition." 
* commit '432ab6ac04f22a5e4c15aece04117b35bbf8869c':
  Fixing possible race condition.
 2011-02-07 13:51:31 -08:00
Xavier Ducrohet
7455500684 am 181e3212: am 83d72da7: Merge "LayoutLib: improved rendering for system/title/action bars." into honeycomb 
* commit '181e3212625374e7954b0313e3a2782e15d09599':
  LayoutLib: improved rendering for system/title/action bars.
 2011-02-07 13:51:19 -08:00
Robert Ly
c07eb39417 am 18f5c7e6: am cfc048a3: set targetsdk=11 on renderscript misc samples project 
* commit '18f5c7e6919a8d66b1b7c818d55b92504961b379':
  set targetsdk=11 on renderscript misc samples project
 2011-02-07 13:51:11 -08:00
Robert Ly
a5c8eb76f5 am 7eca7f74: am 5cf98da8: Merge "Fixing renderscript samples to properly declare targetSDK" into honeycomb 
* commit '7eca7f742a31654a3240f70611ac8c82705d2b42':
  Fixing renderscript samples to properly declare targetSDK
 2011-02-07 13:51:03 -08:00
Xavier Ducrohet
0bf9f7066b am 1d009fbd: am 35064e5e: Merge "LayoutLib: add implementation of Bridge.renderDrawable()" into honeycomb 
* commit '1d009fbd17c52a0f3cdd26582e55abe03b125890':
  LayoutLib: add implementation of Bridge.renderDrawable()
 2011-02-07 13:50:48 -08:00
Paul Eastham
19e70cbbcb am 9a5bda87: am be46d145: Revert "Fix for StaticLayout bug with ellipsized text" 
* commit '9a5bda875f86b188b501ce7cf73810dd92288251':
  Revert "Fix for StaticLayout bug with ellipsized text"
 2011-02-07 13:50:42 -08:00
Dharmaray Kundargi
3ec816ba61 am 284f3128: am f7f24996: Merge "Fix issue 3426489 Overlay background changed when exported" into honeycomb 
* commit '284f3128fa959c8c2aa901d0af359f1f1b4d8bc4':
  Fix issue 3426489 Overlay background changed when exported
 2011-02-07 13:50:31 -08:00
Xavier Ducrohet
fc45532da8 am b627f783: am b0d34f9c: LayoutLib: split RenderSession\'s base method into RenderAction. 
* commit 'b627f78359ef3b1883f27e6fdf73a882bc3832b0':
  LayoutLib: split RenderSession's base method into RenderAction.
 2011-02-07 13:50:19 -08:00
Xavier Ducrohet
2c994424c8 am 1480942d: am 1126422e: LayoutLib: update to the new API. 
* commit '1480942d970ce0503fc99125dbf64e5dae0fd706':
  LayoutLib: update to the new API.
 2011-02-07 13:50:06 -08:00
Dharmaray Kundargi
88928ffc1c am 73edcfe8: am b894f895: Merge "Fix issue 3426200 Movie Studio crashes when a media item is deleted" into honeycomb 
* commit '73edcfe8f4678c4d5e91c8018e00a72ea325da71':
  Fix issue 3426200 Movie Studio crashes when a media item is deleted
 2011-02-07 13:49:38 -08:00
Xavier Ducrohet
b5fc0409ef am 57bb7faf: am 3944b784: Merge "LayoutLib: Replace custom BitmapFactory by a simpler delegate" into honeycomb 
* commit '57bb7faf9793329babe04493d89d891ef482ac4f':
  LayoutLib: Replace custom BitmapFactory by a simpler delegate
 2011-02-07 13:49:31 -08:00
Danny Fernandes
5bdbb562ee am 7d913d43: am 6ef407c0: Merge "Fixed 3423072 Imported 1080x720 video clips present distorted view" into honeycomb 
* commit '7d913d4350230afba8dea55718d887cf967d1ab2':
  Fixed 3423072 Imported 1080x720 video clips present distorted view
 2011-02-07 13:49:25 -08:00
Eric Laurent
b82d4570d9 am 5f3e9e69: am d4b88c88: Merge "Issue 3395734: fix media server restart detection" into honeycomb 
* commit '5f3e9e69a16f5a7bc70f3f010c8aae91f287e941':
  Issue 3395734: fix media server restart detection
 2011-02-07 13:49:16 -08:00
Kenny Root
7679365b54 am 6465889e: am c4dfa998: am d2a99617: am c94a9998: Merge "JPtextinput: Dont break emoji characters when cutting strings." 
* commit '6465889ecbf4c04bb4bb6f4e8d4306727f7ca837':
  JPtextinput: Dont break emoji characters when cutting strings.
 2011-02-07 13:49:08 -08:00
Jean-Michel Trivi
7d79721888 am d1f0947a: am c6a5dfd8: Merge "Fix bug 3425610 Reduce lock / unlock sound level" into honeycomb 
* commit 'd1f0947a609c492b4e96b41aa1cf055bc7603220':
  Fix bug 3425610 Reduce lock / unlock sound level
 2011-02-07 13:48:58 -08:00
Scott Main
1fbb9372e9 am 7706cd36: am c1b638ae: docs: add more info about activating components and change link for broadcasts 
* commit '7706cd3619ba4fe96027978d47e5526556f57962':
  docs: add more info about activating components and change link for broadcasts
 2011-02-07 13:48:48 -08:00
Gilles Debunne
c84d49d915 am 2b01f31a: (-s ours) am 1ba2a47b: (-s ours) am 893ac28f: Merge "Blinking runnable is created only if text is editable. DO NOT MERGE." into gingerbread 
* commit '2b01f31a3a83176147c2f0eef9787f5c754f9903':
  Blinking runnable is created only if text is editable. DO NOT MERGE.
 2011-02-07 13:48:34 -08:00
Gilles Debunne
97bf20c581 am 978dfdaa: (-s ours) am 826fbdf7: (-s ours) am 8a6ba494: Merge "All runnable are stopped on detach. DO NOT MERGE." into gingerbread 
* commit '978dfdaa1e5c8654a2a02eae8d7d006e7ced8c64':
  All runnable are stopped on detach. DO NOT MERGE.
 2011-02-07 13:48:26 -08:00
Gilles Debunne
03cc6db141 am ec1cae6d: (-s ours) am 2f7e9d40: (-s ours) am 53841df2: Merge "SelectAllOnFocus shows a higlighted text. DO NOT MERGE." into gingerbread 
* commit 'ec1cae6daa179a9e86723ecbcfad441fc3c0dd70':
  SelectAllOnFocus shows a higlighted text. DO NOT MERGE.
 2011-02-07 13:48:17 -08:00
Trevor Johns
92d7dae32f am 18fc4f80: am 8d7cc6fa: Merge "Minor updates to Android Market Licensing Service docs." into honeycomb 
* commit '18fc4f80d35c43962ac62877460e3ba644afde90':
  Minor updates to Android Market Licensing Service docs.
 2011-02-07 13:48:06 -08:00
Mike Cleron
b3fe3f59d1 am e4d08c02: am 851beae7: Merge "Properly handle dirty rectangles generated from 9-patches Bug #3409580" into honeycomb 
* commit 'e4d08c02229bea67c6f19db22d4ffa45196d4258':
  Properly handle dirty rectangles generated from 9-patches Bug #3409580
 2011-02-07 13:47:58 -08:00
Mike Cleron
b31688eb05 am a626eb18: am 2d47fd3c: Merge "Fix crash when Paths are GCd in hw accelerated apps" into honeycomb 
* commit 'a626eb18ae2c4a48c8770ece3a64eeee5974f455':
  Fix crash when Paths are GCd in hw accelerated apps
 2011-02-07 13:47:48 -08:00
Stephen Hines
74d0778229 am 95dc232c: am a5b8768f: Merge "Add support for memcpy/memset to RS." into honeycomb 
* commit '95dc232c0a16c64e422ef7e57e14e5f955b112a2':
  Add support for memcpy/memset to RS.
 2011-02-07 13:47:21 -08:00
Jamie Gennis
f7398e2808 am c7839751: am c2efcd2c: Merge "Initialize the SurfaceTexture transform fields." into honeycomb 
* commit 'c7839751aa1de52e0c3aab7dd1518b0fc8f2ee0a':
  Initialize the SurfaceTexture transform fields.
 2011-02-07 13:47:02 -08:00
Dianne Hackborn
e160c7b9f1 am 60a74642: am 24c8ac3b: Merge "Fix issue #3414328: A couple panics observed during an attempted..." into honeycomb 
* commit '60a746426c62bf03b3b5fb494a9cddb9b1ae5166':
  Fix issue #3414328: A couple panics observed during an attempted...
 2011-02-07 13:46:50 -08:00
Eric Laurent
3da2538aa1 am bdb23c26: am 2e96f15d: Merge "Fix issues 3425035 and 3423785." into honeycomb 
* commit 'bdb23c26759089e29eb2f379e296bd006bc32b97':
  Fix issues 3425035 and 3423785.
 2011-02-07 13:46:31 -08:00
Gilles Debunne
de1285e7ea am 63308bd0: am a324a581: Merge "Fix for StaticLayout bug with ellipsized text" into honeycomb 
* commit '63308bd092a0edcea685d9f81b3d6d6d345c663b':
  Fix for StaticLayout bug with ellipsized text
 2011-02-07 13:46:21 -08:00
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
Xavier Ducrohet
5ac5388359 am 4dd2299d: LayoutLib: Update to latest API fix. 
* commit '4dd2299d5766bf14479578772a0946c5399a0158':
  LayoutLib: Update to latest API fix.
 2011-02-07 13:23:20 -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