4643 Commits

Author SHA1 Message Date
Bjorn Bringert
6dc970e89c am 668b5554: am 916b2ca9: Merge change 26355 into eclair
Merge commit '668b55543b6fcae815edc217a839804f47ebb738'

* commit '668b55543b6fcae815edc217a839804f47ebb738':
  Use FLAG_ACTIVITY_CLEAR_TOP when launching search suggestions.
2009-09-23 11:31:58 -07:00
Bjorn Bringert
38c344ed22 am c216f4a0: am af1eb148: Merge change 25465 into eclair
Merge commit 'c216f4a0238c2bd3720dbb5c5f04a52ac7691e59'

* commit 'c216f4a0238c2bd3720dbb5c5f04a52ac7691e59':
  Reset typeface when changing from visible password inputType
2009-09-23 11:31:22 -07:00
Andrei Popescu
42f83146fb am 22d3ba8a: am dee76be4: Fix for 2122292: make sure we unregister the ContentObserver for the system location settings. Also make the GoogleLocationManager use the singleton pattern correctly.
Merge commit '22d3ba8ac6faddcdad279b775a5f6237c0d2132f'

* commit '22d3ba8ac6faddcdad279b775a5f6237c0d2132f':
  Fix for 2122292: make sure we unregister the ContentObserver for the system location settings. Also make the GoogleLocationManager use the singleton pattern correctly.
2009-09-23 11:30:24 -07:00
Grace Kloba
160d35ede4 am 1be0eb6f: am 24a3ff95: Change double tap toast to long toast.
Merge commit '1be0eb6fc9a2933e7a16cc5bb05e24c6bd09ff62'

* commit '1be0eb6fc9a2933e7a16cc5bb05e24c6bd09ff62':
  Change double tap toast to long toast.
2009-09-23 11:30:10 -07:00
Bjorn Bringert
668b55543b am 916b2ca9: Merge change 26355 into eclair
Merge commit '916b2ca9375b0a6a54e2bef2b2b5faab23ac3cfb' into eclair-plus-aosp

* commit '916b2ca9375b0a6a54e2bef2b2b5faab23ac3cfb':
  Use FLAG_ACTIVITY_CLEAR_TOP when launching search suggestions.
2009-09-22 12:42:48 -07:00
Android (Google) Code Review
916b2ca937 Merge change 26355 into eclair
* changes:
  Use FLAG_ACTIVITY_CLEAR_TOP when launching search suggestions.
2009-09-22 15:37:15 -04:00
Bjorn Bringert
c216f4a023 am af1eb148: Merge change 25465 into eclair
Merge commit 'af1eb148377f1dafacda429580b7cfe01781eb4d' into eclair-plus-aosp

* commit 'af1eb148377f1dafacda429580b7cfe01781eb4d':
  Reset typeface when changing from visible password inputType
2009-09-22 12:32:40 -07:00
Android (Google) Code Review
af1eb14837 Merge change 25465 into eclair
* changes:
  Reset typeface when changing from visible password inputType
2009-09-22 15:25:15 -04:00
Andrei Popescu
22d3ba8ac6 am dee76be4: Fix for 2122292: make sure we unregister the ContentObserver for the system location settings. Also make the GoogleLocationManager use the singleton pattern correctly.
Merge commit 'dee76be487fcdc975877f85221a693b87b9669a7' into eclair-plus-aosp

* commit 'dee76be487fcdc975877f85221a693b87b9669a7':
  Fix for 2122292: make sure we unregister the ContentObserver for the system location settings. Also make the GoogleLocationManager use the singleton pattern correctly.
2009-09-22 12:02:59 -07:00
Grace Kloba
1be0eb6fc9 am 24a3ff95: Change double tap toast to long toast.
Merge commit '24a3ff958b87550904a71961835f6883d1411c27' into eclair-plus-aosp

* commit '24a3ff958b87550904a71961835f6883d1411c27':
  Change double tap toast to long toast.
2009-09-22 12:02:46 -07:00
Andrei Popescu
dee76be487 Fix for 2122292: make sure we unregister the ContentObserver for the system location settings. Also make the GoogleLocationManager use the singleton pattern correctly. 2009-09-22 19:51:14 +01:00
Nicolas Roard
e491af9c34 am a57f8297: am 194099dc: Merge change 26220 into eclair
Merge commit 'a57f82975eeb0a7dfa7d0fd310ae9612857a6c31'

* commit 'a57f82975eeb0a7dfa7d0fd310ae9612857a6c31':
  Reimplement the settings to use async callbacks
2009-09-22 11:16:37 -07:00
Grace Kloba
24a3ff958b Change double tap toast to long toast.
Change toast count to static to cross all the windows.

It should be --count instead of count--.
2009-09-22 11:11:01 -07:00
Nicolas Roard
a57f82975e am 194099dc: Merge change 26220 into eclair
Merge commit '194099dc4f614130f3baff14850792e6dc3fa59b' into eclair-plus-aosp

* commit '194099dc4f614130f3baff14850792e6dc3fa59b':
  Reimplement the settings to use async callbacks
2009-09-22 11:10:41 -07:00
Android (Google) Code Review
194099dc4f Merge change 26220 into eclair
* changes:
  Reimplement the settings to use async callbacks
2009-09-22 14:02:44 -04:00
Nicolas Roard
6c24b4d102 Reimplement the settings to use async callbacks 2009-09-22 18:44:52 +01:00
Jack Veenstra
32399aa8ae am a1d6c7d0: am 06766900: Merge change 26323 into eclair
Merge commit 'a1d6c7d001cc4d2e53353be07127420c8907b6a3'

* commit 'a1d6c7d001cc4d2e53353be07127420c8907b6a3':
  Fix bug with ScrollView so that text entry fields are not hidden by virtual keyboard.
2009-09-22 10:41:15 -07:00
Patrick Scott
73947e3b4f am 909e7b8c: am d58ccff7: Add a boolean indicating if the apple-touch-icon is precomposed.
Merge commit '909e7b8c9d94e28978721874a574ffbe84ef3b36'

* commit '909e7b8c9d94e28978721874a574ffbe84ef3b36':
  Add a boolean indicating if the apple-touch-icon is precomposed.
2009-09-22 10:41:04 -07:00
Jack Veenstra
a1d6c7d001 am 06766900: Merge change 26323 into eclair
Merge commit '0676690091b348d939db0340c3a0d888683c1abb' into eclair-plus-aosp

* commit '0676690091b348d939db0340c3a0d888683c1abb':
  Fix bug with ScrollView so that text entry fields are not hidden by virtual keyboard.
2009-09-22 10:35:24 -07:00
Patrick Scott
909e7b8c9d am d58ccff7: Add a boolean indicating if the apple-touch-icon is precomposed.
Merge commit 'd58ccff769e40a6c52e9f6e30e4016590e05ba9a' into eclair-plus-aosp

* commit 'd58ccff769e40a6c52e9f6e30e4016590e05ba9a':
  Add a boolean indicating if the apple-touch-icon is precomposed.
2009-09-22 10:35:12 -07:00
Android (Google) Code Review
0676690091 Merge change 26323 into eclair
* changes:
  Fix bug with ScrollView so that text entry fields are not hidden by virtual keyboard.
2009-09-22 13:31:02 -04:00
Grace Kloba
e68eeb6bf8 am 263a2f50: am 408cf852: Support the new dpi change in the WebView.
Merge commit '263a2f5031f50d020a51d45ef26b99dcee5cb65e'

* commit '263a2f5031f50d020a51d45ef26b99dcee5cb65e':
  Support the new dpi change in the WebView.
2009-09-22 10:30:37 -07:00
Patrick Scott
d58ccff769 Add a boolean indicating if the apple-touch-icon is precomposed. 2009-09-22 13:28:36 -04:00
Grace Kloba
263a2f5031 am 408cf852: Support the new dpi change in the WebView.
Merge commit '408cf85207a43c9169f9fb520a584d2858847d24' into eclair-plus-aosp

* commit '408cf85207a43c9169f9fb520a584d2858847d24':
  Support the new dpi change in the WebView.
2009-09-22 10:19:57 -07:00
Evan Millar
f8fa1a0c49 am 1df98859: am b5c29399: Merge change 26301 into eclair
Merge commit '1df988597f113f46fcf1ada68054ff1fc07aa39e'

* commit '1df988597f113f46fcf1ada68054ff1fc07aa39e':
  Add aggregated badge to ContactHeaderWidget
2009-09-22 10:09:35 -07:00
Grace Kloba
408cf85207 Support the new dpi change in the WebView.
Fix http://b/issue?id=2071943
2009-09-22 10:07:27 -07:00
Evan Millar
1df988597f am b5c29399: Merge change 26301 into eclair
Merge commit 'b5c2939904d7b374aee5b1f675c560e839a318f1' into eclair-plus-aosp

* commit 'b5c2939904d7b374aee5b1f675c560e839a318f1':
  Add aggregated badge to ContactHeaderWidget
2009-09-22 09:59:34 -07:00
Android (Google) Code Review
b5c2939904 Merge change 26301 into eclair
* changes:
  Add aggregated badge to ContactHeaderWidget
2009-09-22 12:49:20 -04:00
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
Evan Millar
de9eef1c66 Add aggregated badge to ContactHeaderWidget
Change-Id: I0266828c7d560b9aefc3f58d27c217f710f1b0bb
2009-09-22 08:40:22 -07:00
Bjorn Bringert
442da48b24 Use FLAG_ACTIVITY_CLEAR_TOP when launching search suggestions.
Fixes http://b/issue?id=2118143
"Sometimes clicking a contact suggestion opens the
wrong activity in Contacts"

Change-Id: Ie4c150e91e455949e9f17245920850cfe7e6599e
2009-09-22 14:43:45 +01: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
Jeff Sharkey
5389a33134 am 8cda99f2: am a25c9b28: Remove unused type attribute.
Merge commit '8cda99f292050048fb7e1f8077f5f9c0022a9c1a'

* commit '8cda99f292050048fb7e1f8077f5f9c0022a9c1a':
  Remove unused type attribute.
2009-09-21 21:40:27 -07:00
Jeff Sharkey
8cda99f292 am a25c9b28: Remove unused type attribute.
Merge commit 'a25c9b280e3d14e5c8b443b1592d2ab6069efdc3' into eclair-plus-aosp

* commit 'a25c9b280e3d14e5c8b443b1592d2ab6069efdc3':
  Remove unused type attribute.
2009-09-21 21:32:54 -07:00
Jeff Sharkey
a25c9b280e Remove unused type attribute. 2009-09-21 21:25:01 -07:00
Jeff Sharkey
3fabbc83de am 9ca231c5: am 3f0476a4: Basic API for third-party apps to define custom Data rows.
Merge commit '9ca231c5b616f7240021906b0decd1d412df00ab'

* commit '9ca231c5b616f7240021906b0decd1d412df00ab':
  Basic API for third-party apps to define custom Data rows.
2009-09-21 21:20:51 -07:00
Jeff Sharkey
9ca231c5b6 am 3f0476a4: Basic API for third-party apps to define custom Data rows.
Merge commit '3f0476a4e283ce4e55caac016293dafe9dca11fa' into eclair-plus-aosp

* commit '3f0476a4e283ce4e55caac016293dafe9dca11fa':
  Basic API for third-party apps to define custom Data rows.
2009-09-21 21:11:32 -07:00
Jeff Sharkey
3f0476a4e2 Basic API for third-party apps to define custom Data rows.
To display styled ContactsContract.Data rows in UI, this
change adds basic styling attributes that third-party apps
can use.  The Contacts app parses these structures before
displaying Data rows with unrecognized MIME-types.

Partially fixes http://b/2126691
2009-09-21 21:05:59 -07:00
Jack Veenstra
7d4200d03f Fix bug with ScrollView so that text entry fields are not hidden by virtual keyboard. 2009-09-21 19:45:14 -07:00
Dan Egnor
5529ddb956 am e5910775: am 9bbd5ee4: Merge change 26290 into eclair
Merge commit 'e5910775c892f37ddc05c63eeaf62b74228cfb30'

* commit 'e5910775c892f37ddc05c63eeaf62b74228cfb30':
  Make IBackupTransport.finishBackup() also return an int code, since it too can
2009-09-21 19:41:44 -07:00
Dan Egnor
e5910775c8 am 9bbd5ee4: Merge change 26290 into eclair
Merge commit '9bbd5ee49f4a26b87273c40a955557e63f10da3b' into eclair-plus-aosp

* commit '9bbd5ee49f4a26b87273c40a955557e63f10da3b':
  Make IBackupTransport.finishBackup() also return an int code, since it too can
2009-09-21 19:31:54 -07:00
Android (Google) Code Review
9bbd5ee49f Merge change 26290 into eclair
* changes:
  Make IBackupTransport.finishBackup() also return an int code, since it too can return TRANSPORT_NOT_INITIALIZED (in fact that's typically how it comes).
2009-09-21 22:26:35 -04:00