Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,903 Commits 3 Branches 0 Tags
409a57504fe6bb915d85f1091267206f7e0dfdcd
Commit Graph

16870 Commits

Author SHA1 Message Date
Android (Google) Code Review
98fdda0925 Merge change I86773fbb into eclair-mr2 
* changes:
  If overview width is the same as the current width, don't change the mode when double tap or zoom out.
 2009-11-19 13:47:24 -08:00
Steve Block
74dcb02f59 am 57534f1b: Improves documentation for GeolocationPermissions class. 
Merge commit '57534f1b9f52cea094e8197d1ca40f0d2f68cc66' into eclair-mr2-plus-aosp

* commit '57534f1b9f52cea094e8197d1ca40f0d2f68cc66':
  Improves documentation for GeolocationPermissions class.
 2009-11-19 12:08:01 -08:00
Fred Quintana
f1efe8e32a am f61ab007: am 5994cd28: -hide AccountManagerResponse, which never should have been exposed in the first place 
Merge commit 'f61ab00770c6010d83280644263d6f530c75028e' into eclair-mr2-plus-aosp

* commit 'f61ab00770c6010d83280644263d6f530c75028e':
  -hide AccountManagerResponse, which never should have been exposed in the first place
 2009-11-19 12:07:37 -08:00
Dianne Hackborn
805df37632 am 4ee93666: am e4260f4e: Fix build. 
Merge commit '4ee936667181975cd755acd81c653ba686d6106d' into eclair-mr2-plus-aosp

* commit '4ee936667181975cd755acd81c653ba686d6106d':
  Fix build.
 2009-11-19 12:07:13 -08:00
Charles Chen
b4fbe768f8 Adding the ability to specify the speech synthesis 
engine to use for text-to-speech.
 2009-11-19 12:02:55 -08:00
Steve Block
57534f1b9f Improves documentation for GeolocationPermissions class. 
Also sets an explicit type for GeolocationPermissions.getOrigins.

This is a partial fix for bug http://b/issue?id=2271636

Change-Id: Ife478917a979b68e242c467798358a018455957f
 2009-11-19 19:59:14 +00:00
Fred Quintana
f61ab00770 am 5994cd28: -hide AccountManagerResponse, which never should have been exposed in the first place 
Merge commit '5994cd2898ad3c76d1f5068137a884024f521163' into eclair-mr2

* commit '5994cd2898ad3c76d1f5068137a884024f521163':
  -hide AccountManagerResponse, which never should have been exposed in the first place
 2009-11-19 11:41:48 -08:00
lknguyen
904a4b7aaf am 8250530c: Merge change I194f0808 into eclair-mr2 
Merge commit '8250530c507653d57c768677d8a542cd769aaf99' into eclair-mr2-plus-aosp

* commit '8250530c507653d57c768677d8a542cd769aaf99':
  Add Gservices flag so that Market can turn on performance logging for specific groups.
 2009-11-19 11:41:35 -08:00
Dianne Hackborn
4ee9366671 am e4260f4e: Fix build. 
Merge commit 'e4260f4e7da4da32bfab2737018cf9cf75215894' into eclair-mr2

* commit 'e4260f4e7da4da32bfab2737018cf9cf75215894':
  Fix build.
 2009-11-19 11:40:48 -08:00
Android (Google) Code Review
8250530c50 Merge change I194f0808 into eclair-mr2 
* changes:
  Add Gservices flag so that Market can turn on performance logging for specific groups.
 2009-11-19 11:36:42 -08:00
Grace Kloba
86773fbb4e If overview width is the same as the current width, 
don't change the mode when double tap or zoom out.

Fix http://b/issue?id=2240785
 2009-11-19 11:25:20 -08:00
Dianne Hackborn
a82e7e24ea am 2b38a09f: am 23ef7b48: Fix most of issue #2271640: Fix wallpaper etc docs 
Merge commit '2b38a09f044ad0bb14db7360b352fcca612f49ac' into eclair-mr2-plus-aosp

* commit '2b38a09f044ad0bb14db7360b352fcca612f49ac':
  Fix most of issue #2271640: Fix wallpaper etc docs
 2009-11-19 11:14:34 -08:00
Dianne Hackborn
2b38a09f04 am 23ef7b48: Fix most of issue #2271640: Fix wallpaper etc docs 
Merge commit '23ef7b4836d66d31430fedee2aac36275bb30d4b' into eclair-mr2

* commit '23ef7b4836d66d31430fedee2aac36275bb30d4b':
  Fix most of issue #2271640: Fix wallpaper etc docs
 2009-11-19 11:09:11 -08:00
Fred Quintana
5971382f19 am 5994cd28: -hide AccountManagerResponse, which never should have been exposed in the first place 
Merge commit '5994cd2898ad3c76d1f5068137a884024f521163' into eclair-plus-aosp

* commit '5994cd2898ad3c76d1f5068137a884024f521163':
  -hide AccountManagerResponse, which never should have been exposed in the first place
 2009-11-19 10:24:47 -08:00
Fred Quintana
5994cd2898 -hide AccountManagerResponse, which never should have been exposed in the first place 2009-11-19 10:19:23 -08:00
Ben Murdoch
6d5d55c103 am ff8cec70: am b0fbb7cc: Merge change I09e159ce into eclair-mr2 
Merge commit 'ff8cec7083f2b3ffa2e009ee3f4e9337ce9361e7'

* commit 'ff8cec7083f2b3ffa2e009ee3f4e9337ce9361e7':
  Update JavaDoc for CacheManger.CacheResult, WebChromeClient.getDefaultVideoPoster and WebChromeClient.getVideoLoadingProgressView.
 2009-11-19 09:17:43 -08:00
Ben Murdoch
ff8cec7083 am b0fbb7cc: Merge change I09e159ce into eclair-mr2 
Merge commit 'b0fbb7cc15a2b383b4fe1dde8117254b2056573b' into eclair-mr2-plus-aosp

* commit 'b0fbb7cc15a2b383b4fe1dde8117254b2056573b':
  Update JavaDoc for CacheManger.CacheResult, WebChromeClient.getDefaultVideoPoster and WebChromeClient.getVideoLoadingProgressView.
 2009-11-19 09:11:48 -08:00
Android (Google) Code Review
b0fbb7cc15 Merge change I09e159ce into eclair-mr2 
* changes:
  Update JavaDoc for CacheManger.CacheResult, WebChromeClient.getDefaultVideoPoster and WebChromeClient.getVideoLoadingProgressView.
 2009-11-19 09:08:22 -08:00
Ben Murdoch
f0c443deca Update JavaDoc for CacheManger.CacheResult, WebChromeClient.getDefaultVideoPoster and WebChromeClient.getVideoLoadingProgressView. 
Change-Id: I09e159cec0ccdf09b278daeeab268c0c4f4476ba
 2009-11-19 16:48:16 +00:00
Ben Murdoch
9f81a58578 am 35e8de89: am 0a784a54: When requesting the href of a link, also request the link\'s text. 
Merge commit '35e8de89551825ca19f069d029757ecd852661a4'

* commit '35e8de89551825ca19f069d029757ecd852661a4':
  When requesting the href of a link, also request the link's text.
 2009-11-19 05:05:27 -08:00
Ben Murdoch
35e8de8955 am 0a784a54: When requesting the href of a link, also request the link\'s text. 
Merge commit '0a784a545303cc5fcd9ecbc260d1fa0d0d0b8336' into eclair-mr2-plus-aosp

* commit '0a784a545303cc5fcd9ecbc260d1fa0d0d0b8336':
  When requesting the href of a link, also request the link's text.
 2009-11-19 05:00:12 -08:00
Ben Murdoch
0a784a5453 When requesting the href of a link, also request the link's text. 
Change-Id: If3cf97d0b328d654919b1334b07d4c8cc7b1a9ea
 2009-11-19 10:21:32 +00:00
Android (Google) Code Review
a9edf34ed7 Merge change I9444b196 
* changes:
  Add a Java API for OpenGL ES 2.0.
 2009-11-19 00:41:01 -08:00
Jack Palevich
560814f6b1 Add a Java API for OpenGL ES 2.0. 
Currently this API is hidden.

Add a test program.
 2009-11-19 16:34:55 +08:00
Dianne Hackborn
b8392587ca am e4260f4e: Fix build. 
Merge commit 'e4260f4e7da4da32bfab2737018cf9cf75215894' into eclair-plus-aosp

* commit 'e4260f4e7da4da32bfab2737018cf9cf75215894':
  Fix build.
 2009-11-18 21:22:39 -08:00
Dianne Hackborn
e4260f4e7d Fix build. 
Change-Id: I3aeb4f374a99d5872ba19c04624aa1b5ca6cd5d0
 2009-11-18 21:15:59 -08:00
Dianne Hackborn
da511167ca am 23ef7b48: Fix most of issue #2271640: Fix wallpaper etc docs 
Merge commit '23ef7b4836d66d31430fedee2aac36275bb30d4b' into eclair-plus-aosp

* commit '23ef7b4836d66d31430fedee2aac36275bb30d4b':
  Fix most of issue #2271640: Fix wallpaper etc docs
 2009-11-18 19:07:46 -08:00
Dianne Hackborn
23ef7b4836 Fix most of issue #2271640: Fix wallpaper etc docs 
Only thing remaining is the live wallpaper feature.

Change-Id: I8854c7978999d759bf618307f4f984c9c89d3fc8
 2009-11-18 18:34:19 -08:00
Daisuke Miyakawa
b0a12a151f am e922751e: am 6a942dbe: Merge change Ifd754059 into eclair-mr2 
Merge commit 'e922751eb6d5e19a4c85dc92d57fddb7ccff7808'

* commit 'e922751eb6d5e19a4c85dc92d57fddb7ccff7808':
  Make vCard code refrain from using NEIGHBORHOOD field when importing.
 2009-11-18 18:30:40 -08:00
Daisuke Miyakawa
e922751eb6 am 6a942dbe: Merge change Ifd754059 into eclair-mr2 
Merge commit '6a942dbe51b52ce41903e236d5db294274bb0dd2' into eclair-mr2-plus-aosp

* commit '6a942dbe51b52ce41903e236d5db294274bb0dd2':
  Make vCard code refrain from using NEIGHBORHOOD field when importing.
 2009-11-18 18:26:24 -08:00
Android (Google) Code Review
6a942dbe51 Merge change Ifd754059 into eclair-mr2 
* changes:
  Make vCard code refrain from using NEIGHBORHOOD field when importing.
 2009-11-18 18:23:21 -08:00
Daisuke Miyakawa
a6d81e3ee4 Make vCard code refrain from using NEIGHBORHOOD field when importing. 
Internal issue number: 2195990
 2009-11-19 11:21:39 +09:00
repo sync
c1786f1697 am d28fcd5b: resolved conflicts for merge of efd91d7c to eclair-mr2-plus-aosp 
Merge commit 'd28fcd5bb8e5734a12b83f7cefde759c009e7b6e'

* commit 'd28fcd5bb8e5734a12b83f7cefde759c009e7b6e':
  Fixes for proximity sensor behavior:
 2009-11-18 17:55:09 -08:00
Daisuke Miyakawa
f4d7ffb0b1 am 5b2f5ced: am ddd017f8: Merge change I8daabf26 into eclair-mr2 
Merge commit '5b2f5ced25aee6fec49ffd30abeca2801c98fbd8'

* commit '5b2f5ced25aee6fec49ffd30abeca2801c98fbd8':
  Modify vCard exporter code so that it does not emit non-Ascii type.
 2009-11-18 17:54:44 -08:00
Dianne Hackborn
a40fcd1ce9 am 822d8f67: am bdcd30ac: am dfc066e7: Merge change I5ad37324 into eclair 
Merge commit '822d8f67ebcdab61fa513d6d9401476e12143386'

* commit '822d8f67ebcdab61fa513d6d9401476e12143386':
  Fix issue #2262563: 40 ANR reports from com.android.settings in dogfooding sholes running ERD43
 2009-11-18 17:54:11 -08:00
Jim Miller
8e38ce4dee am 5d81e8c8: am 43733460: am 30142f7e: Merge change I9f239766 into eclair 
Merge commit '5d81e8c82aa8d55eff2c2c78e4a553c479332187'

* commit '5d81e8c82aa8d55eff2c2c78e4a553c479332187':
  Workaround for 2262578: Don't draw tabs if view is not in the correct orientation for the layout
 2009-11-18 17:52:34 -08:00
Amith Yamasani
8488a6013e am 41029cf4: am 9335d414: am 778f1e65: Merge change Icfc893d2 into eclair 
Merge commit '41029cf413abbfdf004e04f192a440e457701c47'

* commit '41029cf413abbfdf004e04f192a440e457701c47':
  Fix for 2267410 : Battery use doesn't show CPU usage on non-wiped devices
 2009-11-18 17:51:45 -08:00
repo sync
d28fcd5bb8 resolved conflicts for merge of efd91d7c to eclair-mr2-plus-aosp 
Signed-off-by: repo sync <lockwood@android.com>
 2009-11-18 20:13:09 -05:00
Mike Lockwood
8cfccb1514 am 03786b83: Merge change I813fdb7a into eclair 
Merge commit '03786b83bd02f8dd8e1049d333fbfdee395ac965' into eclair-plus-aosp

* commit '03786b83bd02f8dd8e1049d333fbfdee395ac965':
  Fixes for proximity sensor behavior:
 2009-11-18 16:24:59 -08:00
Mike Lockwood
efd91d7ce0 am 03786b83: Merge change I813fdb7a into eclair 
Merge commit '03786b83bd02f8dd8e1049d333fbfdee395ac965' into eclair-mr2

* commit '03786b83bd02f8dd8e1049d333fbfdee395ac965':
  Fixes for proximity sensor behavior:
 2009-11-18 16:24:37 -08:00
Android (Google) Code Review
03786b83bd Merge change I813fdb7a into eclair 
* changes:
  Fixes for proximity sensor behavior:
 2009-11-18 16:20:32 -08:00
Daisuke Miyakawa
5b2f5ced25 am ddd017f8: Merge change I8daabf26 into eclair-mr2 
Merge commit 'ddd017f872bee40450c0e73dcf6608a9fdc49a05' into eclair-mr2-plus-aosp

* commit 'ddd017f872bee40450c0e73dcf6608a9fdc49a05':
  Modify vCard exporter code so that it does not emit non-Ascii type.
 2009-11-18 16:16:33 -08:00
lknguyen
194f080892 Add Gservices flag so that Market can turn on performance logging for specific groups. 2009-11-18 16:12:51 -08:00
Android (Google) Code Review
ddd017f872 Merge change I8daabf26 into eclair-mr2 
* changes:
  Modify vCard exporter code so that it does not emit non-Ascii type.
 2009-11-18 16:11:35 -08:00
Daisuke Miyakawa
c4b51712d8 Modify vCard exporter code so that it does not emit non-Ascii type. 
Also add unit tests.

Internal issue number: 2195990
 2009-11-19 09:09:27 +09:00
Mike Lockwood
0e39ea83c5 Fixes for proximity sensor behavior: 
Add optional flag to Wakelock.release() to specify whether we should wait for proximity sensor to go negative before turning on the screen.
Clear the "waiting for proximity sensor to go negative" state when the power key is pressed.

Part of the fix for b/2243198 (Black screen lockup after ending call)

Change-Id: I813fdb7aa4192cd3384a25be9e59d7d4b90da53a
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2009-11-18 18:45:59 -05:00
Dianne Hackborn
822d8f67eb am bdcd30ac: am dfc066e7: Merge change I5ad37324 into eclair 
Merge commit 'bdcd30acb3a1ce617f67becd69a7c5bc1037c428' into eclair-mr2-plus-aosp

* commit 'bdcd30acb3a1ce617f67becd69a7c5bc1037c428':
  Fix issue #2262563: 40 ANR reports from com.android.settings in dogfooding sholes running ERD43
 2009-11-18 15:17:17 -08:00
Dianne Hackborn
4393822e60 am dfc066e7: Merge change I5ad37324 into eclair 
Merge commit 'dfc066e769ec227b4dbf0e2e5097973c20c2b34f' into eclair-plus-aosp

* commit 'dfc066e769ec227b4dbf0e2e5097973c20c2b34f':
  Fix issue #2262563: 40 ANR reports from com.android.settings in dogfooding sholes running ERD43
 2009-11-18 15:13:12 -08:00
Dianne Hackborn
bdcd30acb3 am dfc066e7: Merge change I5ad37324 into eclair 
Merge commit 'dfc066e769ec227b4dbf0e2e5097973c20c2b34f' into eclair-mr2

* commit 'dfc066e769ec227b4dbf0e2e5097973c20c2b34f':
  Fix issue #2262563: 40 ANR reports from com.android.settings in dogfooding sholes running ERD43
 2009-11-18 15:12:59 -08:00
Android (Google) Code Review
dfc066e769 Merge change I5ad37324 into eclair 
* changes:
  Fix issue #2262563: 40 ANR reports from com.android.settings in dogfooding sholes running ERD43
 2009-11-18 15:09:18 -08:00