8575 Commits

Author SHA1 Message Date
Fred Quintana
caa6f3860f Merge "fix an NPE in SyncManager's dump where it can get a null AuthorityInfo; instead create one if one doesn't exist yet" 2010-02-10 11:45:47 -08:00
Fred Quintana
1bbcd105a1 fix an NPE in SyncManager's dump where it can get a null AuthorityInfo; instead create one if one doesn't exist yet 2010-02-10 11:44:23 -08:00
Romain Guy
46b8efa990 Merge "Prevent infinite loop in the Phone UI." 2010-02-10 11:30:03 -08:00
Romain Guy
5180d1c522 Prevent infinite loop in the Phone UI. 2010-02-10 11:29:22 -08:00
Eric Laurent
7749adfd01 Fix issue: 2413494: Add TTY support.
This is a new implementation of TTY support.
Previous implementation in commit aead64def1fe58c95c086a0ca00cf0b13fa32ef1 is reverted.
The new method does not rely any more on the kernel headset driver to send a UEvent containing
current TTY mode.
2010-02-10 11:23:04 -08:00
San Mehat
d0efb6bc15 Merge "StorageNotification: Move notification / usb storage activity into StatusBarPolicy" 2010-02-10 11:21:50 -08:00
Bart Sears
eb42a28837 am a1ab9766: Merge "DO NOT MERGE" into eclair
Merge commit 'a1ab9766718e11cb31bd5e87cda2a2bac03573db' into eclair-plus-aosp

* commit 'a1ab9766718e11cb31bd5e87cda2a2bac03573db':
  DO NOT MERGE
2010-02-10 09:41:06 -08:00
Bart Sears
a1ab976671 Merge "DO NOT MERGE" into eclair 2010-02-10 09:35:37 -08:00
Grace Kloba
b3316d35ff DO NOT MERGE
cherry-pick https://android-git.corp.google.com/g/#change,29843 from eclair-mr2
This will cherry-pick SHA1: 58def690a87b4aa2c01331c06b61e457198de0ea

This will workaround the following three bugs which are occuring because
the webview DB is getting corrupted:

http://b/issue?id=2338178
http://b/issue?id=2278210
http://b/issue?id=2405650

Here are the comments from the eclair-mr2 CL:

If openOrCreateDatabase() throws an exception, delete
the old db and re-do it. If it still fails, something
bad happens, like the directory may have the different
permission. Let it throw as WebView needs the db.

Fix http://b/issue?id=2179339
2010-02-10 09:24:31 -08:00
Bart Sears
789b11c715 am 926780b0: Merge "DO NOT MERGE" into eclair
Merge commit '926780b023a09d37e8dcf1fabf6fa990f042f06d' into eclair-plus-aosp

* commit '926780b023a09d37e8dcf1fabf6fa990f042f06d':
  DO NOT MERGE
2010-02-10 09:18:37 -08:00
Suchi Amalapurapu
117818e4f1 Add new manifest option for install location
Change recommendAppInstallLocation api
add code to parse new attribute.
Define flags in PackageInfo
Add new settings attributes for enabling setting and value for install location
Some tests
The policy for install location: if explicitly set in manifest as internal only we try to install the app only on internal storage. if set to preferExternal, we try to install it on sdcard if possible. If not we fall back to internal.
If the user enables setting SET_INSTALL_LOCATION(which will always
be set to false in final release builds) and sets a prefered location, we try
to honour it.
2010-02-10 08:59:08 -08:00
Bjorn Bringert
ced72c8cf5 Remove SearchManager.SOURCE
Part of http://b/issue?id=2429556

Change-Id: I08a95a844b74cb50a740c0c155c6ad79f2c9cbcc
2010-02-10 14:26:52 +00:00
Wu-cheng Li
a18e90176a Explain setPreviewFrameRate and getPreviewFrameRate more clearly. 2010-02-10 16:06:57 +08:00
Wu-cheng Li
be14332227 Merge "Add exposure compensation parameter." 2010-02-09 20:49:06 -08:00
San Mehat
4154c07c5c StorageNotification: Move notification / usb storage activity into StatusBarPolicy
Signed-off-by: San Mehat <san@google.com>
2010-02-09 19:33:58 -08:00
San Mehat
739e1f8cda Merge "MountService: Add isSecureContainerMounted() API call" 2010-02-09 19:30:34 -08:00
Alex Gruenstein
46d3502333 Merge "Add EXTRA_PARTIAL_RESULTS so that clients can enable receiving results via onPartialResults()" 2010-02-09 18:57:11 -08:00
Romain Guy
8c583083df Merge "Fix the lock screen." 2010-02-09 18:50:55 -08:00
Romain Guy
b4a107d826 Fix the lock screen. 2010-02-09 18:50:08 -08:00
San Mehat
6cdd9c0856 MountService: Add isSecureContainerMounted() API call
Signed-off-by: San Mehat <san@google.com>
2010-02-09 18:46:05 -08:00
Grace Kloba
614f8450a7 DO NOT MERGE
cherry-pick https://android-git.corp.google.com/g/#change,39258 from master

Now mSupportMultiTouch is depending on WebSettings,
it can't be static any more.

Fix http://b/issue?id=2413364
2010-02-09 18:20:28 -08:00
Brad Fitzpatrick
a63730d1f1 Log ContentProvider operations to the EventLog.
Just like with db_operation, operations over 100ms are always logged,
while operations under that are subsampled.

This will help with performance analysis, getting real-world
performance numbers from dogfooders.
2010-02-09 17:49:43 -08:00
Adam Powell
e1d683074b am 87da8606: Manually merged VelocityTracker changes
Merge commit '87da860616009a86e260e49bbefffe12c1a06607'

* commit '87da860616009a86e260e49bbefffe12c1a06607':
  Use a circular buffer in VelocityTracker
2010-02-09 17:35:52 -08:00
Fred Quintana
c4893b71e5 Merge "only make AccountManager throw an exception on blocking calls in the UI thread if the application's SDK is froyo or later" 2010-02-09 17:07:47 -08:00
Eric Fischer
6909b5a639 Merge "Make the Date Picker fields more consistent in locales with numeric months." 2010-02-09 16:10:57 -08:00
Eric Fischer
5fe1e6221e Make the Date Picker fields more consistent in locales with numeric months.
In locales that use month numbers instead of names, use *just* the number
instead of also the word for month to be consistent with the other fields,
which also show just a number instead of a number plus the word for day
or year.

Bug 2289276
2010-02-09 15:58:50 -08:00
Alex Gruenstein
cc47fae688 Add EXTRA_PARTIAL_RESULTS so that clients can enable receiving results via onPartialResults() 2010-02-09 15:25:53 -08:00
Adam Powell
87da860616 Manually merged VelocityTracker changes 2010-02-09 14:25:41 -08:00
Dianne Hackborn
632aa76422 Merge "New external storage APIs." 2010-02-09 14:22:29 -08:00
Dianne Hackborn
e83cefcef0 New external storage APIs.
This implements the spec for external storage organization, and
properly reflects how the media scanner organizes the files it finds.

Also includes package manager support for removing app private
files from external storage when the application is uninstalled.

For the new APIs and paths, the main place to look is Environment
and Context.
2010-02-09 14:20:55 -08:00
Fred Quintana
751fdc09bb only make AccountManager throw an exception on blocking calls in the UI thread if the application's SDK is froyo or later 2010-02-09 14:13:18 -08:00
Leon Scroggins
df737e442e Merge "Set the IME action to GO for normal textfields." 2010-02-09 14:12:07 -08:00
Amith Yamasani
72e5a8820a Merge "Restart input when moving to a new textfield." 2010-02-09 14:09:58 -08:00
Vasu Nori
787372568a Merge "suppress broken tests(http://b/2431671)" 2010-02-09 14:07:43 -08:00
Leon Scroggins
af314e246d Set the IME action to GO for normal textfields. 2010-02-09 17:06:59 -05:00
Leon Scroggins
5c84bf0a3b Restart input when moving to a new textfield.
Ensures that the IME action gets updated properly.

Fixes http://b/issue?id=2428023
2010-02-09 17:03:44 -05:00
Dan Egnor
44d993798f Merge "Fix NPE in FileObserver when multiple events pile in for a defunct observer. Also, fix up some bogus whitespace (hard tabs, etc)." 2010-02-09 13:47:21 -08:00
Vasu Nori
5793a17366 suppress broken tests(http://b/2431671)
should have debugged the broken test.
added transactions to speed up tests wherver possible
2010-02-09 13:46:16 -08:00
Romain Guy
cdc045dd6d Merge "Properly notifies listener when an animation is cancelled. Bug: #2428005." 2010-02-09 13:21:09 -08:00
Vasu Nori
cb72cda8ca Merge "change wording in warning msg printed when compiled-sql cache is full" 2010-02-09 12:29:21 -08:00
Bjorn Bringert
8e867eb454 Merge "Fix NPE in PackageParser" 2010-02-09 12:09:28 -08:00
Eugene Koh
4398486a92 Merge "Update the mdpi resource with 2.0 style icons" 2010-02-09 12:05:49 -08:00
Vasu Nori
82f82be4b3 change wording in warning msg printed when compiled-sql cache is full 2010-02-09 11:49:01 -08:00
Romain Guy
305a2eb8e5 Properly notifies listener when an animation is cancelled.
Bug: #2428005.
2010-02-09 11:36:44 -08:00
Shimeng (Simon) Wang
b7f17d4742 Take into account the visible title height when scrolling.
Bug: 2425057
	modified:   core/java/android/webkit/WebView.java
2010-02-09 11:32:16 -08:00
San Mehat
b104340496 Framework: Clean up / Refactor Mount APIs
- Move android.storage.* -> android.os.storage.* and refactor users
 - Refactor generic shares back to explicit ums enable/disable/isEnabled
 - Remove media insert/removed event callbacks (not ready for Froyo)
 - Remove 'label' from volume state change callbacks
 - Add public API functions for enabling/disabling USB mass storage (permissions enforced
   in MountSevice)
 - Remove some stray un-needed import lines
 - Move android.os.IMountService / android.os.IMountServiceListener -> android.os.storage
 - Improve code comments

Updated:
  MountService: Add dup state check and move debugging behind a conditional
  UsbStorageActivity: Fix review comments + a TODO
  StorageNotification: Add @Override tags
  StorageManager: Don't use a static Listener list
  MountService: Reduce bloat and fix == where I meant .equals()
  PackageManagerTests: Update for new API

Signed-off-by: San Mehat <san@google.com>
2010-02-09 11:03:16 -08:00
San Mehat
64e6a45ed4 StorageNotification: Add general storage notification for UMS/Storage events
Signed-off-by: San Mehat <san@google.com>
2010-02-09 11:03:15 -08:00
Adam Powell
18f75bd45c am e88192b9: Cleanup fixes for ScaleGestureDetector
Merge commit 'e88192b9d2a8c364d8545471907c5baa275bb5f6' into eclair-plus-aosp

* commit 'e88192b9d2a8c364d8545471907c5baa275bb5f6':
  Cleanup fixes for ScaleGestureDetector
2010-02-09 10:55:57 -08:00
Adam Powell
e88192b9d2 Cleanup fixes for ScaleGestureDetector 2010-02-09 10:27:48 -08:00
San Mehat
c8da710f00 Merge changes I1aabef01,I8dbd0f83
* changes:
  SystemServer: Move MountService startup before NotificationManagerService
  StorageManager: Check for a null MountService
2010-02-09 08:58:23 -08:00