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

34121 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Malin
a79935afd0 am 439444d9: am 75d3591b: Merge "DOC CHANGE: Fix bug in Testing doc" into gingerbread 
Merge commit '439444d9043c46669d2fe8694ed3db8f09d92282'

* commit '439444d9043c46669d2fe8694ed3db8f09d92282':
  DOC CHANGE: Fix bug in Testing doc
 2010-10-15 14:26:57 -07:00
John Wang
21420d6d84 Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base 2010-10-15 14:26:51 -07:00
Jeff Brown
a617fdc65b am 567db077: am 2d441e14: Merge "Make sure EventHub reports added/removed devices immediately." into gingerbread 
Merge commit '567db07702f851f2e7fb1fb0021ce2871469183e'

* commit '567db07702f851f2e7fb1fb0021ce2871469183e':
  Make sure EventHub reports added/removed devices immediately.
 2010-10-15 14:26:18 -07:00
Gil Dobjanschi
b9e9f6f7e9 Merge "Save the color for gradient effects" 2010-10-15 14:26:11 -07:00
Roy West
ecc105668c am d23cc4b8: am 29f28cdc: Merge "Change storage names to match 10-13 decision" into gingerbread 
Merge commit 'd23cc4b814c01675f6503c4dcab21655c56d0256'

* commit 'd23cc4b814c01675f6503c4dcab21655c56d0256':
  Change storage names to match 10-13 decision
 2010-10-15 14:26:08 -07:00
Joe Onorato
78fc85ce64 am 35d34c67: am 3d828e62: Merge "Do not build pbkdf2gen on non-Linux hosts" into gingerbread 
Merge commit '35d34c67b7e94639086f2392d674e59b82c26a42'

* commit '35d34c67b7e94639086f2392d674e59b82c26a42':
  Do not build pbkdf2gen on non-Linux hosts
 2010-10-15 14:25:59 -07:00
Gilles Debunne
672a2531ae am 4fa7f4f4: am 53ea7f58: Merge "Really leave text selection mode when using the trackball." into gingerbread 
Merge commit '4fa7f4f4963568258a6b4179176de8386cb5d3db'

* commit '4fa7f4f4963568258a6b4179176de8386cb5d3db':
  Really leave text selection mode when using the trackball.
 2010-10-15 14:25:48 -07:00
Ben Komalo
c1d71003fc Merge "Fix Spinners that don't have a hard pixel width set. getDimensionPixelSize -> getLayoutDimension" 2010-10-15 14:10:57 -07:00
Hung-ying Tyan
0601be0803 am 4f5eb955: am bd57eeaf: SipService: add wake lock for multiple components. 
Merge commit '4f5eb9550ba2cc037c4aa81613574a38a956dd5c'

* commit '4f5eb9550ba2cc037c4aa81613574a38a956dd5c':
  SipService: add wake lock for multiple components.
 2010-10-15 14:01:39 -07:00
Hung-ying Tyan
61312df607 am f3a935f6: am 3bb10442: Merge "Make SipService listen to WIFI state change events." into gingerbread 
Merge commit 'f3a935f6aa421110c7b6f36f922223c195f751bc'

* commit 'f3a935f6aa421110c7b6f36f922223c195f751bc':
  Make SipService listen to WIFI state change events.
 2010-10-15 14:01:10 -07:00
Kenny Root
fcab0f5502 am 8fda1636: am bdf8034c: Merge "OBB: use PBKDF2 for key generation." into gingerbread 
Merge commit '8fda1636e3e35f060b9046294efd3c062a1fdb84'

* commit '8fda1636e3e35f060b9046294efd3c062a1fdb84':
  OBB: use PBKDF2 for key generation.
 2010-10-15 14:00:58 -07:00
Romain Guy
10aca41e51 Merge "Fix clipping issue in StackView." 2010-10-15 14:00:17 -07:00
Romain Guy
e5ebcb0107 Fix clipping issue in StackView. 
Change-Id: I7ec28f25c3993a2bd7ef6399ba1923839d239905
 2010-10-15 13:57:28 -07:00
David Brown
97d88927f2 am e3c50a54: am cebe5b2e: Merge "Reduce CallerInfoAsyncQuery logging in user builds (STOPSHIP cleanup)" into gingerbread 
Merge commit 'e3c50a5470f64fd99438d6fd985f88d9fe20919a'

* commit 'e3c50a5470f64fd99438d6fd985f88d9fe20919a':
  Reduce CallerInfoAsyncQuery logging in user builds (STOPSHIP cleanup)
 2010-10-15 13:40:16 -07:00
Justin Ho
fb8058e946 am d9fdcfda: (-s ours) am c9110970: Merge "Updated media transport controls" into gingerbread 
Merge commit 'd9fdcfdaad2f8177f8fa2bed2d6bd978a28d7559'

* commit 'd9fdcfdaad2f8177f8fa2bed2d6bd978a28d7559':
  Updated media transport controls
 2010-10-15 13:39:31 -07:00
Gil Dobjanschi
f958f0fe9d Save the color for gradient effects 
Change-Id: I21e14344aa7410b5c99102ab41b4ec94db2fbe61
 2010-10-15 13:38:03 -07:00
Justin Ho
23f786a9da am 31e5901e: (-s ours) am b6634127: Merge "Updating popup center asset (v5)" into gingerbread 
Merge commit '31e5901e4c1b753787bfc3c2aef3463c38f2d0eb'

* commit '31e5901e4c1b753787bfc3c2aef3463c38f2d0eb':
  Updating popup center asset (v5)
 2010-10-15 13:32:21 -07:00
Ben Komalo
bdaa34c670 Fix Spinners that don't have a hard pixel width set. 
getDimensionPixelSize -> getLayoutDimension

Change-Id: Ic126955ad7c7cee3aea423c43fc16da02ec9664e
 2010-10-15 13:27:11 -07:00
Kenny Root
f25d24b2c7 resolved conflicts for merge of 8b1082bb to master 
Change-Id: If9d898123894c53bf83ac28cc7c03cd849c8ef17
 2010-10-15 13:10:01 -07:00
Jaikumar Ganesh
db3694d030 am a905d955: am a31cbd61: Merge "Remove STOPSHIP and reduce log spam." into gingerbread 
Merge commit 'a905d9551103c5be465429ffeb0352b78058457e'

* commit 'a905d9551103c5be465429ffeb0352b78058457e':
  Remove STOPSHIP and reduce log spam.
 2010-10-15 12:44:39 -07:00
Ben Komalo
4138b33826 Merge "Apply values set in "dropDownWidth" attribute of Spinner styles." 2010-10-15 11:55:52 -07:00
Ben Komalo
72536f7240 Apply values set in "dropDownWidth" attribute of Spinner styles. 
Bug: 3099224
Change-Id: I904f2ef39a65a62076ff82319128a31767a2394b
 2010-10-15 11:42:07 -07:00
Kenny Root
f41441178b Merge "resolved conflicts for merge of c6bf3eaa to master" 2010-10-15 11:33:47 -07:00
Jason Sams
afbcc82ae8 Merge "Fix deadlock on RS teardown." 2010-10-15 11:28:56 -07:00
Jason Sams
0d2b2d5e13 Fix deadlock on RS teardown. 
Change-Id: I34d2702b535e28e9519c7368fd8a942bfe0724bc
 2010-10-15 11:21:24 -07:00
Kenny Root
9ca6d71c52 resolved conflicts for merge of c6bf3eaa to master 
Change-Id: I6421faf52c160a81b03c63b91f1aedfe0f151cac
 2010-10-15 11:20:42 -07:00
Jaikumar Ganesh
72cd64b20e resolved conflicts for merge of bbb90d13 to master 
Change-Id: I85de73f6e11e7547a006d41ca49021bca19af14b
 2010-10-15 10:02:57 -07:00
Mindy Pereira
97929aa996 am baf56089: (-s ours) am 998c6777: Merge "Never show overscroll if the page scrolls at all." into gingerbread 
Merge commit 'baf5608941ae4de2bb5620fc81291f33da9d57ac'

* commit 'baf5608941ae4de2bb5620fc81291f33da9d57ac':
  Never show overscroll if the page scrolls at all.
 2010-10-15 09:29:40 -07:00
Mindy Pereira
7daa25d8b0 am 7d73b706: (-s ours) am 868322ce: Merge "Reduce the time it takes to decay the glow after a pull." into gingerbread 
Merge commit '7d73b7066867368ebb30dd67a1649ae9db04b93e'

* commit '7d73b7066867368ebb30dd67a1649ae9db04b93e':
  Reduce the time it takes to decay the glow after a pull.
 2010-10-15 09:10:52 -07:00
Mathias Agopian
99e3fab534 am 5bfa3a34: am 011b5bcc: Merge "implement part of [3094280] New animation for screen on and screen off add support for screen on animation" into gingerbread 
Merge commit '5bfa3a34eaef759c3ec4def76f646eb1c0bf997f'

* commit '5bfa3a34eaef759c3ec4def76f646eb1c0bf997f':
  implement part of [3094280] New animation for screen on and screen off
 2010-10-15 08:33:43 -07:00
Andreas Huber
a4a2a3aaef am 27c7fb1a: am 90d59d18: Merge "Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that." into gingerbread 
Merge commit '27c7fb1a861776b4fdc2632697e4e25eee83617f'

* commit '27c7fb1a861776b4fdc2632697e4e25eee83617f':
  Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that.
 2010-10-15 08:33:23 -07:00
Jean-Baptiste Queru
c182a57897 am 0982d8d0: Merge "ignore - a similar change already exists" into gingerbread-plus-aosp 
Merge commit '0982d8d0d3b9d685a3c159519cb0d2eb705e3027'

* commit '0982d8d0d3b9d685a3c159519cb0d2eb705e3027':
  Fix sometimes mExpandedView will appear while screen transforming.
 2010-10-15 08:33:12 -07:00
Dan Morrill
1785627fb3 am b58af2b8: am 5c62ab0a: Merge "Adding a new <uses-gl-texture/> tag, to be used to enable apps to specify filtering based on support for OpenGL ES texture and texture compression formats." into gingerbread 
Merge commit 'b58af2b8b3871436942d0e2c878c906bffaa2fb0'

* commit 'b58af2b8b3871436942d0e2c878c906bffaa2fb0':
  Adding a new <uses-gl-texture/> tag, to be used to enable apps to specify
 2010-10-15 08:33:00 -07:00
Kenny Root
09b35d2fe5 am 89b73a75: am 361a6ad1: Merge "Handle native library deletion in scanPackage" into gingerbread 
Merge commit '89b73a75467d85c58467c5b8c080c77d25860fe0'

* commit '89b73a75467d85c58467c5b8c080c77d25860fe0':
  Handle native library deletion in scanPackage
 2010-10-15 08:32:43 -07:00
Kenny Root
733e79c240 am 2f98a585: am 49ec3dff: Merge "OBB: Change documentation to reflect reality" into gingerbread 
Merge commit '2f98a585cda066689b1b525322c51fcacbc3770b'

* commit '2f98a585cda066689b1b525322c51fcacbc3770b':
  OBB: Change documentation to reflect reality
 2010-10-15 08:32:30 -07:00
Andreas Huber
4bd4bd6fc0 am bb5d7c21: am 5f423917: Merge "Attempt to derive the avg. bitrate of the entire stream from metadata." into gingerbread 
Merge commit 'bb5d7c21615128630fc9d08274bb14ca01e2124b'

* commit 'bb5d7c21615128630fc9d08274bb14ca01e2124b':
  Attempt to derive the avg. bitrate of the entire stream from metadata.
 2010-10-15 08:32:06 -07:00
Ben Murdoch
d609279c33 Set the correct style for TextAppearance.Holo.SearchResult 
Values have been taken from the current TextAppearance.SearchResult
style. This was making WebTextView in the Browser show unreadable
autocomplete suggestions (pale grey text on a white background).

Change-Id: I35961e12ab96d29791c495723709b2eff5714471
 2010-10-15 10:39:11 +01:00
Andreas Huber
dc0728f6b5 am 8e4f3c76: am 646e0d5a: Merge "Some webcams output rtp streams but never send any rtcp data in violation of the specs. Attempt to use fake timestamps to be able to play these..." into gingerbread 
Merge commit '8e4f3c76dd7f5596fa2fe10bdf008d4c02353160'

* commit '8e4f3c76dd7f5596fa2fe10bdf008d4c02353160':
  Some webcams output rtp streams but never send any rtcp data in violation of
 2010-10-15 00:08:35 -07:00
Kenny Root
9456714cfb am b4f26a9d: am e6ae5c39: Merge "Add shutdown assurance" into gingerbread 
Merge commit 'b4f26a9d37caf7762b66b68d50825c5b075b42bd'

* commit 'b4f26a9d37caf7762b66b68d50825c5b075b42bd':
  Add shutdown assurance
 2010-10-15 00:08:22 -07:00
Wink Saville
b079a10652 am 94980e0f: am 07e1be62: Merge "Fix NPE caused by Change I4df27119." into gingerbread 
Merge commit '94980e0f76295de53bd168608d11dba3c39cca9d'

* commit '94980e0f76295de53bd168608d11dba3c39cca9d':
  Fix NPE caused by Change I4df27119.
 2010-10-15 00:07:40 -07:00
Scott Main
a8d2506573 am 5cfa877e: am eb4ef072: am 5249ad03: docs: add "boot completed" broadcast to list of DO NOTs for installing on external storage bug: 3088494 
Merge commit '5cfa877e22a2d76d1ea36c3f0c2c708248da3d0e'

* commit '5cfa877e22a2d76d1ea36c3f0c2c708248da3d0e':
  docs: add "boot completed" broadcast to list of DO NOTs for installing on external storage
 2010-10-15 00:07:26 -07:00
Nick Pelly
232570cc33 am 67fc4af9: am 527d8bbd: Merge "Add missing native methods to fix boot." into gingerbread 
Merge commit '67fc4af9765d15c4e011c8127f9c06dfd0368bbe'

* commit '67fc4af9765d15c4e011c8127f9c06dfd0368bbe':
  Add missing native methods to fix boot.
 2010-10-15 00:05:29 -07:00
Kenny Root
4a90f93781 resolved conflicts for merge of a127c07c to master 
Change-Id: Ifdfc6681cba00f36456eaf7a97f34a75b9d0c086
 2010-10-14 23:58:41 -07:00
Andreas Huber
e449fceaa4 am 28b93967: am 165c6579: Merge "HTTP Live content that are tagged as complete are now seekable." into gingerbread 
Merge commit '28b93967d0e702304c7edec854a29d5ab88bfce0'

* commit '28b93967d0e702304c7edec854a29d5ab88bfce0':
  HTTP Live content that are tagged as complete are now seekable.
 2010-10-14 23:22:21 -07:00
Leon Scroggins
af95d12b12 am c7ee44cb: am dfc07279: Line up WebTextView text with the page. 
Merge commit 'c7ee44cbe155c2272687a0e82133f3e729eac137'

* commit 'c7ee44cbe155c2272687a0e82133f3e729eac137':
  Line up WebTextView text with the page.
 2010-10-14 23:03:23 -07:00
Mike Lockwood
d7117f04d8 am 1442818a: am c792c2e9: Merge "GPS: Remove unnecessary and broken test in AgpsRilInterface updateNetworkState glue" into gingerbread 
Merge commit '1442818a10988cc011f55104e997474b5d3d2468'

* commit '1442818a10988cc011f55104e997474b5d3d2468':
  GPS: Remove unnecessary and broken test in AgpsRilInterface updateNetworkState glue
 2010-10-14 22:37:14 -07:00
Justin Ho
6948369ac8 am 27023cc5: (-s ours) am e03471e1: Merge "Updated popup_ 9 patches and removing text_select_handle (hdpi)" into gingerbread 
Merge commit '27023cc5fefc4e56f672ee264289fa319d97585b'

* commit '27023cc5fefc4e56f672ee264289fa319d97585b':
  Updated popup_ 9 patches and removing text_select_handle (hdpi)
 2010-10-14 22:13:37 -07:00
Justin Ho
d738407ce4 am c42d196f: (-s ours) am 33bae9b8: Updated lockscreen asset (Hiroshi), new menu background 
Merge commit 'c42d196f969e1d7f588e5e397176557c4c97575f'

* commit 'c42d196f969e1d7f588e5e397176557c4c97575f':
  Updated lockscreen asset (Hiroshi), new menu background
 2010-10-14 21:48:20 -07:00
Hung-ying Tyan
4fe18a4998 am 8a362186: am f1b1eec9: Merge "SipService: mScreenOn is flipped to wrong value." into gingerbread 
Merge commit '8a3621866d8a04b0a229eb5765ea9799e68fd90c'

* commit '8a3621866d8a04b0a229eb5765ea9799e68fd90c':
  SipService: mScreenOn is flipped to wrong value.
 2010-10-14 21:19:54 -07:00
Nick Pelly
734b8b8cb8 am 9fae3ecc: am ab39f1ef: Merge "Fix build." into gingerbread 
Merge commit '9fae3eccce6b3f336ecf304f6c15df0edd9ca7e6'

* commit '9fae3eccce6b3f336ecf304f6c15df0edd9ca7e6':
  Fix build.
 2010-10-14 21:19:36 -07:00