13590 Commits

Author SHA1 Message Date
Amith Yamasani
9322775014 Add a missing setOnCloseListener and a new setIconfied method.
Keep track of the currently iconified state as well, if the app
wants to know.
2010-09-14 10:55:10 -07:00
Leon Scroggins III
720d5985f5 am 901b7b9b: am ca8f3d04: Merge "Add an option to hide the Voice Search icon." into froyo
Merge commit '901b7b9b17d20dc8085fb5fd3bab0f0804f3906b' into gingerbread-plus-aosp

* commit '901b7b9b17d20dc8085fb5fd3bab0f0804f3906b':
  Add an option to hide the Voice Search icon.
2010-09-14 10:26:44 -07:00
Leon Scroggins III
901b7b9b17 am ca8f3d04: Merge "Add an option to hide the Voice Search icon." into froyo
Merge commit 'ca8f3d04284a26477257a0c2b34d83c86d15efe9' into gingerbread

* commit 'ca8f3d04284a26477257a0c2b34d83c86d15efe9':
  Add an option to hide the Voice Search icon.
2010-09-14 10:23:35 -07:00
Vasu Nori
9a68713ca0 Merge "sql statement with syntax errors can leave database lock in bad state" 2010-09-14 10:04:13 -07:00
Jaikumar Ganesh
b390728b54 am a224f70b: Fix interaction between BluetoothEventLoop and BluetoothService.
Merge commit 'a224f70b1efc29d9698da5b5c143251a43838f2b' into gingerbread-plus-aosp

* commit 'a224f70b1efc29d9698da5b5c143251a43838f2b':
  Fix interaction between BluetoothEventLoop and BluetoothService.
2010-09-14 09:43:31 -07:00
Brad Fitzpatrick
50d66f9fcd Unify some duplicate StrictMode-enabling code.
Change-Id: Ifb92f35d9e245dbdb5e201597d8be702bce9e8b8
2010-09-14 08:22:30 -07:00
Leon Scroggins III
4a02800946 Add an option to hide the Voice Search icon.
Some search engines do not support voice search, so provide a flag
to disable showing the icon in the SearchDialog.

Change-Id: I7ef4ad5d382edb86c08014260defa4af6d5eca0a
2010-09-14 10:56:25 -04:00
Jeff Brown
4fe6c3e51b Replace epoll() with poll() and rename PollLoop to Looper.
As part of this change, consolidated and cleaned up the Looper API so
that there are fewer distinctions between the NDK and non-NDK declarations
(no need for two callback types, etc.).

Removed the dependence on specific constants from sys/poll.h such as
POLLIN.  Instead looper.h defines events like LOOPER_EVENT_INPUT for
the events that it supports.  That should help make any future
under-the-hood implementation changes easier.

Fixed a couple of compiler warnings along the way.

Change-Id: I449a7ec780bf061bdd325452f823673e2b39b6ae
2010-09-14 01:59:45 -07:00
Brian Carlstrom
2c42c8fbaf Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments
Bug: 2672817

Change-Id: If5f10fa16eaf5676a0c1540463759cd4e0e837de
2010-09-14 00:11:14 -07:00
Dianne Hackborn
a21e3da559 Fix issue #2967969: Crash rotating screen on "delete account" dialog
- Have PreferenceActivity save and restore its header state.
- Keep track of the current header selection.
- When headers are updated, try to retain the current header selection.

Also fix issue #2995541: Cannot add new contact.  We were not allowing
fragment transactions in some cases.

Change-Id: I4aa4c703ed5f4ecf9f425cd7eeea4740c6360ce9
2010-09-13 22:49:54 -07:00
Jaikumar Ganesh
a224f70b1e Fix interaction between BluetoothEventLoop and BluetoothService.
BluetoothEventLoop primarily handles event notifications from Bluez.
It should know innards of Bonding and especially BondState.
BondState class and BluetoothService call into each other.
When BluetoothEvent loop gets the handle to BondState it leads
to deadlocks and ANRs.

Change-Id: I785c57f6246c1288350d26d4acb87d879b27a5f9
2010-09-13 21:58:10 -07:00
Dianne Hackborn
ade9916d5c resolved conflicts for merge of 6421ae7e to master
Change-Id: Ic8c4418f13a42fc1d3a44ad68e32b4e438b07f6f
2010-09-13 21:41:57 -07:00
Adam Powell
5f12084daa Merge "Fix bug 2995805 - splitMotionEvents behavior change" 2010-09-13 18:18:47 -07:00
Adam Powell
167bc821dd Fix bug 2995805 - splitMotionEvents behavior change
Changed the new split motion events behavior to match the enshrined
behavior. A return value of false from a target's dispatchTouchEvent
will not prevent the target from receiving further events in the
gesture unless it is the initial ACTION_DOWN event.

Change-Id: Ied8d531dfec7009a4124ed670b1700753c3f9caa
2010-09-13 18:11:08 -07:00
Dianne Hackborn
6421ae7eff am 5251c800: Merge "Fix potential crash in sync." into gingerbread
Merge commit '5251c800c93c6f6fd473475c36b8ab3b360c1e4d' into gingerbread-plus-aosp

* commit '5251c800c93c6f6fd473475c36b8ab3b360c1e4d':
  Fix potential crash in sync.
2010-09-13 17:26:34 -07:00
Dianne Hackborn
5251c800c9 Merge "Fix potential crash in sync." into gingerbread 2010-09-13 17:21:04 -07:00
Dianne Hackborn
50addddba5 Fix potential crash in sync.
Change-Id: I523d8faa24b7ba57dcc09cbe91b5cb91d9f6f262
2010-09-13 17:12:51 -07:00
Dianne Hackborn
e746f03c6c resolved conflicts for merge of 53686433 to master
Change-Id: I27004dc464f5771d3205ae5757c6eccc5b16854d
2010-09-13 16:56:10 -07:00
Adam Powell
59a29f4a6c am b07c0789: Merge "DO NOT MERGE Fix bug 2995887 - overscroll effect initialization issue" into gingerbread
Merge commit 'b07c078921fb917d33075a63d77fdf98221e2bac' into gingerbread-plus-aosp

* commit 'b07c078921fb917d33075a63d77fdf98221e2bac':
  DO NOT MERGE Fix bug 2995887 - overscroll effect initialization issue
2010-09-13 16:11:55 -07:00
Adam Powell
57361ef001 DO NOT MERGE Fix bug 2995887 - overscroll effect initialization issue
Change-Id: I03cc18616dec05eb9e0383dc02371366c70cc12b
2010-09-13 16:08:35 -07:00
Vasu Nori
d31211fd46 sql statement with syntax errors can leave database lock in bad state
bug:2995940
Change-Id: I8571943cb278bbc622b04549478badb56e5f7573
2010-09-13 15:47:49 -07:00
Jaikumar Ganesh
1510770165 Add missing return statement.
Change-Id: Iee4ee8a62c5c85176c457bd674ac25acdf978ae9
2010-09-13 15:24:01 -07:00
Jaikumar Ganesh
20c8f47330 resolved conflicts for merge of 0522f5e9 to master
Change-Id: Ie0a7ece33dced1042948087053e49665f6235fc2
2010-09-13 14:57:59 -07:00
Vasu Nori
992f7d52fa caching code retooled to reduce locking + handle SMP
1. Moved all code related to compiled-sql statement cache to SQLiteCache.java
Removed all caching related code from everywhere else.
2. Moved all code related to compiling a sql statement and caching it to
SQLiteCompiledSql.java. There was some code in SQLiteProgram.java
releated to this. moved it out.
3. Added state to SQLiteCompiledSql. This is to help in debugging.
Change-Id: I63ab0c9c4419e964eb9796d284dd389985763d83
2010-09-13 14:38:24 -07:00
Dianne Hackborn
53686433a9 am 7e9f4eb2: Track client requests through location manager.
Merge commit '7e9f4eb2608148436cef36c9969bf8a599b39e72' into gingerbread-plus-aosp

* commit '7e9f4eb2608148436cef36c9969bf8a599b39e72':
  Track client requests through location manager.
2010-09-13 14:34:22 -07:00
Dianne Hackborn
7e9f4eb260 Track client requests through location manager.
This fixes a problem where applications could ask the location
manager to do very heavy-weight things (like...  say... update
location every minute), which would get accounted against the
system instead of the application because ultimately it is the
system making the heavy calls (wake locks, etc).

To solve this, we introduce a new class WorkSource representing
the source of some work.  Wake locks and Wifi locks allow you
to set the source to use (but only if you are system code and thus
can get the permission to do so), which is what will be reported
to the battery stats until the actual caller.

For the initial implementation, the location manager keeps track
of all clients requesting periodic updates, and tells its providers
about them as a WorkSource param when setting their min update time.
The network location provider uses this to set the source on the
wake and wifi locks it acquires, when doing work because of the
update period.

This should also be used elsewhere, such as in the GPS provider,
but this is a good start.

Change-Id: I2b6ffafad9e90ecf15d7c502e2db675fd52ae3cf
2010-09-13 14:20:48 -07:00
Romain Guy
f4cae9f944 Merge "Forces windows to draw the first time they show." 2010-09-13 12:53:21 -07:00
Romain Guy
58ef7fbf16 Forces windows to draw the first time they show.
Change-Id: I239572ee49bc60f30d957f548104e75844859a93
2010-09-13 12:52:37 -07:00
Jaikumar Ganesh
0522f5e9b7 am cc5494c9: Out Of Band API for Secure Simple Pairing.
Merge commit 'cc5494c9996f809e36539b24e8b6b67683383d29' into gingerbread-plus-aosp

* commit 'cc5494c9996f809e36539b24e8b6b67683383d29':
  Out Of Band API for Secure Simple Pairing.
2010-09-13 11:52:19 -07:00
Shimeng (Simon) Wang
4de4f09e8e am fbd26467: Merge "DO NOT MERGE" into gingerbread
Merge commit 'fbd2646705c52c111f041b16d7cb34cb922a2a64' into gingerbread-plus-aosp

* commit 'fbd2646705c52c111f041b16d7cb34cb922a2a64':
  DO NOT MERGE
2010-09-13 11:51:55 -07:00
Chris Palmer
f5aafff485 Unbreak the build.
Just a quick fix. Will properly re-add @deprecated and update-api next, and
then get API approval.

Change-Id: Idf57a33dc97bc2619cf48509f74d9e0de935124b
2010-09-13 11:40:44 -07:00
Jaikumar Ganesh
cc5494c999 Out Of Band API for Secure Simple Pairing.
Change-Id: I54ded27ab85d46eef3d2cca84f2394b1ffe88ced
2010-09-13 11:40:21 -07:00
Shimeng (Simon) Wang
ba15633a22 Merge "Accessibility support for WebViews" 2010-09-13 11:06:33 -07:00
Shimeng (Simon) Wang
dc9f2b6668 DO NOT MERGE
Use a static variable and methods for the current WebView.

sJavaBridge may not exist by the time onWindowFocusChanged is called.
To avoid an NPE, just static methods that modify a global field.
JWebCoreJavaBridge is a global object anyway so using a static field
will be fine.  To avoid any garbage collection issues, store the
WebView in a WeakReference.

Bug: 2908023
Change-Id: I05e9261f2c3d13c10c73c9b34f3aeea1d12a08a6
2010-09-13 10:47:58 -07:00
Chris Palmer
ed35d0ee85 Merge "Correct the PackageManager.checkSignatures documentation." 2010-09-13 10:39:04 -07:00
Svetoslav Ganov
585f13f8de Accessibility support for WebViews
Change-Id: Ibb139192bae4d60fd53a7872b19c06312bb41558
2010-09-13 10:21:34 -07:00
Eric Fischer
569a57dc01 Merge "Import revised translations." 2010-09-13 10:04:58 -07:00
Jeff Brown
19c9c7cc6d am fb8116f7: am c891d2b3: Merge "Fix PointerLocationView when pointer ids are not zero-based." into gingerbread
Merge commit 'fb8116f736f2df6d1b2f8044541390a9fd9953cb'

* commit 'fb8116f736f2df6d1b2f8044541390a9fd9953cb':
  Fix PointerLocationView when pointer ids are not zero-based.
2010-09-12 20:50:16 -07:00
Jeff Brown
fb8116f736 am c891d2b3: Merge "Fix PointerLocationView when pointer ids are not zero-based." into gingerbread
Merge commit 'c891d2b3529b9cf24ef4781a585cd4784815e711' into gingerbread-plus-aosp

* commit 'c891d2b3529b9cf24ef4781a585cd4784815e711':
  Fix PointerLocationView when pointer ids are not zero-based.
2010-09-12 20:47:50 -07:00
Jeff Brown
c891d2b352 Merge "Fix PointerLocationView when pointer ids are not zero-based." into gingerbread 2010-09-12 20:45:31 -07:00
Mike Lockwood
0c7d077e9a Merge changes I68379740,I9053218f
* changes:
  MediaFile: Add support for some popular non-media file types.
  Media scanner support for tracking files of arbitrary type.
2010-09-12 20:41:07 -07:00
Jeff Brown
d1e0c371a6 Fix PointerLocationView when pointer ids are not zero-based.
Since we support using driver-provided pointer ids (ABS_MT_TRACKING_ID)
there is no guarantee that pointer ids will necessarily start from 0
or be contiguous.

Change-Id: I9609b7a3bb238d7edbcbd68cc839dd6d14baf9df
2010-09-12 20:40:51 -07:00
Mike Lockwood
c37255d5d0 Media scanner support for tracking files of arbitrary type.
The native media scanner no longer filters files based on file extension.
Audio, video, image and playlist files are handled as before, but non-media
files are now inserted into the "files" table, which was originally added
to support MTP.

Change-Id: I9053218fb6d2671a3bb181405c34442b94678afc
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-12 23:21:44 -04:00
Kenny Root
cec7eb1c07 am 8b11f30c: am 1bece432: Make nativeLibraryDir visible in the API
Merge commit '8b11f30cb2cfe9922439e8a032311de114ce4da4'

* commit '8b11f30cb2cfe9922439e8a032311de114ce4da4':
  Make nativeLibraryDir visible in the API
2010-09-12 19:34:30 -07:00
Kenny Root
8b11f30cb2 am 1bece432: Make nativeLibraryDir visible in the API
Merge commit '1bece4320c1d2308b4a5b5aeda47b065312b3053' into gingerbread-plus-aosp

* commit '1bece4320c1d2308b4a5b5aeda47b065312b3053':
  Make nativeLibraryDir visible in the API
2010-09-12 19:31:45 -07:00
Kenny Root
1bece4320c Make nativeLibraryDir visible in the API
Change-Id: Ic88e76a85b0041e97b4c29c42dfa09db0356391c
2010-09-12 19:20:32 -07:00
Steve Howard
df10a19296 am f353daa0: am 90fb15a7: Support UI visibility and restarting in download manager.
Merge commit 'f353daa03aeb3c04fdfa87b7bcd49f0a7eea59b1'

* commit 'f353daa03aeb3c04fdfa87b7bcd49f0a7eea59b1':
  Support UI visibility and restarting in download manager.
2010-09-12 19:14:42 -07:00
Steve Howard
f353daa03a am 90fb15a7: Support UI visibility and restarting in download manager.
Merge commit '90fb15a7e52b1208b8d4f7518a61efb99580b5b0' into gingerbread-plus-aosp

* commit '90fb15a7e52b1208b8d4f7518a61efb99580b5b0':
  Support UI visibility and restarting in download manager.
2010-09-12 19:11:08 -07:00
Steve Howard
90fb15a7e5 Support UI visibility and restarting in download manager.
First, this change adds a column to the downloads table specifying
whether a download should be displayed in the system downloads UI.  It
adds a public method to set this parameter when requesting a download,
and a hidden method to filter queries based on this paramter (such
filtering could be made public later, but it's not strictly necessary
right now).

Second, this change adds support for restarting a completed/failed
download as a hidden method on DownloadManager.  Currently it only
works from the download manager's process - it'll be used by the new
download manager UI.

Change-Id: I15eda1a6e3717d1ce947a810b25ad3540cce809e
2010-09-12 18:58:55 -07:00
Adam Powell
cf78b3e510 Add support for custom action views in ActionBar menus
Change-Id: Ic7850bc00fcfe95d805dd6a1b15cb5d413942475
2010-09-12 18:33:44 -07:00