OSDN Git Service
The Android Open Source Project [Wed, 24 Feb 2010 18:02:55 +0000 (10:02 -0800)]
merge from open-source master
The Android Open Source Project [Wed, 24 Feb 2010 17:11:10 +0000 (09:11 -0800)]
merge from open-source master
Romain Guy [Wed, 24 Feb 2010 06:23:21 +0000 (22:23 -0800)]
Merge "These changes add access to some status values in widgets listed below:"
Steve Zeigler [Wed, 24 Feb 2010 00:39:08 +0000 (16:39 -0800)]
These changes add access to some status values in widgets listed below:
widget/CheckedTextView.java: report if the item is checked or not.
widget/CompoundButton.java: report if the item is checked or not.
widget/ProgressBar.java: isIndeterminate(), getProgress(), getSecondaryProgress(), and getMax() report what
sliders and progress bars are showing
widget/TextView.java: report the current selection: getSelectionStart() and getSelectionEnd()
Eric Laurent [Mon, 22 Feb 2010 19:13:08 +0000 (11:13 -0800)]
Eric Laurent [Mon, 22 Feb 2010 09:37:19 +0000 (01:37 -0800)]
Fix issue
2459650.
This change fixes a problem where an unwanted tone is generated by audio policy manager when a MT call is answered.
This is because of a policy that replaces high visibility system sounds (ringtones, alarms...) by a beep when in call.
There is a transitory phase while the call is being answered where the phone state is changed to IN_CALL but the
ringtone is still playing. The audio policy manager then mutes the end of the ringtone and starts playing a beep
in replacement because the ringtone is categorized as high visibility.
The fix consists in changing the ringtone stream type from high visibility to low visibility. This is not a problem as
the only actual use case where a ringtone would be generated while in call is if another call is received.
But in this case, the phone system does not generate a ringtone but a call waiting tone instead.
It is therefore not required to handle a ringtone as a high visibiltiy tone that must be somehow signaled to the user
while in call.
Joe Onorato [Thu, 18 Feb 2010 12:52:46 +0000 (04:52 -0800)]
am
ee3bbefd: Merge "Don\'t crash the system process when apps give us a bad foreground service notification." into eclair
Merge commit '
ee3bbefd34fd5330ebbc59175a328197ab7526af' into eclair-plus-aosp
* commit '
ee3bbefd34fd5330ebbc59175a328197ab7526af':
Don't crash the system process when apps give us a bad foreground service notification.
Joe Onorato [Thu, 18 Feb 2010 12:46:32 +0000 (04:46 -0800)]
Merge "Don't crash the system process when apps give us a bad foreground service notification." into eclair
Joe Onorato [Thu, 18 Feb 2010 12:45:17 +0000 (07:45 -0500)]
Don't crash the system process when apps give us a bad foreground service notification.
Romain Guy [Thu, 18 Feb 2010 05:22:52 +0000 (21:22 -0800)]
Romain Guy [Thu, 18 Feb 2010 05:17:48 +0000 (21:17 -0800)]
Romain Guy [Wed, 10 Feb 2010 19:29:22 +0000 (11:29 -0800)]
Manual merge of 40245 (
ed5c973fc23a6733fd473ad13b4eb317e74e9bb5) DO NOT MERGE.
Prevent infinite loop in the Phone UI.
Romain Guy [Wed, 10 Feb 2010 02:50:08 +0000 (18:50 -0800)]
Manual merge of 40170 (
b4a107d8269d1a75b8f270e0516c1fa3b517f8f9) DO NOT MERGE
Fix the lock screen.
Romain Guy [Thu, 18 Feb 2010 05:10:34 +0000 (21:10 -0800)]
am
8368ef0b: Manual merge of 40080 DO NOT MERGE Properly notifies listener when an animation is cancelled. Bug: #
2428005.
Merge commit '
8368ef0b670f8193f3161671b119e78b1fb659a1' into eclair-plus-aosp
* commit '
8368ef0b670f8193f3161671b119e78b1fb659a1':
Manual merge of 40080 DO NOT MERGE
Romain Guy [Tue, 9 Feb 2010 19:30:44 +0000 (11:30 -0800)]
Manual merge of 40080 DO NOT MERGE
Properly notifies listener when an animation is cancelled.
Bug: #
2428005.
android-build SharedAccount [Tue, 16 Feb 2010 20:53:04 +0000 (12:53 -0800)]
android-build SharedAccount [Fri, 12 Feb 2010 01:09:16 +0000 (17:09 -0800)]
cherry pick
d60e29009c1049a9776e6630e9489e1ef3f83491
Revert "Add null checks when scanning a package."
This reverts commit
9e7ac3ba8405f22c11629091449ff35a06b72055.
Wink Saville [Sat, 13 Feb 2010 17:42:07 +0000 (09:42 -0800)]
am
6b178e47: Merge "Always assume evdoXxxx signal strength values are correct." into eclair
Merge commit '
6b178e472266052b4a9b28b1e4a5cef07f1ebf8b' into eclair-plus-aosp
* commit '
6b178e472266052b4a9b28b1e4a5cef07f1ebf8b':
Always assume evdoXxxx signal strength values are correct.
Wink Saville [Sat, 13 Feb 2010 17:36:17 +0000 (09:36 -0800)]
Merge "Always assume evdoXxxx signal strength values are correct." into eclair
Wink Saville [Sat, 13 Feb 2010 15:56:20 +0000 (07:56 -0800)]
Always assume evdoXxxx signal strength values are correct.
This solves a race condition between the network type changing and
a signal strength changing. This could cause StatusBarPolicy to see
the -1 values for the evdo strength parameters and hence 0 bars would
be displayed.
Bug:
2419251
Change-Id: Iba0bdbd2023b6a5e49fc1f82c997ec3219158286
Xavier Ducrohet [Sat, 13 Feb 2010 01:52:28 +0000 (17:52 -0800)]
am
2be56ccb: Merge "Add --auto-add-overlay option to aapt. DO NOT MERGE" into eclair
Merge commit '
2be56ccbcff9d5f7b9b3cc0fed3825d4f037ff6a' into eclair-plus-aosp
* commit '
2be56ccbcff9d5f7b9b3cc0fed3825d4f037ff6a':
Add --auto-add-overlay option to aapt. DO NOT MERGE
Xavier Ducrohet [Sat, 13 Feb 2010 01:48:36 +0000 (17:48 -0800)]
Merge "Add --auto-add-overlay option to aapt. DO NOT MERGE" into eclair
Xavier Ducrohet [Fri, 5 Feb 2010 02:45:31 +0000 (18:45 -0800)]
Add --auto-add-overlay option to aapt. DO NOT MERGE
This option allows resources only present in overlays to be
added automatically instead of being declared through <add-resource>
(merge from master)
Change-Id: I5f402a1fa7213d18724d91f84bc05ef39ace2ed9
Scott Main [Fri, 12 Feb 2010 23:29:27 +0000 (15:29 -0800)]
am
19bc31c3: Merge "docs: remove old tutorial and sample pages from the sitemap" into eclair
Merge commit '
19bc31c32d75ebebacd85cac2cf4c31108329613' into eclair-plus-aosp
* commit '
19bc31c32d75ebebacd85cac2cf4c31108329613':
docs: remove old tutorial and sample pages from the sitemap
Scott Main [Fri, 12 Feb 2010 23:25:44 +0000 (15:25 -0800)]
Merge "docs: remove old tutorial and sample pages from the sitemap" into eclair
Scott Main [Fri, 12 Feb 2010 23:24:13 +0000 (15:24 -0800)]
docs: remove old tutorial and sample pages from the sitemap
Jason Sams [Fri, 12 Feb 2010 19:27:01 +0000 (11:27 -0800)]
am
0b9bbb6d: DO NOT MERGE. Merge Froyo renderscript to Eclair to support live wallpapers on droid. This gives the necessary CPU reduction to allow the wallpapers to work on the slower CPU.
Merge commit '
0b9bbb6dc5d7dabecf23e8c6bb4a267ba8c34fe8' into eclair-plus-aosp
* commit '
0b9bbb6dc5d7dabecf23e8c6bb4a267ba8c34fe8':
DO NOT MERGE. Merge Froyo renderscript to Eclair to support live wallpapers on droid. This gives the necessary CPU reduction to allow the wallpapers to work on the slower CPU.
Jason Sams [Fri, 12 Feb 2010 02:16:21 +0000 (18:16 -0800)]
DO NOT MERGE. Merge Froyo renderscript to Eclair to support live wallpapers on droid. This gives the necessary CPU reduction to allow the wallpapers to work on the slower CPU.
Committer: Jason Sams <rjsams@android.com>
On branch droid
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
modified: libs/rs/rsAllocation.cpp
modified: libs/rs/rsAllocation.h
modified: libs/rs/rsContext.cpp
modified: libs/rs/rsContext.h
modified: libs/rs/rsProgram.cpp
modified: libs/rs/rsProgram.h
Delete the old rollo sample which is obsolete.
Fix film init
Begin gl2 support. Renderscript still uses GL1.1 by default. However, 2.0 can be enabled and will render most tests correctly.
Fix film
Beging GL2 user shaders. Switch master to using GL2 by default.
Implement RS tracked defered texture and buffer object uploads.
Committer: Jason Sams <rjsams@android.com>
On branch droid
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
modified: libs/rs/rsAllocation.cpp
modified: libs/rs/rsAllocation.h
modified: libs/rs/rsContext.h
modified: libs/rs/rsProgramFragment.cpp
modified: libs/rs/rsSimpleMesh.cpp
Remove check for surface valid that is no longer valid.
Continue development of es2.0 user shader support for renderscript. This change cleans up ProgramVertex creation and adds support for passing input, output, and constant type info.
Continue es2 shader dev
Conflicts:
graphics/java/android/renderscript/Program.java
graphics/java/android/renderscript/ProgramVertex.java
Place shader logging behind prop to declutter logs.
Fix emulated glColor in es2 mode.
Fix live wallpaper many. Z coordinate was being ignored for draw quad call.
Add argument checking to sampler builder to disallow illegal modes.
Move texture bindings to base program object. Change ProgramFragment creation to require a texture format in 1.0 mode.
Element restructuring. Add support for new basic Element types including the RS objects and vectors(2-4). In theory this paves the way for maintaining type info for RS objects, passing elements for GLSL uiforms/attribs/varyings, and supporting nested structures.
This will break some apps, checkings for other projects will follow to unbreak them.
Disable excessive RS logging.
Add RS support for generic attribs as input to vertex programs.
More complete support for named attribs. Adds user typed attribs as available to programVertex. Non user attribs are not treated like user for GL2 for simplicity.
Support npot on es 2.0 HW.
Change user attribs to look for empty slot rather than using them in order. Prevents conflict with numbered legacy slots.
Fix npot but where mipmap level sizes were rounding in the wrong direction. Should always be floor.
Implement type generation for user uniforms in vertex shader.
Remove excessive logging, fix error in GLSL uniform generation.
Fix RS mipmap generation for 8 bit alpha textures.
Cleanup seperation of Legacy and user attribs. All user programs now use the new names. Legacy vertex attribs are given default names.
Fix some minor bugs with GL state setup that were exposed by Droids driver.
Implement drawSpriteCropped on es2.0
The Android Open Source Project [Thu, 11 Feb 2010 18:03:02 +0000 (10:03 -0800)]
merge from open-source master
Eric Laurent [Thu, 11 Feb 2010 17:34:59 +0000 (09:34 -0800)]
am
c1eba82b: Merge "Fix issue:
2413494: Add TTY support." into eclair
Merge commit '
c1eba82ba479006045c1d7a4c8ceba116a9602d1' into eclair-plus-aosp
* commit '
c1eba82ba479006045c1d7a4c8ceba116a9602d1':
Fix issue:
2413494: Add TTY support.
Eric Laurent [Thu, 11 Feb 2010 17:23:21 +0000 (09:23 -0800)]
Merge "Fix issue:
2413494: Add TTY support." into eclair
Eric Laurent [Wed, 10 Feb 2010 19:22:11 +0000 (11:22 -0800)]
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.
Dirk Dougherty [Wed, 10 Feb 2010 17:41:15 +0000 (09:41 -0800)]
am
d74bf162: Merge "Repackage samples zip with SampleSyncAdapter and CubeLiveWallpaper." into eclair
Merge commit '
d74bf1623913bade8f58369f39ebc666d551bb57' into eclair-plus-aosp
* commit '
d74bf1623913bade8f58369f39ebc666d551bb57':
Repackage samples zip with SampleSyncAdapter and CubeLiveWallpaper.
Bart Sears [Wed, 10 Feb 2010 17:41:06 +0000 (09:41 -0800)]
am
a1ab9766: Merge "DO NOT MERGE" into eclair
Merge commit '
a1ab9766718e11cb31bd5e87cda2a2bac03573db' into eclair-plus-aosp
* commit '
a1ab9766718e11cb31bd5e87cda2a2bac03573db':
DO NOT MERGE
Dirk Dougherty [Wed, 10 Feb 2010 17:38:01 +0000 (09:38 -0800)]
Merge "Repackage samples zip with SampleSyncAdapter and CubeLiveWallpaper." into eclair
Bart Sears [Wed, 10 Feb 2010 17:35:37 +0000 (09:35 -0800)]
Merge "DO NOT MERGE" into eclair
Grace Kloba [Tue, 13 Oct 2009 19:57:08 +0000 (12:57 -0700)]
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
Bart Sears [Wed, 10 Feb 2010 17:18:37 +0000 (09:18 -0800)]
am
926780b0: Merge "DO NOT MERGE" into eclair
Merge commit '
926780b023a09d37e8dcf1fabf6fa990f042f06d' into eclair-plus-aosp
* commit '
926780b023a09d37e8dcf1fabf6fa990f042f06d':
DO NOT MERGE
Bart Sears [Wed, 10 Feb 2010 17:13:48 +0000 (09:13 -0800)]
Merge "DO NOT MERGE" into eclair
Chander S Pechetty [Wed, 10 Feb 2010 16:44:00 +0000 (22:14 +0530)]
Fixs the incorrect message for SecurityException
when injecting a Key, Pointer and Trackball events into the UI across
applications, the corresponding methods throw SecurityException with
incorrect permission message.
INJECT EVENT permission should be INJECT_EVENTS
Dirk Dougherty [Wed, 10 Feb 2010 02:44:52 +0000 (18:44 -0800)]
Repackage samples zip with SampleSyncAdapter and CubeLiveWallpaper.
Change-Id: I63f881739352d91d296c5c07432eeda74b22000a
Dirk Dougherty [Wed, 10 Feb 2010 02:44:18 +0000 (18:44 -0800)]
am
859f4556: Merge "Add generated html docs for SampleSyncAdapter and CubeLiveWallpaper. Add article for live wallpaper." into eclair
Merge commit '
859f455645bc49e32330108b1ea9f85ffb80a2cd' into eclair-plus-aosp
* commit '
859f455645bc49e32330108b1ea9f85ffb80a2cd':
Add generated html docs for SampleSyncAdapter and CubeLiveWallpaper. Add article for live wallpaper.
Dirk Dougherty [Wed, 10 Feb 2010 02:41:32 +0000 (18:41 -0800)]
Merge "Add generated html docs for SampleSyncAdapter and CubeLiveWallpaper. Add article for live wallpaper." into eclair
Dirk Dougherty [Mon, 8 Feb 2010 18:53:12 +0000 (10:53 -0800)]
Add generated html docs for SampleSyncAdapter and CubeLiveWallpaper. Add article for live wallpaper.
Change-Id: Idbeda9a677c9772a8348146fe028083d9887a9d2
Grace Kloba [Tue, 2 Feb 2010 19:17:55 +0000 (11:17 -0800)]
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
Adam Powell [Tue, 9 Feb 2010 21:19:25 +0000 (13:19 -0800)]
Manually merged VelocityTracker changes
Adam Powell [Tue, 9 Feb 2010 18:55:57 +0000 (10:55 -0800)]
am
e88192b9: Cleanup fixes for ScaleGestureDetector
Merge commit '
e88192b9d2a8c364d8545471907c5baa275bb5f6' into eclair-plus-aosp
* commit '
e88192b9d2a8c364d8545471907c5baa275bb5f6':
Cleanup fixes for ScaleGestureDetector
Adam Powell [Tue, 9 Feb 2010 18:27:48 +0000 (10:27 -0800)]
Cleanup fixes for ScaleGestureDetector
Suchi Amalapurapu [Tue, 9 Feb 2010 01:27:33 +0000 (17:27 -0800)]
am
08be55b8: Add null checks when scanning a package. Delete packages whose code and resource paths haven\'t been set correctly.
Merge commit '
08be55b8ea917a5273c135a7bdc73e41c8524c05' into eclair-plus-aosp
* commit '
08be55b8ea917a5273c135a7bdc73e41c8524c05':
Add null checks when scanning a package.
Suchi Amalapurapu [Tue, 9 Feb 2010 00:30:06 +0000 (16:30 -0800)]
Add null checks when scanning a package.
Delete packages whose code and resource paths haven't been set
correctly.
Cyril Mottier [Fri, 5 Feb 2010 23:36:40 +0000 (00:36 +0100)]
Default RotateDrawable's pivot set to (50%, 50%)
In order to define the pivot in an XML-instanciated RotateDrawable, android:pivotX
and android:pivotY had to be set in your XML. Forgetting to set those attributes
ended up in a NullPointerException (tv = null) that were caught by the Resources.getDrawable()
method (caught as an Exception). As a result a not-very-accurate message was logged:
"Resource not found ...". Defining a default pivot value seems like a great fix.
Some other fixes would be to modify the documentation or notify the user with a better
explanation than "Resource not found ...".
The Android Open Source Project [Fri, 5 Feb 2010 21:55:16 +0000 (13:55 -0800)]
merge from open-source master
Adam Powell [Fri, 5 Feb 2010 21:01:22 +0000 (13:01 -0800)]
Merge "Use a circular buffer in VelocityTracker"
Romain Guy [Fri, 5 Feb 2010 18:33:44 +0000 (10:33 -0800)]
Merge "Fix x coordinate of the ACTION_UP event in TouchUtils.drag() method"
Marc Capdevielle [Fri, 5 Feb 2010 18:28:23 +0000 (19:28 +0100)]
Fix x coordinate of the ACTION_UP event in TouchUtils.drag() method
The ACTION_UP event was fired at the "fromX" position instead of being
fired at the "toX" position which is the current value of local var "x".
This bug had no real impact as the VelocityTracker always ignores the last
MotionEvent when it received more than 3 events...
The Android Open Source Project [Fri, 5 Feb 2010 16:48:38 +0000 (08:48 -0800)]
am
31bfdf69: reconcile main tree with open-source eclair
Merge commit '
31bfdf695ef741f64066ef605bd6a7e23df88714' into eclair-plus-aosp
* commit '
31bfdf695ef741f64066ef605bd6a7e23df88714':
android-2.1_r1 snapshot
Use 128p map tiles for high dpi devices.
Throttle nitz updates as the are too numerous on cdma.
don't request a sync when temp providers are created
Increase light sensor delay from one to two seconds.
Revert jparks code from IPCThreadState.
Add a warning when we leave threads in the binder thread pool in the background scheduling group.
PowerManagerService: Ensure that recent changes do not effect the hardware ALS case.
Fix regression.
Fix broken build.
Bluetooth A2DP suspend/resume functionality
EventLog when a database file is deleted due to corruption.
Don't forget to clear "backup in progress" state when finishing a pass
Fix issue #
2148939: Sholes slow to wake up in landscape mode
Fix Cdma re-start of default connection.
Merge change 26821 into eclair
Not all WebView's host have permission to read the history.
Merge change 26908 into eclair
The Android Open Source Project [Fri, 5 Feb 2010 16:09:38 +0000 (08:09 -0800)]
reconcile main tree with open-source eclair
Andreas Agvard [Fri, 5 Feb 2010 07:16:01 +0000 (08:16 +0100)]
Fixed Android animation framework, for using interpolators that do not start at 0.0f
There is a bug that affects interpolators that do not return 0.0f when given 0.0f as input. All default interpolators in Android do return 0.0f, which is why it hasn't been
noticed. Some custom interpolators can for example run backwards, returning 1.0f when given input 0.0f.
Eric Laurent [Thu, 4 Feb 2010 17:34:34 +0000 (09:34 -0800)]
am
aead64de: Fix issue:
2413494: [Passion-c] Add TTY support.
Merge commit '
aead64def1fe58c95c086a0ca00cf0b13fa32ef1' into eclair-plus-aosp
* commit '
aead64def1fe58c95c086a0ca00cf0b13fa32ef1':
Fix issue:
2413494: [Passion-c] Add TTY support.
Eric Laurent [Tue, 2 Feb 2010 17:42:33 +0000 (09:42 -0800)]
Fix issue:
2413494: [Passion-c] Add TTY support.
Handle TTY mode change events received by HeadsetObserver and send information down to AudioHardware with AudioManager.setParameters()
Use setting "tty_mode_uses_heaset_events" in core config.xml to indicate if the product uses this particular
method of indicating the TTY mode change.
Katie McCormick [Thu, 4 Feb 2010 04:21:26 +0000 (20:21 -0800)]
am
8a6c0607: Merge "SDK doc change: Fixed typo--fingure->finger Bug:
1993220" into eclair
Merge commit '
8a6c060719c8870f370b82faa48ae2f437915214' into eclair-plus-aosp
* commit '
8a6c060719c8870f370b82faa48ae2f437915214':
SDK doc change: Fixed typo--fingure->finger
Katie McCormick [Thu, 4 Feb 2010 00:52:18 +0000 (16:52 -0800)]
Merge "SDK doc change: Fixed typo--fingure->finger Bug:
1993220" into eclair
Katie McCormick [Thu, 4 Feb 2010 00:37:15 +0000 (16:37 -0800)]
SDK doc change: Fixed typo--fingure->finger
Bug:
1993220
Scott Main [Thu, 4 Feb 2010 00:18:17 +0000 (16:18 -0800)]
am
98a9fc0a: Merge "docs: revise the Style and Themes document to improve the clarity of the concepts and expand the available information" into eclair
Merge commit '
98a9fc0a0025a3df7b36f7752fc330eba8810603' into eclair-plus-aosp
* commit '
98a9fc0a0025a3df7b36f7752fc330eba8810603':
docs: revise the Style and Themes document to improve the
Scott Main [Thu, 4 Feb 2010 00:11:41 +0000 (16:11 -0800)]
Merge "docs: revise the Style and Themes document to improve the clarity of the concepts and expand the available information" into eclair
Scott Main [Tue, 12 Jan 2010 20:14:52 +0000 (12:14 -0800)]
docs: revise the Style and Themes document to improve the
clarity of the concepts and expand the available information
Megha Joshi [Wed, 3 Feb 2010 20:29:19 +0000 (12:29 -0800)]
am
9f4cfc3a: Merge "Screenshots for sample syncadapter." into eclair
Merge commit '
9f4cfc3afcdf9f7be096b3243bfc15b9346b8434' into eclair-plus-aosp
* commit '
9f4cfc3afcdf9f7be096b3243bfc15b9346b8434':
Screenshots for sample syncadapter.
Megha Joshi [Wed, 3 Feb 2010 20:24:20 +0000 (12:24 -0800)]
Merge "Screenshots for sample syncadapter." into eclair
Megha Joshi [Wed, 27 Jan 2010 23:31:56 +0000 (15:31 -0800)]
Screenshots for sample syncadapter.
Marc Capdevielle [Wed, 3 Feb 2010 10:15:38 +0000 (11:15 +0100)]
Use a circular buffer in VelocityTracker
Optimizes the frequently called addPoint() method while keeping the
same velocity computation.
Thx Cyril Mottier for help and tests.
Mike Lockwood [Tue, 2 Feb 2010 16:41:52 +0000 (11:41 -0500)]
Fix for GPS engines without separate session and engine status events.
GPS_STATUS_SESSION_BEGIN now implies GPS_STATUS_ENGINE_ON
and GPS_STATUS_ENGINE_OFF now implies GPS_STATUS_SESSION_END.
Change-Id: Ifeeb1d5094d1e7304974b7c3ac27dd83b1e65bca
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mike Lockwood [Wed, 20 Jan 2010 15:14:54 +0000 (10:14 -0500)]
Be tolerant of GPS session and engine on status messages arriving out of order.
BUG:
2366194
Change-Id: Iac152cc46f3647e12c9077f1bfa4183f19ac94b6
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mike Lockwood [Mon, 7 Dec 2009 23:43:36 +0000 (18:43 -0500)]
GpsLocationProvider: Do not release wakelock until the GPS engine is fully off
Change-Id: I705b1d33af2d70aa1084cca8f6280fade9461d2c
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mike Lockwood [Sat, 30 Jan 2010 04:12:21 +0000 (20:12 -0800)]
am
a0460004: Merge "Ignore NTP time fixes that differ from system time by more than 5 minutes." into eclair
Merge commit '
a0460004aae7576114639393a230f18608d213e6' into eclair-plus-aosp
* commit '
a0460004aae7576114639393a230f18608d213e6':
Ignore NTP time fixes that differ from system time by more than 5 minutes.
John Wang [Sat, 30 Jan 2010 04:12:15 +0000 (20:12 -0800)]
am
8deed914: Merge "Handle RIL_UNSOL_RESEND_INCALL_MUTE." into eclair
Merge commit '
8deed914c2df15d71674deae591bcd3313093931' into eclair-plus-aosp
* commit '
8deed914c2df15d71674deae591bcd3313093931':
Handle RIL_UNSOL_RESEND_INCALL_MUTE.
Mike Lockwood [Sat, 30 Jan 2010 04:09:16 +0000 (20:09 -0800)]
Merge "Ignore NTP time fixes that differ from system time by more than 5 minutes." into eclair
John Wang [Sat, 30 Jan 2010 04:07:14 +0000 (20:07 -0800)]
Merge "Handle RIL_UNSOL_RESEND_INCALL_MUTE." into eclair
John Wang [Fri, 29 Jan 2010 08:21:46 +0000 (00:21 -0800)]
Handle RIL_UNSOL_RESEND_INCALL_MUTE.
For bug
2400052.
Notify registered handler whenever receiving RIL_UNSOL_RESEND_INCALL_MUTE.
Jim Miller [Sat, 30 Jan 2010 02:06:48 +0000 (18:06 -0800)]
am
d8a3a895: Fix
2404771: Expose reset() in SlidingTab widget so we can reset it when we get an incoming call.
Merge commit '
d8a3a8957b9d71ab75584b0cc98324fd70cc527c' into eclair-plus-aosp
* commit '
d8a3a8957b9d71ab75584b0cc98324fd70cc527c':
Fix
2404771: Expose reset() in SlidingTab widget so we can reset it when we get an incoming call.
Jim Miller [Sat, 30 Jan 2010 01:25:26 +0000 (17:25 -0800)]
Fix
2404771: Expose reset() in SlidingTab widget so we can reset it when we get an incoming call.
Updated javadoc.
The Android Open Source Project [Fri, 29 Jan 2010 22:09:16 +0000 (14:09 -0800)]
reconcile android-2.1_r1 snapshot
Scott Main [Fri, 29 Jan 2010 21:47:40 +0000 (13:47 -0800)]
am
9800adf2: Merge "docs: update web page debugging with info about page and line numbering in the log." into eclair
Merge commit '
9800adf2a4d78d1e3e44dbef6aecf2b2b738c9c8' into eclair-plus-aosp
* commit '
9800adf2a4d78d1e3e44dbef6aecf2b2b738c9c8':
docs: update web page debugging with info about page and line
Dirk Dougherty [Fri, 29 Jan 2010 21:47:28 +0000 (13:47 -0800)]
am
196ec566: Merge "SDK doc change: Increment the platform version var used in doc footer and elsewhere." into eclair
Merge commit '
196ec566b39340942f146ce4a9af775f4c648d2d' into eclair-plus-aosp
* commit '
196ec566b39340942f146ce4a9af775f4c648d2d':
SDK doc change: Increment the platform version var used in doc footer and elsewhere.
Scott Main [Fri, 29 Jan 2010 21:40:53 +0000 (13:40 -0800)]
Merge "docs: update web page debugging with info about page and line numbering in the log." into eclair
Scott Main [Fri, 29 Jan 2010 18:28:18 +0000 (10:28 -0800)]
docs: update web page debugging with info about page and line
numbering in the log.
Mike Lockwood [Fri, 29 Jan 2010 14:20:06 +0000 (09:20 -0500)]
Ignore NTP time fixes that differ from system time by more than 5 minutes.
Change-Id: I603195f6925e25baccd18190016cf8611bb9dc1b
BUG:
2402380
Signed-off-by: Mike Lockwood <lockwood@android.com>
Dirk Dougherty [Fri, 29 Jan 2010 01:59:24 +0000 (17:59 -0800)]
Merge "SDK doc change: Increment the platform version var used in doc footer and elsewhere." into eclair
Dirk Dougherty [Fri, 29 Jan 2010 01:50:10 +0000 (17:50 -0800)]
SDK doc change: Increment the platform version var used in doc footer and elsewhere.
Bug:
2160782
Change-Id: I6e7721bca95cdc6565f3200d7609a4ea9b45cf9b
Dirk Dougherty [Fri, 29 Jan 2010 00:46:54 +0000 (16:46 -0800)]
am
7b00a8ae: Merge "SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features." into eclair
Merge commit '
7b00a8ae71c5964cb96e1663b778658eaa069b3e' into eclair-plus-aosp
* commit '
7b00a8ae71c5964cb96e1663b778658eaa069b3e':
SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features.
Dirk Dougherty [Fri, 29 Jan 2010 00:40:56 +0000 (16:40 -0800)]
Merge "SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features." into eclair
Dirk Dougherty [Sat, 23 Jan 2010 00:52:34 +0000 (16:52 -0800)]
SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features.
Bug:
2160782
Change-Id: I8560f32b04a4044f58b8f7dd678aec781d56b9d9
Grace Kloba [Wed, 27 Jan 2010 20:30:19 +0000 (12:30 -0800)]
am
769ed21c: Fix http://b/issue?id=
2400423.
Merge commit '
769ed21c33c3629411eb3bbf924de45737a18067' into eclair-plus-aosp
* commit '
769ed21c33c3629411eb3bbf924de45737a18067':
Fix http://b/issue?id=
2400423.
Grace Kloba [Wed, 27 Jan 2010 18:52:47 +0000 (10:52 -0800)]
Fix http://b/issue?id=
2400423.
When the same page is loaded, updateRestoreState
will be false when we finish the first layout. As
we are still in the same page, we don't want to
update the current zoom/scroll. But in some cases,
like a site switch from mobile to full site and
keeps the same url, we do want to update the zoom
range as the viewport spec changed. Otherwise, user
can't zoom in the full site as the WebView thought
it is still a mobile non-scalable page.
Dirk Dougherty [Wed, 27 Jan 2010 02:05:23 +0000 (18:05 -0800)]
am
965f4a6b: Merge "doc change only: Update announcement and mwc redirect to point to microsite." into eclair
Merge commit '
965f4a6b4b5f3dd71e70f427af0c8a902e5880ef' into eclair-plus-aosp
* commit '
965f4a6b4b5f3dd71e70f427af0c8a902e5880ef':
doc change only: Update announcement and mwc redirect to point to microsite.
Dirk Dougherty [Wed, 27 Jan 2010 02:00:29 +0000 (18:00 -0800)]
Merge "doc change only: Update announcement and mwc redirect to point to microsite." into eclair
Dirk Dougherty [Wed, 27 Jan 2010 00:58:33 +0000 (16:58 -0800)]
doc change only: Update announcement and mwc redirect to point to microsite.
Change-Id: Icb2c9ae00a65839243912007991cd1704a543bc7
Jim Miller [Tue, 26 Jan 2010 21:55:16 +0000 (13:55 -0800)]
am
9985867a: Fix
2397617: Right-align carrier text in lock screen and add carrier text to PINunlock in landscape mode.
Merge commit '
9985867a8eb80c6db84c80a9b5e96bd68e2d14d7' into eclair-plus-aosp
* commit '
9985867a8eb80c6db84c80a9b5e96bd68e2d14d7':
Fix
2397617: Right-align carrier text in lock screen and add carrier text to PINunlock in landscape mode.
Jim Miller [Tue, 26 Jan 2010 20:17:46 +0000 (12:17 -0800)]
Fix
2397617: Right-align carrier text in lock screen and add carrier text to PINunlock in landscape mode.
Robert Greenwalt [Tue, 26 Jan 2010 02:56:32 +0000 (18:56 -0800)]
am
cc4b4016: Fix the reporting of NO_CONNECTIVITY.
Merge commit '
cc4b4016e4b86db012f94bb889e5ca61ff362171' into eclair-plus-aosp
* commit '
cc4b4016e4b86db012f94bb889e5ca61ff362171':
Fix the reporting of NO_CONNECTIVITY.
Robert Greenwalt [Tue, 26 Jan 2010 01:54:29 +0000 (17:54 -0800)]
Fix the reporting of NO_CONNECTIVITY.
A refactoring of handleDisconnect instroduced a bug - we were reporting
NO_CONNECTIVITY after any non-primary network (supl, mms, hipri) was lost.
bug:
2395006
Change-Id: Ifa9e008872ec646981a35f2c316120cb9685a6a4