Commit Graph

3581 Commits

Author SHA1 Message Date
Wu-cheng Li
46175d6e2e am 5c5be249: am 36322db5: Add focus API and FLASH_MODE_VIDEO_LIGHT.
Merge commit '5c5be2499f25853d0af2154862e648a10da2e4c6'

* commit '5c5be2499f25853d0af2154862e648a10da2e4c6':
  Add focus API and FLASH_MODE_VIDEO_LIGHT.
2009-09-21 15:50:02 -07:00
Wu-cheng Li
5c5be2499f am 36322db5: Add focus API and FLASH_MODE_VIDEO_LIGHT.
Merge commit '36322db5752c7ec196f59ba94abe5d5a63cc19f5' into eclair-plus-aosp

* commit '36322db5752c7ec196f59ba94abe5d5a63cc19f5':
  Add focus API and FLASH_MODE_VIDEO_LIGHT.
2009-09-21 15:40:13 -07:00
Wu-cheng Li
36322db575 Add focus API and FLASH_MODE_VIDEO_LIGHT. 2009-09-22 06:28:09 +08:00
Jeff Sharkey
e4efc71249 am 9aa0005e: am 88a83d3f: Update getDisplayLabel() API to support new types.
Merge commit '9aa0005e24e4da8004317cd1f632afb567c50ca1'

* commit '9aa0005e24e4da8004317cd1f632afb567c50ca1':
  Update getDisplayLabel() API to support new types.
2009-09-21 13:45:42 -07:00
Jeff Sharkey
9aa0005e24 am 88a83d3f: Update getDisplayLabel() API to support new types.
Merge commit '88a83d3f108dcf01443b241439e14eedbd9615f5' into eclair-plus-aosp

* commit '88a83d3f108dcf01443b241439e14eedbd9615f5':
  Update getDisplayLabel() API to support new types.
2009-09-21 13:36:58 -07:00
Jeff Sharkey
88a83d3f10 Update getDisplayLabel() API to support new types.
We recently added several new phone types, and this change
updates the API that resolves thoses types to strings.  It
also uses unique string resources for each type, instead of
relying on types to be <string-array> indexes.

Fixes http://b/2118886
2009-09-21 13:27:38 -07:00
Leon Scroggins
b845e5c598 am a25ab813: am d3997e55: Make scrolling textfields work better in the browser.
Merge commit 'a25ab813c4ebcac876209e026ec7aef4588d77a3'

* commit 'a25ab813c4ebcac876209e026ec7aef4588d77a3':
  Make scrolling textfields work better in the browser.
2009-09-21 13:23:36 -07:00
Leon Scroggins
a25ab813c4 am d3997e55: Make scrolling textfields work better in the browser.
Merge commit 'd3997e556eb0509248c72b668c2cd955b7842b55' into eclair-plus-aosp

* commit 'd3997e556eb0509248c72b668c2cd955b7842b55':
  Make scrolling textfields work better in the browser.
2009-09-21 13:11:45 -07:00
Jaikumar Ganesh
e4a15ce2fe am b1d07947: am 163be61c: Merge change 25412 into eclair
Merge commit 'b1d07947050f9b1e703afb6bf0c1b92f24905c0e'

* commit 'b1d07947050f9b1e703afb6bf0c1b92f24905c0e':
  Make ParcelUuid helper functions consistent.
2009-09-21 12:57:01 -07:00
Leon Scroggins
d3997e556e Make scrolling textfields work better in the browser.
The touch slop seems to be too large for scrolling
a small textfield, so use a smaller number.  Also,
in WebView, create viewToContentDimension, and use
it for determining the scroll position of the text
field.

Partial fix for http://b/issue?id=2133049

Change-Id: I0ded3be264b179bad39301e6adce86851b649a42
2009-09-21 15:54:21 -04:00
Jaikumar Ganesh
b1d0794705 am 163be61c: Merge change 25412 into eclair
Merge commit '163be61ce5ea85181da3a8908adaa63b5ff56a7e' into eclair-plus-aosp

* commit '163be61ce5ea85181da3a8908adaa63b5ff56a7e':
  Make ParcelUuid helper functions consistent.
2009-09-21 12:46:08 -07:00
Android (Google) Code Review
163be61ce5 Merge change 25412 into eclair
* changes:
  Make ParcelUuid helper functions consistent.
2009-09-21 15:37:21 -04:00
Leon Scroggins
1b5564ba24 am 2aefa41a: am 83f7bd0a: Merge change 26170 into eclair
Merge commit '2aefa41a64281f04e469a2ac53b43d04d5c8932d'

* commit '2aefa41a64281f04e469a2ac53b43d04d5c8932d':
  Always interpret (0,0) scrolls as top of title bar.
2009-09-21 12:05:32 -07:00
Leon Scroggins
2aefa41a64 am 83f7bd0a: Merge change 26170 into eclair
Merge commit '83f7bd0a9bb563e18fc16fe60b923d65accd9dfe' into eclair-plus-aosp

* commit '83f7bd0a9bb563e18fc16fe60b923d65accd9dfe':
  Always interpret (0,0) scrolls as top of title bar.
2009-09-21 12:00:00 -07:00
Leon Scroggins
d7b95aa702 Always interpret (0,0) scrolls as top of title bar.
Move the specialized code in NEW_PICTURE_MSG_ID to
setContentScrollTo so that a scroll to (0,0), whether
a result of a NEW_PICTURE_MSG_ID or from an initial
layout (or otherwise) is treated as scrolling to the
top of the content, including showing the title bar.
Scrolls to (0,1) will trigger code that animates the
title bar off screen.

Change-Id: Ia6db6d4620dea2bfe62407c4394a8ead38501b2f
2009-09-21 14:18:09 -04:00
Grace Kloba
0b2c989f8a am cf16d7a6: am f8d8b46a: Add a tip toast for double tap.
Merge commit 'cf16d7a684a01a3f2d9e18999c5ecce32568a864'

* commit 'cf16d7a684a01a3f2d9e18999c5ecce32568a864':
  Add a tip toast for double tap.
2009-09-21 10:17:53 -07:00
Dmitri Plotnikov
68b4480961 am c1ddb155: am 483a599c: Merge change 25954 into eclair
Merge commit 'c1ddb155b86a916b5e0c712493949c582ab495c2'

* commit 'c1ddb155b86a916b5e0c712493949c582ab495c2':
  Moving DISPLAY_NAME to column "data1" to keep it "aligned" with other data types.
2009-09-21 10:14:24 -07:00
Cary Clark
98890a2d31 am 6b267cce: am 3f06a9b9: Merge change 26150 into eclair
Merge commit '6b267ccec19a9ece5340281bf3035a366861990c'

* commit '6b267ccec19a9ece5340281bf3035a366861990c':
  Account for find dialog height in content height
2009-09-21 10:14:14 -07:00
Grace Kloba
cf16d7a684 am f8d8b46a: Add a tip toast for double tap.
Merge commit 'f8d8b46a2c684d51cd661a9d479dd895420a90b2' into eclair-plus-aosp

* commit 'f8d8b46a2c684d51cd661a9d479dd895420a90b2':
  Add a tip toast for double tap.
2009-09-21 10:11:54 -07:00
Grace Kloba
f8d8b46a2c Add a tip toast for double tap.
Fix http://b/issue?id=2059934
2009-09-21 10:10:11 -07:00
Dmitri Plotnikov
c1ddb155b8 am 483a599c: Merge change 25954 into eclair
Merge commit '483a599c0330da087502b5b75bbe82fe8236cbec' into eclair-plus-aosp

* commit '483a599c0330da087502b5b75bbe82fe8236cbec':
  Moving DISPLAY_NAME to column "data1" to keep it "aligned" with other data types.
2009-09-21 10:01:26 -07:00
Cary Clark
6b267ccec1 am 3f06a9b9: Merge change 26150 into eclair
Merge commit '3f06a9b931f6e3d12215a959f427bc373dacf7cc' into eclair-plus-aosp

* commit '3f06a9b931f6e3d12215a959f427bc373dacf7cc':
  Account for find dialog height in content height
2009-09-21 10:01:16 -07:00
Android (Google) Code Review
483a599c03 Merge change 25954 into eclair
* changes:
  Moving DISPLAY_NAME to column "data1" to keep it "aligned" with other data types.
2009-09-21 12:54:20 -04:00
Cary Clark
5bb6b52bf3 Account for find dialog height in content height
Use the set dialog height when the find dialog is up so that
found items at the bottom of the screen are scrolled into view.

This requires a companion change to set the dialog height in
the browser app.

Fixes http://b/issue?id=2122916
2009-09-21 12:48:50 -04:00
Doug Zongker
4ad677c778 am cc36254b: am e256c797: Merge change 26053 into eclair
Merge commit 'cc36254b1639f40bcf4ed27855c1ef92faa89082'

* commit 'cc36254b1639f40bcf4ed27855c1ef92faa89082':
  log hash of account name in sync event log
2009-09-21 09:43:32 -07:00
Bjorn Bringert
021ea92c14 am b1ef743d: am a953ed4b: Merge change 26148 into eclair
Merge commit 'b1ef743df3a436e04f61386151b962d210c6c2ac'

* commit 'b1ef743df3a436e04f61386151b962d210c6c2ac':
  Use icon URI as icon cache key in search dialog
2009-09-21 09:43:22 -07:00
Doug Zongker
cc36254b16 am e256c797: Merge change 26053 into eclair
Merge commit 'e256c79731ecd412fbf0d566ea6c844ea8e972a1' into eclair-plus-aosp

* commit 'e256c79731ecd412fbf0d566ea6c844ea8e972a1':
  log hash of account name in sync event log
2009-09-21 09:33:08 -07:00
Bjorn Bringert
b1ef743df3 am a953ed4b: Merge change 26148 into eclair
Merge commit 'a953ed4bc08cf5fc98f17a399adbd8afdd8293d5' into eclair-plus-aosp

* commit 'a953ed4bc08cf5fc98f17a399adbd8afdd8293d5':
  Use icon URI as icon cache key in search dialog
2009-09-21 09:32:58 -07:00
Dmitri Plotnikov
15e2669fcd Moving DISPLAY_NAME to column "data1" to keep it "aligned" with other data types.
This is a minor optimization for the sake of the aggregator.  The aggregator now relies on the display name
instead of structured components. As a result, we only need one column from the data table
for the structured name.  For other data types it's data1. Might as well use the same column
for display name.

Change-Id: Ib22d1f1a7a91f12716d1a460e1578f01926c393a
2009-09-21 09:30:13 -07:00
Android (Google) Code Review
e256c79731 Merge change 26053 into eclair
* changes:
  log hash of account name in sync event log
2009-09-21 12:21:14 -04:00
Leon Scroggins
22259abecc am b91dd357: am 03c87bf5: Allow a webpage that wants to scroll off the title bar to do so.
Merge commit 'b91dd357c3e0c0d1fb86c69644c177a00b47695b'

* commit 'b91dd357c3e0c0d1fb86c69644c177a00b47695b':
  Allow a webpage that wants to scroll off the title bar to do so.
2009-09-21 08:33:51 -07:00
Android (Google) Code Review
a953ed4bc0 Merge change 26148 into eclair
* changes:
  Use icon URI as icon cache key in search dialog
2009-09-21 11:29:51 -04:00
Leon Scroggins
b91dd357c3 am 03c87bf5: Allow a webpage that wants to scroll off the title bar to do so.
Merge commit '03c87bf51cdf5a105b53b5d6fbf9cfbc6c93751e' into eclair-plus-aosp

* commit '03c87bf51cdf5a105b53b5d6fbf9cfbc6c93751e':
  Allow a webpage that wants to scroll off the title bar to do so.
2009-09-21 08:24:54 -07:00
Leon Scroggins
03c87bf51c Allow a webpage that wants to scroll off the title bar to do so.
Slows down the animation so the user can see it slide away.  Also
move the animation to before we change to view coordinates so it
will not be dependent on the zoom level/screen resolution.

Change-Id: Icc54b2b26c08cd54d84b4e9892a316a5712534e4
2009-09-21 10:58:54 -04:00
Bjorn Bringert
6d318b4330 Use icon URI as icon cache key in search dialog
Fixes http://b/issue?id=2131078
"Incorrect icons shown in in-app search"

Change-Id: I88282d6323333796e66ca704390ad16016b846eb
2009-09-21 15:43:11 +01:00
Bjorn Bringert
2438aaba2a am 6971f0be: am 5417f09c: Send action key and msg with GlobalSearch clicks
Merge commit '6971f0be53d90869ac2aeb6e8aa375e985cc5b8f'

* commit '6971f0be53d90869ac2aeb6e8aa375e985cc5b8f':
  Send action key and msg with GlobalSearch clicks
2009-09-21 04:03:47 -07:00
Bryan Mawhinney
e4ab6f1b8e am 3f1bf7d0: am 3c5767d8: Track search KeyEvents in SearchDialog.
Merge commit '3f1bf7d06732b0e9507fde5be680cf673bd30944'

* commit '3f1bf7d06732b0e9507fde5be680cf673bd30944':
  Track search KeyEvents in SearchDialog.
2009-09-21 03:58:59 -07:00
Bjorn Bringert
6971f0be53 am 5417f09c: Send action key and msg with GlobalSearch clicks
Merge commit '5417f09c141713c62be697fe10fe149d6d3d0eb4' into eclair-plus-aosp

* commit '5417f09c141713c62be697fe10fe149d6d3d0eb4':
  Send action key and msg with GlobalSearch clicks
2009-09-21 03:58:17 -07:00
Bjorn Bringert
5417f09c14 Send action key and msg with GlobalSearch clicks
Needed for QSB logging, http://b/issue?id=2097469

Change-Id: I817e5b26c9739ab05bd873675854478ce601d234
2009-09-21 11:52:24 +01:00
Bryan Mawhinney
3f1bf7d067 am 3c5767d8: Track search KeyEvents in SearchDialog.
Merge commit '3c5767d8fea785ec8d4ad6de96032cdfe752f5da' into eclair-plus-aosp

* commit '3c5767d8fea785ec8d4ad6de96032cdfe752f5da':
  Track search KeyEvents in SearchDialog.
2009-09-21 03:49:23 -07:00
Bryan Mawhinney
3c5767d8fe Track search KeyEvents in SearchDialog.
This fixes the bug preventing switching between global and in-app search,
and also enables long press for voice search (I think).

Bug: 2127442
Change-Id: I045a0f7b2c797c016191709a3983b6b33fc6186e
2009-09-21 11:04:51 +01:00
Bjorn Bringert
c6c41f9fa1 am f0e66e55: am f97f436e: Merge change 25918 into eclair
Merge commit 'f0e66e55a3e1d87d7cf68f699a0c4168faf4cf60'

* commit 'f0e66e55a3e1d87d7cf68f699a0c4168faf4cf60':
  Set intent_component of in-app shortcuts to app itself
2009-09-21 02:16:11 -07:00
Bjorn Bringert
f0e66e55a3 am f97f436e: Merge change 25918 into eclair
Merge commit 'f97f436ed6e14a680cef88a5a61b0b06f847a107' into eclair-plus-aosp

* commit 'f97f436ed6e14a680cef88a5a61b0b06f847a107':
  Set intent_component of in-app shortcuts to app itself
2009-09-21 02:11:06 -07:00
Bjorn Bringert
0e62e2df36 Set intent_component of in-app shortcuts to app itself
Fixes http://b/issue?id=2130474
"Shortcuts created by pivoted-in search do not
have intent_component_name set"

Change-Id: I702fe39348b762393ed08ce9905771eb892bf782
2009-09-21 06:47:57 +01:00
Jaikumar Ganesh
f751881fdb am 4fe6f603: am 718970bc: Merge change 26061 into eclair
Merge commit '4fe6f603cafd2f1b54051809182c308a4077b783'

* commit '4fe6f603cafd2f1b54051809182c308a4077b783':
  Send the UUID intent even if apps have not requested for it.
2009-09-20 17:51:57 -07:00
Jaikumar Ganesh
4fe6f603ca am 718970bc: Merge change 26061 into eclair
Merge commit '718970bcf35252451ae15a326bd897b436ba93f3' into eclair-plus-aosp

* commit '718970bcf35252451ae15a326bd897b436ba93f3':
  Send the UUID intent even if apps have not requested for it.
2009-09-20 17:42:29 -07:00
Android (Google) Code Review
718970bcf3 Merge change 26061 into eclair
* changes:
  Send the UUID intent even if apps have not requested for it.
2009-09-20 20:36:54 -04:00
Amith Yamasani
2f55de1e8e am 09481271: am 5ea916b1: Merge change 26050 into eclair
Merge commit '09481271507cfac0db2f27b878f4a453ed919fb1'

* commit '09481271507cfac0db2f27b878f4a453ed919fb1':
  Track CPU speed stepping to get more accurate CPU cost per app.
2009-09-20 17:18:15 -07:00
Wu-cheng Li
8f7bd3031a am cd3a0242: am ffe1cf25: Unhide Camera lock and unlock API.
Merge commit 'cd3a02425179ea881f3534d687c143a2ce683684'

* commit 'cd3a02425179ea881f3534d687c143a2ce683684':
  Unhide Camera lock and unlock API.
2009-09-20 17:18:03 -07:00
Amith Yamasani
0948127150 am 5ea916b1: Merge change 26050 into eclair
Merge commit '5ea916b17cf0071f4d49936a370f4b873e4eb3e3' into eclair-plus-aosp

* commit '5ea916b17cf0071f4d49936a370f4b873e4eb3e3':
  Track CPU speed stepping to get more accurate CPU cost per app.
2009-09-20 17:08:53 -07:00