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

17449 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Guy
177b580f56 Merge "Add a new attribute to LinearLayout: useLargestChild. Bug #2379138" 2010-01-21 19:11:20 -08:00
Romain Guy
5b1b241710 Add a new attribute to LinearLayout: useLargestChild. 
Bug #2379138

This new attribute is to be used when the LinearLayout is wrap_content but you want
all the children inside to have the same dimension. Set useLargestChild to true and
give all the children a width/height of 0 and a weight of 1.0.
 2010-01-21 19:09:51 -08:00
Grace Kloba
55f0c1fa24 am 76c29e63: (-s ours) am f167c4bf: DO NOT MERGE 
Merge commit '76c29e633fd924e0f98f34768999abb991753394'

* commit '76c29e633fd924e0f98f34768999abb991753394':
  DO NOT MERGE
 2010-01-21 17:57:51 -08:00
Grace Kloba
0771ba9cf2 am b869c594: (-s ours) am 17b14bd3: DO NOT MERGE 
Merge commit 'b869c594465d29e96fb841b48c638ddee232bbd7'

* commit 'b869c594465d29e96fb841b48c638ddee232bbd7':
  DO NOT MERGE
 2010-01-21 17:57:29 -08:00
Grace Kloba
61ef50bb77 am 55d791e7: (-s ours) am 5a0bf1f0: DO NOT MERGE 
Merge commit '55d791e74eaa8c80b965075d6debc1cfd7bde99a'

* commit '55d791e74eaa8c80b965075d6debc1cfd7bde99a':
  DO NOT MERGE
 2010-01-21 17:57:07 -08:00
Grace Kloba
01752fe46b am 8d4baa78: am d79d1c72: Merge "If ZoomButttonsController detects more than one pointer, give up the control. This should enable the View behind it, like WebView, will always get the multi-pointer events even when ZoomButtonsController is up." into eclair 
Merge commit '8d4baa789302b2c0f2657af9ba6dc98fcc926ee2'

* commit '8d4baa789302b2c0f2657af9ba6dc98fcc926ee2':
  If ZoomButttonsController detects more than one pointer,
 2010-01-21 17:56:46 -08:00
Grace Kloba
3ccf06e2c5 am 3648f949: (-s ours) am f080a5ad: Merge "DO NOT MERGE" into eclair 
Merge commit '3648f949ef100668500c9f21d0e8b53d310a393e'

* commit '3648f949ef100668500c9f21d0e8b53d310a393e':
  DO NOT MERGE
 2010-01-21 17:56:25 -08:00
Jim Miller
cd2354f540 am 84928fa9: am 813d2d86: Merge "Fix for 2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent." into eclair 
Merge commit '84928fa93c3be222b77794de9922d299f4971ea4'

* commit '84928fa93c3be222b77794de9922d299f4971ea4':
  Fix for 2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent.
 2010-01-21 17:56:03 -08:00
Xavier Ducrohet
c22b3ca198 am da84d6a1: am 908a8111: Merge "ADT/Layoutlib: Add dash support to stroke." into eclair 
Merge commit 'da84d6a1b1c37376d48f92ae59b76f1c891772f6'

* commit 'da84d6a1b1c37376d48f92ae59b76f1c891772f6':
  ADT/Layoutlib: Add dash support to stroke.
 2010-01-21 17:55:40 -08:00
Xavier Ducrohet
4e8e87d905 am c0ea805c: am 2b30a4a5: Merge "ADT/Layoutlib: properly handle stroke information." into eclair 
Merge commit 'c0ea805c649666b55d4dde09eb72dcccfa8bccc3'

* commit 'c0ea805c649666b55d4dde09eb72dcccfa8bccc3':
  ADT/Layoutlib: properly handle stroke information.
 2010-01-21 17:55:17 -08:00
Paul Westbrook
fa5875a3c5 Merge "Bug 2330111" 2010-01-21 17:14:06 -08:00
Marco Nelissen
35b002a9c8 Make the media scanner disregard database entries that do not have 
absolute path names. This allows us to store other things (perhaps
with http or content URIs) in the database, without the media scanner
removing them again.
 2010-01-21 17:12:45 -08:00
Paul Westbrook
68f2f547f5 Bug 2330111 
Make NumberPicker public

Made setCurrent() more robust, as the value needs to be within the range
specified earlier. setCurrent() will now throw an exception
if the specified doesn't fall in the range
 2010-01-21 16:56:57 -08:00
Wink Saville
94986f23ec Merge "Fix build, incorrect link/see tags." 2010-01-21 16:46:42 -08:00
Dianne Hackborn
ab489cabed Merge "Don't crash when there is no admin." 2010-01-21 16:44:53 -08:00
Mathias Agopian
6e6393c279 Merge changes I2d41cb94,Ia1a17985 
* changes:
  fix [2324665] texture leak in surfaceflinger when using camera
  fix a texture leak introduced recently.
 2010-01-21 16:37:48 -08:00
Wink Saville
aa6a2aad03 Fix build, incorrect link/see tags. 
Change-Id: Ia1c13ddb198721234323f1944ea3537ea6f34820
 2010-01-21 16:37:04 -08:00
Mathias Agopian
2d41cb9433 fix [2324665] texture leak in surfaceflinger when using camera 2010-01-21 16:29:34 -08:00
Dianne Hackborn
4141d035c7 Don't crash when there is no admin. 2010-01-21 16:29:00 -08:00
Mathias Agopian
a1a1798599 fix a texture leak introduced recently. 
create the texture name once and for all for a given BufferSource
and make sure to recreate it when we're forced to delete the texture.
 2010-01-21 16:27:30 -08:00
Doug Zongker
37f3ddb60b Merge "relocate GoogleLoginService" 2010-01-21 16:10:58 -08:00
Kenny Root
3a19833750 Multiple asset adding in one shot for AssetManager 
Add a hidden convenience method to allow adding multiple assets
to an AssetManager at once.

Change-Id: I56753a85904a2c8e9a405cba2ea3cb85ec40e1cc
 2010-01-21 16:09:40 -08:00
Wink Saville
051ab62334 Merge "Fix build, GsmServiceStateTracker was using old EventLog API." 2010-01-21 15:00:12 -08:00
Jim Miller
11b019d07f Fix 2385283: Use device-specific salt when generating hashes for lock passwords. 2010-01-21 14:53:22 -08:00
Doug Zongker
0a2fb2174e relocate GoogleLoginService 
Change-Id: I79f4ff658ab136adcc54c432db76f34d2de5f6ac
 2010-01-21 14:36:17 -08:00
Grace Kloba
1b810a5706 am 88196464: (-s ours) am 4d69ac66: Merge "DO NOT MERGE" into eclair 
Merge commit '88196464e91dd533f2dd28a02f55b7e4801eead0'

* commit '88196464e91dd533f2dd28a02f55b7e4801eead0':
  DO NOT MERGE
 2010-01-21 14:32:01 -08:00
Grace Kloba
15e26dca2b Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base 2010-01-21 14:31:45 -08:00
Grace Kloba
ee20cbf30a am c8cab725: (-s ours) am d1019a99: Merge "DO NOT MERGE" into eclair 
Merge commit 'c8cab72521781091e87049861c4b25fb19197ea4'

* commit 'c8cab72521781091e87049861c4b25fb19197ea4':
  DO NOT MERGE
 2010-01-21 14:31:33 -08:00
Xavier Ducrohet
18d21ef83e am 20cc5570: am 79f05bb4: Merge "ADT/Layoutlib: improved gradient drawing for perf." into eclair 
Merge commit '20cc55703348827fbd80ff0410777a537f01e10e'

* commit '20cc55703348827fbd80ff0410777a537f01e10e':
  ADT/Layoutlib: improved gradient drawing for perf.
 2010-01-21 14:31:11 -08:00
Dianne Hackborn
df83afaf29 More device policy manager / admin work. 
Update API with some new features, re-arrange how you check for valid
passwords, and start hooking up the back-end implementation.
 2010-01-21 14:30:57 -08:00
Xavier Ducrohet
beb0993c6a am 38fa9eee: am 89d538dc: ADT/Layoutlib: don\'t draw 0-sized rectangle, AWT doesn\'t like that. 
Merge commit '38fa9eee9324b2355f28372e80dba12c1d7cc105'

* commit '38fa9eee9324b2355f28372e80dba12c1d7cc105':
  ADT/Layoutlib: don't draw 0-sized rectangle, AWT doesn't like that.
 2010-01-21 14:30:48 -08:00
Xavier Ducrohet
900399f3e8 am 895c92a4: am 240298f9: Merge "ADT/Layoutlib: always use custom gradient (java) Paint." into eclair 
Merge commit '895c92a44b8bcf0aec7066c061293cafe12a76c2'

* commit '895c92a44b8bcf0aec7066c061293cafe12a76c2':
  ADT/Layoutlib: always use custom gradient (java) Paint.
 2010-01-21 14:30:17 -08:00
Roman Nurik
eca7f02f52 am b8c564d0: am 6a739ea8: Merge "Updated developer groups documentation to point to Stack Overflow, also rearranged a few things." into eclair 
Merge commit 'b8c564d0fc7b2bdcc794d63f23b21df2540d7cef'

* commit 'b8c564d0fc7b2bdcc794d63f23b21df2540d7cef':
  Updated developer groups documentation to point to Stack Overflow, also rearranged a few things.
 2010-01-21 14:29:26 -08:00
Xavier Ducrohet
7fa53aa5df am 31ef2e77: am b847fbf2: Merge "ADT/Layout: support for 3+ color in linear gradients" into eclair 
Merge commit '31ef2e77c50485ad6ed410a5d341754d6787b8e1'

* commit '31ef2e77c50485ad6ed410a5d341754d6787b8e1':
  ADT/Layout: support for 3+ color in linear gradients
 2010-01-21 14:29:02 -08:00
Wink Saville
ac376f4854 Fix build, GsmServiceStateTracker was using old EventLog API. 
Change-Id: Ib202d0ebbbb11c0ccad40445426c0c3704eb30b5
 2010-01-21 14:15:05 -08:00
Leon Scroggins
04ce08f34e Merge "Create a common method for updating the title of a download from the filename." 2010-01-21 13:29:32 -08:00
Leon Scroggins
fe79ef44fe Create a common method for updating the title of a download from the filename. 
This method will be used by the DownloadProvider and the BrowserDownloadPage.
 2010-01-21 16:19:41 -05:00
John Wang
88a195b58a am 7319d94f: am 99f2a4bb: Merge "Add Event log for RAT switch." into eclair 
Merge commit '7319d94ff1ca898c36d2da8dd0cd8469d91bc5af'

* commit '7319d94ff1ca898c36d2da8dd0cd8469d91bc5af':
  Add Event log for RAT switch.
 2010-01-21 12:47:13 -08:00
Derek Sollenberger
f5831d4303 Removing unused parameter from NP_Initialize. 2010-01-21 15:06:19 -05:00
Justin Mattson
ef340357ce NEW_API: Declare an ACTION_SEARCH_SETTINGS constant in android.provider.Settings so that apps can cause this system setting group to be opened directly. 
The Settings app already responds to this action it just was not exposed in the platform API.
 2010-01-21 11:40:58 -08:00
Amith Yamasani
2fa6b52c2b Merge "Workaround for a database update callback that claims that the data doesn't exist." 2010-01-21 11:22:01 -08:00
Andreas Huber
48da344cf0 Merge "Fix circular dependency between StagefrightPlayer and AwesomePlayer that prevented proper cleanup." 2010-01-21 10:44:54 -08:00
Andreas Huber
84a93a5674 Merge "Special-case .wmv and .wma metadata retrieval and playback to use PV if available." 2010-01-21 10:44:47 -08:00
Andreas Huber
2cb5c9c633 Special-case .wmv and .wma metadata retrieval and playback to use PV if available. 
related-to-bug: 2381874
 2010-01-21 10:31:05 -08:00
Vasu Nori
589eb9c5e1 Merge "caching PRAGMA sql statements caused cts-tests failures." 2010-01-21 10:29:22 -08:00
Andreas Huber
a3f4384ce8 Fix circular dependency between StagefrightPlayer and AwesomePlayer that prevented proper cleanup. 
related-to-bug: 2355922
 2010-01-21 10:28:45 -08:00
Amith Yamasani
58bb107f2a Workaround for a database update callback that claims that the data doesn't exist. 
It's probably some intermediate state when updating the volumes that's causing
the row to be missing.
 2010-01-21 09:58:01 -08:00
Derek Sollenberger
72666bac20 am 1f7747ad: am 7cabb03d: Resize the WebView when the soft-keyboard appears in landscape mode. 
Merge commit '1f7747adb6a79317f4bd52fb78b3c567dd203883'

* commit '1f7747adb6a79317f4bd52fb78b3c567dd203883':
  Resize the WebView when the soft-keyboard appears in landscape mode.
 2010-01-21 08:39:15 -08:00
Derek Sollenberger
1f7747adb6 am 7cabb03d: Resize the WebView when the soft-keyboard appears in landscape mode. 
Merge commit '7cabb03da7053f3ceb5ff8b41b6a46052c6658a1' into eclair-mr2-plus-aosp

* commit '7cabb03da7053f3ceb5ff8b41b6a46052c6658a1':
  Resize the WebView when the soft-keyboard appears in landscape mode.
 2010-01-21 08:29:33 -08:00
Mike Lockwood
80ffe5d2fe Merge "Implement Notification.DEFAULT_LIGHTS flag." 2010-01-21 08:18:15 -08:00