Commit Graph

3605 Commits

Author SHA1 Message Date
Grace Kloba
0e31bd97a4 am 5136e726: am f53c1865: Don\'t snap the initialScale to min or max if it is not defined.
Merge commit '5136e726015b2bea3309f44c503ccc49e264cdb6'

* commit '5136e726015b2bea3309f44c503ccc49e264cdb6':
  Don't snap the initialScale to min or max if it is not defined.
2009-09-22 09:33:55 -07:00
Grace Kloba
5136e72601 am f53c1865: Don\'t snap the initialScale to min or max if it is not defined.
Merge commit 'f53c1865248dd2b38f8c24a0419d550330619b19' into eclair-plus-aosp

* commit 'f53c1865248dd2b38f8c24a0419d550330619b19':
  Don't snap the initialScale to min or max if it is not defined.
2009-09-22 09:22:51 -07:00
Grace Kloba
f53c186524 Don't snap the initialScale to min or max if it is not defined.
Fix http://b/issue?id=2133821
2009-09-22 09:14:25 -07:00
Mike Reed
769d6039e4 am f145f5c3: am 585c67f7: Merge change 26300 into eclair
Merge commit 'f145f5c31028746e89a9a9f6f4cafe203043cc62'

* commit 'f145f5c31028746e89a9a9f6f4cafe203043cc62':
  experimental fix for compatibility mode. When we scale up by 1.5 (240 dpi), we put stretched ninepatches on
2009-09-22 05:07:00 -07:00
Mike Reed
f145f5c310 am 585c67f7: Merge change 26300 into eclair
Merge commit '585c67f70f18b8879ced854c5865141d6c650cd8' into eclair-plus-aosp

* commit '585c67f70f18b8879ced854c5865141d6c650cd8':
  experimental fix for compatibility mode. When we scale up by 1.5 (240 dpi), we put stretched ninepatches on
2009-09-22 05:01:25 -07:00
Android (Google) Code Review
585c67f70f Merge change 26300 into eclair
* changes:
  experimental fix for compatibility mode. When we scale up by 1.5 (240 dpi), we put stretched ninepatches on exact pixel boundaries when we walk the inverse matrix (e.g. 2/3, 1+1/3, 2, 2+2/3, 3+1/3, 4, ...).
2009-09-22 07:55:58 -04:00
Mike Reed
b5c17a64ed experimental fix for compatibility mode. When we scale up by 1.5 (240 dpi), we put stretched ninepatches on
exact pixel boundaries when we walk the inverse matrix (e.g. 2/3, 1+1/3, 2, 2+2/3, 3+1/3, 4, ...).

These are not stable, since any variance in the inverse matrix (even in the lowest bit) can cause some other
part of the ninepatch to start a hair to the left, resulting in misaligning every 3 pixels.

The fix changes the matrix' phase enough to keep all of the stretched ninepatches in phase.
2009-09-22 07:53:05 -04:00
Bjorn Bringert
3f08fbefa8 am 302b363c: am 976e363f: Merge change 26260 into eclair
Merge commit '302b363c5ed5672406f7a216929c42fddc68f053'

* commit '302b363c5ed5672406f7a216929c42fddc68f053':
  Add search_mode flag to intents launched by QSB suggestions
2009-09-22 03:08:02 -07:00
Bjorn Bringert
302b363c5e am 976e363f: Merge change 26260 into eclair
Merge commit '976e363fe8206fcac5f2342ed3a0c3e0df66d32d' into eclair-plus-aosp

* commit '976e363fe8206fcac5f2342ed3a0c3e0df66d32d':
  Add search_mode flag to intents launched by QSB suggestions
2009-09-22 03:02:48 -07:00
Android (Google) Code Review
976e363fe8 Merge change 26260 into eclair
* changes:
  Add search_mode flag to intents launched by QSB suggestions
2009-09-22 05:54:31 -04:00
Dmitri Plotnikov
21d7cfc16c am 4a1d8788: am 0fc0244e: [Issue 2097207] Adding filtering capability to aggregation suggestions
Merge commit '4a1d8788dec5630b7a1874f661c6cbd1fc863328'

* commit '4a1d8788dec5630b7a1874f661c6cbd1fc863328':
  [Issue 2097207] Adding filtering capability to aggregation suggestions
2009-09-21 18:58:23 -07:00
Dmitri Plotnikov
4a1d8788de am 0fc0244e: [Issue 2097207] Adding filtering capability to aggregation suggestions
Merge commit '0fc0244e808925e848ee9e350a3a213bd7574249' into eclair-plus-aosp

* commit '0fc0244e808925e848ee9e350a3a213bd7574249':
  [Issue 2097207] Adding filtering capability to aggregation suggestions
2009-09-21 18:53:37 -07:00
Dmitri Plotnikov
0fc0244e80 [Issue 2097207] Adding filtering capability to aggregation suggestions
Change-Id: Ifce36286d2f573e69f872432cc34a1fca0311e02
2009-09-21 18:47:33 -07:00
Dianne Hackborn
8f3da4a38b am 3ffe6b12: am 7f3fb7de: Merge change 26130 into eclair
Merge commit '3ffe6b12c78397abb8ab1a3064583d5e8b6ce51c'

* commit '3ffe6b12c78397abb8ab1a3064583d5e8b6ce51c':
  Turn animations on by default.
2009-09-21 17:49:39 -07:00
Dianne Hackborn
3ffe6b12c7 am 7f3fb7de: Merge change 26130 into eclair
Merge commit '7f3fb7dec2afdffa37e3067ca8a5b9d01809a9ce' into eclair-plus-aosp

* commit '7f3fb7dec2afdffa37e3067ca8a5b9d01809a9ce':
  Turn animations on by default.
2009-09-21 17:40:06 -07:00
Android (Google) Code Review
7f3fb7dec2 Merge change 26130 into eclair
* changes:
  Turn animations on by default.
2009-09-21 20:34:30 -04:00
Dianne Hackborn
bfe319e06a Turn animations on by default.
Add API to skip the animation for a particular start activity, so that
a latter better one can be used.

Fix Theme.NoDisplay to actually work.

Fiddle with various animations: don't do a different animation for task
switching, try a scale animation for switching in/out of the wallpaper.

Adjust the animation duration so that at normal speed we have something
more like the slower animation option (so slow is now the default).

Change-Id: Ieba9f3db0bd9a762a19b327a3ecccbc7b547893d
2009-09-21 17:26:41 -07:00
Jaikumar Ganesh
f4a852e296 am 0bee99f0: am 9197081f: Merge change 26275 into eclair
Merge commit '0bee99f074b848a4fbe5138f4a6a200d6284f78b'

* commit '0bee99f074b848a4fbe5138f4a6a200d6284f78b':
  Send the address of the device with the UUID intent.
2009-09-21 17:19:53 -07:00
Jaikumar Ganesh
0bee99f074 am 9197081f: Merge change 26275 into eclair
Merge commit '9197081f8feca110455740874e06e05771f462c8' into eclair-plus-aosp

* commit '9197081f8feca110455740874e06e05771f462c8':
  Send the address of the device with the UUID intent.
2009-09-21 17:10:46 -07:00
Jaikumar Ganesh
389583cd0c am d86c07a8: am a7719af3: Merge change 26217 into eclair
Merge commit 'd86c07a884aa0242126c4e2dfb37eda526f58e1d'

* commit 'd86c07a884aa0242126c4e2dfb37eda526f58e1d':
  Cache the remote device's service channel.
2009-09-21 16:15:57 -07:00
Jaikumar Ganesh
2d3b98d868 Send the address of the device with the UUID intent.
Change-Id: I6357d482550e9e02edf221add318ecd9cfadcb66
2009-09-21 16:11:01 -07:00
Jaikumar Ganesh
d86c07a884 am a7719af3: Merge change 26217 into eclair
Merge commit 'a7719af31290bea50d822b535b6a886ba7a88097' into eclair-plus-aosp

* commit 'a7719af31290bea50d822b535b6a886ba7a88097':
  Cache the remote device's service channel.
2009-09-21 16:09:57 -07:00
Jaikumar Ganesh
10eac971b3 Cache the remote device's service channel.
Bluez Device implementation is such that when a device
is unpaired, we removes the device and hence there is no
way to interact with it unless you pair again. Remote service
channel call is used to get the rfcomm channel number which
will be used in profiles like OPP which don't require pairing.

Change-Id: I868a6cdfdb1b7d3591dd8b66cd0320f41a9c1b92
2009-09-21 15:58:08 -07:00
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
Bjorn Bringert
be5b73c592 Add search_mode flag to intents launched by QSB suggestions
This lets recipents determine whether an intent was launched
by a global search suggestion. This will for example
be used when deciding how to log clicks on web search suggestions.

Needed for http://b/issue?id=2097469

Change-Id: Ifc25ec3477a63be8bad094951bfffa7a5e703e7c
2009-09-21 23:05:23 +01: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