Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,022 Commits 3 Branches 0 Tags
b50ebe3a15cc19d5729964db1978d50b94de71ca
Commit Graph

20022 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
dae34fa8a1 am d603e989: am 88e653f6: Merge "docs: some spelling typos" into eclair 
Merge commit 'd603e989f47093ad9f7638bd3f62717daa731fd5'

* commit 'd603e989f47093ad9f7638bd3f62717daa731fd5':
  docs: some spelling typos
 2010-01-22 09:43:56 -08:00
Andy McFadden
e577232406 Move VM feature strings (used by DDMS) into VM. 
Until now, we used a place-holder in frameworks/base.

Disable a test that shouldn't have been on.
 2010-01-22 09:36:03 -08:00
Eric Laurent
700aab67eb Fix issue 2388215: Audio not routed to 3.5mm Headset after removal/insertion. 
The problem occurs if the delay between the headset removal and insertion is less than one second.
In this case, as the headset disconnection intent is broadcast with a 1 second delay to allow music to pause
before updating the route, the connection intent is broadcast before and is ignored, leaving the system
in a state where the headset is considered disconnected.

The fix consists in inserting a delay before broadcasting the connection intent if a disconnection
intent is pending broadcast.
 2010-01-22 09:31:12 -08:00
Marco Nelissen
7c45147f35 Merge "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-22 07:53:12 -08:00
John Wang
08cb002402 Handle emergency calls only status in ServiceStateTracker. 
For bug 2352094, handle emergency calls only status and
pass the emergency calls only string via SPN_STRING_UPDATED intent.
 2010-01-22 01:03:14 -08:00
Ken Shirriff
e79f721e71 Remove unused providers 
bug 2388178
 2010-01-22 00:14:50 -08:00
Ken Shirriff
a69a23b2a5 Use AUTHORITY constant for calendar. 
This will allow the calendar authority to be changed later.

bug 2388178
 2010-01-21 21:46:31 -08:00
Chih-Chung Chang
e1ceec234c Add an orientation parameter for overlay, so we can do camera preview in portrait mode. 2010-01-21 20:20:08 -08:00
Grace Kloba
77dc179baa As embedded and full screen shares the same view, 
we have to replace the AbsoluteLayout with
ViewGroup.Layout before setting it to the dialog
as dialog's FrameLayout doesn't accept AbsoluteLayout.

This should fix the crash when changing orientation.
 2010-01-21 19:13:34 -08:00
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
Fred Quintana
6f3e1e27a6 am 9a400fa4: Merge "initialize sync adapters that get installed while the system is running bug http://b/issue?id=2360782" into eclair 
Merge commit '9a400fa4d3e89a3ab3669c0aa2ef6676020646d1' into eclair-plus-aosp

* commit '9a400fa4d3e89a3ab3669c0aa2ef6676020646d1':
  initialize sync adapters that get installed while the system is running
 2010-01-21 17:35:28 -08:00
jsh
3c2d3667aa am 036e2108: Fix NPE when importing from USIM. 
Merge commit '036e21083d9936425687d7de29e95b2c458a7e4a' into eclair-plus-aosp

* commit '036e21083d9936425687d7de29e95b2c458a7e4a':
  Fix NPE when importing from USIM.
 2010-01-21 17:35:18 -08:00
Fred Quintana
9a400fa4d3 Merge "initialize sync adapters that get installed while the system is running bug http://b/issue?id=2360782" into eclair 2010-01-21 17:30:07 -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
jsh
036e21083d Fix NPE when importing from USIM. 
Need to check if fileIds is empty.

b/2349232
 2010-01-21 16:58:17 -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
Yu Shan Emily Lau
47f1d4d509 am b1780474: Merge "Instead of caputre the memory footprint before and after the test. We would like to monitor the memory trend while the test is running. This can eliminate the overhead for the frist test case in creating the player." into eclair 
Merge commit 'b1780474e6e3e1d3c584166c2fde336a0cd1c43f' into eclair-plus-aosp

* commit 'b1780474e6e3e1d3c584166c2fde336a0cd1c43f':
  Instead of caputre the memory footprint before and after the test. We would like to monitor the memory trend while the test is running. This can eliminate the overhead for the frist test case in creating the player.
 2010-01-21 15:14:36 -08:00
Eric Fischer
ad0e536355 am 50adb167: Pull in "emergency calls only" translations. 
Merge commit '50adb167534889421dc0d7cfc7d3bf663c03f01c' into eclair-plus-aosp

* commit '50adb167534889421dc0d7cfc7d3bf663c03f01c':
  Pull in "emergency calls only" translations.
 2010-01-21 15:14:30 -08:00
Yu Shan Emily Lau
b1780474e6 Merge "Instead of caputre the memory footprint before and after the test. We would like to monitor the memory trend while the test is running. This can eliminate the overhead for the frist test case in creating the player." into eclair 2010-01-21 15:07:51 -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