8988 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
7f6cf96cbf am 5942ccf0: am 9eb7a722: resolved conflicts for merge of f7fb5331 to kraken 2010-05-17 14:58:44 -07:00
Jean-Baptiste Queru
9eb7a72253 resolved conflicts for merge of f7fb5331 to kraken
Change-Id: I61258dd7c7e52a6251c1d9499e113401ff375b20
2010-05-17 13:50:32 -07:00
Grace Kloba
20ca117770 Update the mLatestProgress of CallbackProxy even
mWebChromeClient is null as WebView needs it.

Fix http://b/issue?id=2685989
2010-05-17 13:08:05 -07:00
Derek Sollenberger
90b6e48793 Refactor the on-screen zoom controls into a separate class.
This CL is the first in a series of CL's that will extract the
zoom code from WebView and put it into ZoomManager.  This initial
CL only extracts the on-screen zoom controls and required variables
into the ZoomManager.  Since the on-screen controls are well defined
I put them into their own class called ZoomControls.

All of WebView's zoom interactions are handled by the ZoomManager.
The ZoomManager can then handle the request internally or as in the
case of on-screen controls pass the request to another class.

Change-Id: Icfc91ed0456c88d633249c26b9afc7dd216f75a1
http://b/2671604
2010-05-17 13:49:40 -04:00
Wu-cheng Li
c3848824f8 am a3b5ff07: am e339c5ed: Add camera focus distances API. 2010-05-17 09:21:03 -07:00
The Android Open Source Project
f7fb5331e5 merge from open-source master
Change-Id: Ia0201ec7be4c112569b8775429d1c9674eb3b661
2010-05-17 08:56:54 -07:00
Romain Guy
c4fee63301 Merge "Fixing indeterminate progress bar animation state." 2010-05-15 12:34:05 -07:00
David Sobreira Marques
52a35433cf Fixing indeterminate progress bar animation state.
When showing a progress bar instance more than once
it will not animate after the first time.

Change-Id: I5104c551d561755005e533f2ab5257454567bf71
Signed-off-by: David Sobreira Marques <dpsmarques@gmail.com>
2010-05-15 16:10:18 -03:00
Svetoslav Ganov
da35551845 Adding accessibility content provider responsible for user script injection. Adding support for injecting accessibility in WebViews with disabled JavaScript.
Change-Id: I1576238a0f855bb54e25d19404b8404d7d0f6037
2010-05-15 12:10:13 -07:00
Wu-cheng Li
e339c5edbe Add camera focus distances API.
Applications can use this API to estimate the distance
between the subject and the camera.

bug:1955650
Change-Id: Ie6c8ea4971759cab6c9bcdda2c5ceb5925791c27
2010-05-15 12:40:54 +08:00
Scott Main
060341fa2d am 33c06f91: am 6c034325: am 6d8e4fd8: am b83a283a: docs: add dev guide for backup 2010-05-14 11:59:04 -07:00
Scott Main
6c034325a8 am 6d8e4fd8: am b83a283a: docs: add dev guide for backup
Merge commit '6d8e4fd83bb7f4eabc942dd17fa229cf9baf5fcf' into kraken

* commit '6d8e4fd83bb7f4eabc942dd17fa229cf9baf5fcf':
  docs: add dev guide for backup
2010-05-14 11:56:14 -07:00
Scott Main
6d8e4fd83b am b83a283a: docs: add dev guide for backup
Merge commit 'b83a283ac178ab0a72f1d811189d79b26097835e' into froyo-plus-aosp

* commit 'b83a283ac178ab0a72f1d811189d79b26097835e':
  docs: add dev guide for backup
2010-05-14 11:53:44 -07:00
Scott Main
b83a283ac1 docs: add dev guide for backup
Change-Id: I168f6b15d3441c9cbea2cd9699612476c7244530
2010-05-14 11:47:42 -07:00
Dianne Hackborn
0efa0c45a1 Merge "More fragment stuff:" 2010-05-14 11:26:40 -07:00
Dianne Hackborn
6e8304e57e More fragment stuff:
- New startActivityForResult() API.
- Fragments now should have the correct lifecycle while hanging around
  in the back stack (not being destroyed and re-created).
- Rework of state save/restore to make it simpler and better.  In theory
  now any fragment (including layout and others in the hierarchy) can
  now be retained across config changes, though this hasn't been tested.

Change-Id: I2a7fe560e14e567f5675a2f172a23fca67b3e97f
2010-05-14 11:22:48 -07:00
Adam Powell
a1700783b5 ActionBar - custom navigation views
Change-Id: Ibc98565816c713474eefd4e96fb51175abfb0187
2010-05-14 10:35:21 -07:00
Jeff Hamilton
7cd51efcbd Remove the deprecated cursor methods.
Change-Id: Ie3571fea9f36996c31c327240b11086f8cc487f0
2010-05-13 23:44:09 -05:00
Andrew Sapperstein
8d9db8e4c7 Added getNumColumns function to GridView.java.
Change-Id: I1cec19c77d0ee47278d93c6b0a112edae777e4e9
2010-05-13 17:45:50 -07:00
The Android Open Source Project
a4bb641040 am 1331ded8: am e28776bb: am b1110149: merge from open-source master 2010-05-13 14:59:22 -07:00
The Android Open Source Project
e28776bbd7 am b1110149: merge from open-source master
Merge commit 'b1110149cccc3b99e59ead34ca46e5ac026f6db9' into kraken

* commit 'b1110149cccc3b99e59ead34ca46e5ac026f6db9':
  Use integer for loop counter instead of float
  New test in FrameworkTest for the VelocityTracker class
  Preserve '+' in phone numbers imported from SIM.
2010-05-13 14:56:02 -07:00
The Android Open Source Project
b1110149cc merge from open-source master
Change-Id: I88a580162b34a80d1e3e7987b7a301c253afa0e8
2010-05-13 14:50:16 -07:00
Mike Lockwood
468202dd71 am 702b8752: am 5a9cbb29: am a3d5549c: am 098e58da: Use SystemClock.elapsedRealtime in ShutdownThread timeout logic 2010-05-13 14:09:46 -07:00
Romain Guy
743e25c914 Merge "Prevent possible leak in AbsListViews." 2010-05-13 14:06:59 -07:00
Mike Lockwood
5a9cbb291f am a3d5549c: am 098e58da: Use SystemClock.elapsedRealtime in ShutdownThread timeout logic
Merge commit 'a3d5549c802bc4fbf1e1ca05bc3552db17212036' into kraken

* commit 'a3d5549c802bc4fbf1e1ca05bc3552db17212036':
  Use SystemClock.elapsedRealtime in ShutdownThread timeout logic
2010-05-13 14:06:25 -07:00
Mike Lockwood
a3d5549c80 am 098e58da: Use SystemClock.elapsedRealtime in ShutdownThread timeout logic
Merge commit '098e58da93f304d7d7791f193c6237870b94989d' into froyo-plus-aosp

* commit '098e58da93f304d7d7791f193c6237870b94989d':
  Use SystemClock.elapsedRealtime in ShutdownThread timeout logic
2010-05-13 14:04:30 -07:00
Romain Guy
82afc7b32b Prevent possible leak in AbsListViews.
This change unregisters a list's data observer from the adapter when the list
is detached from the window. The default data observer impl. is a non-static
inner class with a synthesized pointer to the list. Thus if an app keeps
the adapter around the list is also kept around. This can be a problem with
dialogs in particular.

Change-Id: Ia95a995d3f54b9caf1bbcd2c7239a0318511b08c
2010-05-13 14:03:09 -07:00
Jaikumar Ganesh
61c98cd643 Merge "Remove duplicate definition of flag." 2010-05-13 13:54:03 -07:00
Dianne Hackborn
3d44416dc4 Merge "Further work on fragments:" 2010-05-13 13:46:30 -07:00
Jaikumar Ganesh
26888576f7 Remove duplicate definition of flag.
Change-Id: I9bdcdf5f12677162f0b735a277fce8a75fa13d39
2010-05-13 13:41:37 -07:00
Dianne Hackborn
b4bc78b16a Further work on fragments:
- Implement all of the state saving and restoring machinery.  This
  caused some flux in the API.
- Add ability to have fragments that are retained across activity
  instances.
- Fix some bugs.

Change-Id: Ib6b5b0752d7f8d667cfdcd3e76d127cc9b6d901b
2010-05-13 13:36:10 -07:00
Mike Lockwood
098e58da93 Use SystemClock.elapsedRealtime in ShutdownThread timeout logic
This avoids problems if the time is reset while shutting down.

Change-Id: I54c7c787e55648ebf5a68e79056f92fbac0081ae
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-05-13 16:29:49 -04:00
Jaikumar Ganesh
fce9609a18 resolved conflicts for merge of 0de3cc9b to master
Change-Id: I9fcf892de6ebe90c6a4be19d02e3a009ddda89aa
2010-05-13 12:42:59 -07:00
Jaikumar Ganesh
54a8f29523 Merge "Add FLAG_RERAIN_PHONE_NUMBER_FORMATTING." into kraken 2010-05-13 12:20:06 -07:00
Kenny Root
b79781af1e Use integer for loop counter instead of float
Change-Id: Iafaccbb3a3a7cbe0d67ed6827906d713c37ce89b
2010-05-13 12:17:15 -07:00
Adam Powell
bdfb5312c0 Merge "ActionBar added to framework, integrated with Activity and styles. Added onClick attribute support to menus in MenuInflater." 2010-05-13 11:07:58 -07:00
The Android Open Source Project
6df9720b8d am fd5b040a: am 485b800e: am 1a3b3d48: merge from open-source master 2010-05-13 09:57:11 -07:00
The Android Open Source Project
485b800eac am 1a3b3d48: merge from open-source master
Merge commit '1a3b3d48413d9134738c9b457292fb2b71a5dfe4' into kraken

* commit '1a3b3d48413d9134738c9b457292fb2b71a5dfe4':
  Add some documentation about the thread safety of Cursor and some of the SQLite* classes.
2010-05-13 09:53:16 -07:00
The Android Open Source Project
1a3b3d4841 merge from open-source master
Change-Id: I51b4eccfde8e74c69ab8e0c051bb8ea718ee7101
2010-05-13 09:04:45 -07:00
Kenny Root
dfd550d44c Add @hide tag to fix SDK build
Previous Canvas changes missed a @hide tag, so droiddoc was complaining
about a missing method since that was also hidden.

Change-Id: Ib70a9fa2e20fe32b74ba901bb289e77583164004
2010-05-13 06:21:41 -07:00
Adam Powell
33b974393b ActionBar added to framework, integrated with Activity and styles.
Added onClick attribute support to menus in MenuInflater.

Change-Id: I739771b4f249d87a0d8b15969f3d526b099067a1
2010-05-13 01:27:59 -07:00
Kenny Root
5d8636dbad Merge "Modify Canvas drawText to run bidi and shape." 2010-05-12 19:34:01 -07:00
Costin Manolache
2b6b835196 am 0c6028c1: am c1959658: am fa2e3dcd: am 8ea9f130: Merge "Bug 2680071: Rename the Cloud to Device" into froyo 2010-05-12 19:12:53 -07:00
Costin Manolache
c195965893 am fa2e3dcd: am 8ea9f130: Merge "Bug 2680071: Rename the Cloud to Device" into froyo
Merge commit 'fa2e3dcd855f573e160dbf258fd60a172b6e3f02' into kraken

* commit 'fa2e3dcd855f573e160dbf258fd60a172b6e3f02':
  Bug 2680071: Rename the Cloud to Device
2010-05-12 19:10:01 -07:00
Costin Manolache
fa2e3dcd85 am 8ea9f130: Merge "Bug 2680071: Rename the Cloud to Device" into froyo
Merge commit '8ea9f130d24a7dd1e505ba0cf437bdd8a660975e' into froyo-plus-aosp

* commit '8ea9f130d24a7dd1e505ba0cf437bdd8a660975e':
  Bug 2680071: Rename the Cloud to Device
2010-05-12 19:06:39 -07:00
Costin Manolache
8ea9f130d2 Merge "Bug 2680071: Rename the Cloud to Device" into froyo 2010-05-12 19:04:27 -07:00
Doug Felt
f47d7405bb Modify Canvas drawText to run bidi and shape.
Adds drawTextRun as internal API on Canvas and GraphicsOperations.
Adds implementation to implementors of GraphicsOperations.

Adds state and API on Paint to control the bidi algorithm when used
by Canvas.  This API is currently hidden.

The drawText changes are incomplete since shaping is not yet available
in the native code.

Change-Id: I4368048aef9545df0953a349381771603e04b619
2010-05-12 18:50:02 -07:00
Konstantin Lopyrev
0dc407f9a6 Merge "Fix 2673731: Added password history" 2010-05-12 18:01:41 -07:00
Konstantin Lopyrev
863f22d045 Fix 2673731: Added password history
Change-Id: I88919357abea31062caf96b214823b03cbaa15a4
2010-05-12 17:17:53 -07:00
Jeff Hamilton
f3ca9a5c7e Add some documentation about the thread safety of Cursor and some of the SQLite* classes.
Change-Id: Icae51052d1c942d7d60bb958d3703411da001079
2010-05-12 16:44:19 -07:00