59569 Commits

Author SHA1 Message Date
Jim Miller
19eb7014bd Fix 5406921: Register for receiving phone state changes when KGSVM gets created.
This fixes a bug where the state wasn't being updated because it wasn't
registered for KeyguardUpdateMonitor state changes when the view first created, like on first boot.

Change-Id: Ic6838afffd0de51decdc43a8e8a796696aed49df
2011-10-07 13:47:46 -07:00
Christopher Tate
e47b89cabe Merge "Fix wallpaper restore" 2011-10-07 13:36:09 -07:00
Jeff Brown
7ce745248d Clean up CursorWindow lifetime.
Bug: 5332296

Removed dead code in SQLiteCursor related to the use of a background
query thread.  This code could result in CursorWindows being modified
concurrently or used after free.  This code is broken, unused and
is just in the way.

Added comments to explain how CursorWindow ownership is
supposed to work for AbstractWindowedCursors.  (There are still cases
where cursor windows get dropped on the floor without being closed.
Those will be taken care of in a subsequent patch.)

Cleaned up SQLiteQuery.fillWindow to eliminate duplicate code and
remove bits that were only needed for background loading, like
returning -1.

Change-Id: I03e8e2e73ff0c11df76d63f57df4c5ada06ae1cb
2011-10-07 13:31:00 -07:00
Jeff Brown
d0ff68da6a Fix regression in CursorWindow.copyStingToBuffer.
Bug: 5332296

Change-Id: Iff9eed786f0a8293b6156f883a66a322ddad5e99
2011-10-07 13:28:18 -07:00
Gilles Debunne
287d6c6e12 Bug 5250788: LatinIME slows down as amount of Text increases
Removed unnecessary CharSequenceIterator and made the WordIterator
work on String instead of CharSequence

Submit words to the spell checker by batches.

Refactored WordIterator to make it intrinsically local.

Change-Id: Ie9e30691985a130fa55cd052005ddb22a21761cb
2011-10-07 13:27:52 -07:00
Jeff Brown
aa32c30b81 Restore broken CursorWindow.getType behavior.
Bug: 5430009

Some CTS tests try to call getType on fields in empty
cursor windows or with out of bound column indices (-1).
Restoring the previous behavior of returning FIELD_TYPE_NULL
instead of throwing.  Fix this later.

Change-Id: I782bd02012474e7dabc5bb7ea2dc45e8b0c7ef25
2011-10-07 13:17:18 -07:00
Steven Ross
9c2df26179 Fixing alarm clock bug
The alarm clock doesn't actually hide the view until AFTER Facelock starts
hence the need to kill Facelock after it has started when the even is caught
Also fixing phone black box background in case the user cancels the call quickly

Also eliminating blackscreen after 4s for multiple reasons
so people can login if lockscreen locks up
also so cancel fade is to the backup lock

Change-Id: I8162ff67453038559f289408f4f0d452d4f79ab3
2011-10-07 16:11:08 -04:00
John Reck
25d888b5ff Merge "Fix calc visible to account for action bar" 2011-10-07 13:10:55 -07:00
Matthew Xie
cf6bc99b97 Merge "Turn off debug messge" 2011-10-07 12:57:08 -07:00
Christopher Tate
bf6ee4f509 Fix wallpaper restore
Following a restore of the wallpaper data files, the settingsRestored()
method was binding the new wallpaper by passing null as the component,
because once upon a time that meant just use the configuration that had
just been loaded from the [newly restored] settings filed.  However, at
some point this broke when the load from settings was made a staging
operation, not also the commitment of the changes.

This CL passes the newly-determined component configuration explicitly
to the bind, overriding the product default that may already have been
emplaced by the time the restore happens.

It also turns off the (minor) debugging that had been enabled in
WallpaperBackupHelper while digging into the issue.

Bug 5416839

Change-Id: I963893c236e24c75d10dde75836805295ea42cbb
2011-10-07 12:37:42 -07:00
Fabrice Di Meglio
75b071e744 Merge "Fix bug #5371117 Regression : The Hebrew / Arabic text behavior in ICS latest build is wrong" 2011-10-07 12:30:58 -07:00
Jason Sams
05f876e19d Merge "Simplify the way we get the version info. Reduces startup overhead." 2011-10-07 11:58:15 -07:00
Fabrice Di Meglio
5c863f741e Fix bug #5371117 Regression : The Hebrew / Arabic text behavior in ICS latest build is wrong
- welcome back start / count
- goodbye log clusters
- clean Paint code
- make private some functions as they should be
- improve memory allocation (create only one Shaper and reuse it for for shaping the runs in
the same input text)

Change-Id: I89a320c7f041319851308c8c9a919fbeafa82cdd
2011-10-07 11:22:39 -07:00
Adam Powell
e0f2515b44 Merge "Fix bug 5399568 - ListView check states inconsistent after data set change" 2011-10-07 11:16:51 -07:00
Matthew Xie
f0f95112ff Turn off debug messge
Bug 5425619

Change-Id: I7accb88a40604c5b8a8f2323e751a7f8f3cb9da8
2011-10-07 11:15:03 -07:00
Andreas Huber
41c95f3642 Merge "Specifying -1 for both low and highwater marks would not actually do the right thing" 2011-10-07 10:08:48 -07:00
Andreas Huber
b987d875c6 Specifying -1 for both low and highwater marks would not actually do the right thing
before this change. Also make it more consistent in that specifying -1 for the
keepalive settings specifies the default.

Change-Id: I086f530fbf42abce66d1c8e61157215cb474e044
2011-10-07 10:00:38 -07:00
Iliyan Malchev
851a14eb94 Merge "Add initialize method to CameraHardwareInterface" 2011-10-07 09:57:26 -07:00
Steve Block
d8b505d50f Merge "Add WebViewClient.onProceededAfterSslError()" 2011-10-07 09:53:43 -07:00
Costin Manolache
85e7279d9c b/5399355 StringIndexOutOfBoundsException from AccountManagerService
Change-Id: I13426a8b57d6fcbc7a43ffd61922439b0fae332c
2011-10-07 09:42:49 -07:00
Tyler Luu
7b6da3c7a2 Add initialize method to CameraHardwareInterface
Add intialize() method to CameraHardwareInterface so we can
return a proper error value to CameraService if open of camera
hardware module fails.

b/5405235

Change-Id: I09c627034ddd22a5753c5163392c4fcff301e0b9
Signed-off-by: Tyler Luu <tluu@ti.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-10-07 09:24:05 -07:00
Andreas Huber
59797e6bec Merge "Allow a system property "media.stagefright.cache-params" to override cache/prefetcher" 2011-10-07 07:59:35 -07:00
Steve Block
fe33a75cc8 Add WebViewClient.onProceededAfterSslError()
This is used to notify the host application that an SSL error occurred while
loading a resource, but the WebView but chose to proceed anyway based on a
decision retained from a previous response to onReceivedSslError().

Bug: 5403366
Change-Id: I51a25b93d7824b7eb7b6d5a961cba948e37c85db
2011-10-07 15:14:23 +01:00
The Android Open Source Project
1370987733 Reconcile with ics-factoryrom-release
Change-Id: I432900d452f3f8869f42a0ff4ae0d34e1c34dc46
2011-10-07 05:35:36 -07:00
Chih-Chung Chang
17f254105b Merge "Allow shutter/recording sound to be adjusted unless it's forced." 2011-10-07 03:20:26 -07:00
Wu-cheng Li
3c02c12c73 Merge "Allow Camera.setDisplayOrientation to be called when preview is active." 2011-10-07 03:08:23 -07:00
Wu-cheng Li
d303362ac2 Allow Camera.setDisplayOrientation to be called when preview is active.
bug:5422679

Change-Id: I4c936ab00428fc158b5947fe8f10b1028869bbdb
2011-10-07 18:01:09 +08:00
Scott Main
1d6f70c8de docs: Add api overview for ICS
Change-Id: Ia280d94e06762e0f2b524cbd262568c50e48a601
2011-10-07 00:47:07 -07:00
Dirk Dougherty
b89ebaa60e Doc change: revise API diffs.
Change-Id: I28d1aeb6e785a22b610dc0984210dd921ce42ffa
2011-10-06 23:28:02 -07:00
Scott Main
0eefb56afa Revert "Doc change: add diffs for API level 14." due to api change
This reverts commit d94931ab251da2f2bed00d4c2d0aa087920e3de2.
2011-10-06 22:58:33 -07:00
Chih-Chung Chang
9143aaafee Allow shutter/recording sound to be adjusted unless it's forced.
Change-Id: I7080d5f50a87f92c8e9395d4cf8f927a6760fa70
2011-10-07 13:39:18 +08:00
The Android Automerger
1233316955 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-10-06 20:52:50 -07:00
James Dong
f3c0056816 Merge "Fix an issue where we should allow negative values but did not" 2011-10-06 20:38:29 -07:00
John Reck
fffce6fe99 Fix calc visible to account for action bar
Bug: 5425892

Change-Id: I15bc1779013dbb33511d9c5bff9b678115dec102
2011-10-06 20:37:01 -07:00
Christopher Tate
2e12977ad6 am a0c39e28: (-s ours) DO NOT MERGE: fix wallpaper restore
* commit 'a0c39e28e56d642168ad18dccb86f5787b4e1592':
  DO NOT MERGE: fix wallpaper restore
2011-10-06 20:00:25 -07:00
Adam Powell
14c080497e Fix bug 5399568 - ListView check states inconsistent after data set change
ListView tracks check states in two ways, by position and by ID if an
adapter reports stable IDs. After a data set change there was no
guarantee that the position checked mapping was consistent.

Fix up the position mapping from the ID mapping after a data set
change. In the future this should happen by asking the adapter where a
given ID is now located, but this will require new API and not all
adapters in the wild will implement it. For now make a best guess by
searching in a limited window around the item's last known position.

Change-Id: I70ba89eb103c438b0410c3c6d066acc3918459f9
2011-10-06 19:55:42 -07:00
Scott Main
5e3cdc7655 Merge "docs: deprecate thingy" 2011-10-06 18:41:48 -07:00
Scott Main
4cc5333539 docs: deprecate thingy
Change-Id: I579824680f3b5110d56981becaaf81f917989e7e
2011-10-06 18:32:43 -07:00
Nicolas Roard
98a5fcd895 Merge "Trigger a full screen repaint when touching layers, as webkitDraw() may not generate the correct invalidations." 2011-10-06 18:29:20 -07:00
Ying Wang
45f966324c Merge "Make symlinks for DroidSans.ttf and DroidSans-Bold.ttf" 2011-10-06 18:25:22 -07:00
Anirudh Dewani
74450d37cf Merge "Docs changes for WiFiDirect sample" 2011-10-06 17:57:55 -07:00
Jason Sams
85397d8dcb Simplify the way we get the version info.
Reduces startup overhead.

Change-Id: Id9556dfe553c23bf3f870a524ca5e687bb9fe777
2011-10-06 17:55:26 -07:00
Svetoslav Ganov
31743d8cbb Merge "Accessibility test automation API not working." 2011-10-06 17:28:51 -07:00
Christopher Tate
a0c39e28e5 DO NOT MERGE: fix wallpaper restore
Following a restore of the wallpaper data files, the settingsRestored()
method was binding the new wallpaper by passing null as the component,
because once upon a time that meant just use the configuration that had
just been loaded from the [newly restored] settings filed.  However, at
some point this broke when the load from settings was made a staging
operation, not also the commitment of the changes.

This CL passes the newly-determined component configuration explicitly
to the bind, overriding the product default that may already have been
emplaced by the time the restore happens.

Will not merge cleanly downstream; the parallel (small) change will
be made explicitly there.

Bug 5416839

Change-Id: I50b5d57fafd176529ac7a90cac8116bbc9f696fd
2011-10-06 17:24:54 -07:00
Philip Milne
3b88d87ef6 Merge "Move Activity1 and Activity2 to API Demos area in development/samples." 2011-10-06 17:21:08 -07:00
Nicolas Roard
dee7b1ba96 Trigger a full screen repaint when touching layers, as webkitDraw()
may not generate the correct invalidations.

counterpart java CL: https://android-git.corp.google.com/g/#/c/140427/

bug:5425608 bug:5218173
Change-Id: I4a958a6fac4054a1040cb077cdfa2aff076e3fad
2011-10-06 17:12:40 -07:00
Justin Ho
2eaa0d73fa Merge "Reference download asset through intermediate." 2011-10-06 16:28:57 -07:00
Jeff Brown
f0a9181d09 Merge "Clean up CursorWindow code. Bug: 5332296" 2011-10-06 16:28:15 -07:00
Philip Milne
e974f6384b Move Activity1 and Activity2 to API Demos area in development/samples.
Change-Id: Ib6521caca69b0a0d96c66d9df754d2af17cb6908
2011-10-06 16:11:35 -07:00
Ying Wang
8e359817da Make symlinks for DroidSans.ttf and DroidSans-Bold.ttf
Bug: 5420351

Make the following symlinks:
/system/fonts/DroidSans.ttf -> Roboto-Regular.ttf
/system/fonts/DroidSans-Bold.ttf -> Roboto-Bold.ttf

Change-Id: If9a74ef4ac2386cdb46d125fed8ce5771e872310
2011-10-06 16:00:58 -07:00