Scott Main
c071591cfd
am 8b518577: am c99c401d: am 38b523af: Merge "docs: add missing path-permissions document" into froyo
2010-05-12 15:37:30 -07:00
Scott Main
9a2a8f06f5
am 63768336: am 8b27c965: am f0e4ae56: Merge "docs: fix broken links" into froyo
2010-05-12 15:37:27 -07:00
Grace Kloba
d4ef297311
am 2fb3b394: am bfc63c7b: am 336d7dcb: The default AlertDialog allows cancel. But the default JSConfim doesn\'t have a cancel listener. So when user cancel the dialog, we do not wake up the WebCoreThread. The same code is already done for JSPrompt dialog correctly.
2010-05-12 15:37:22 -07:00
Scott Main
8b518577ce
am c99c401d: am 38b523af: Merge "docs: add missing path-permissions document" into froyo
...
Merge commit 'c99c401d93f94d4243ed8cdd5fec101efc9ee265' into kraken
* commit 'c99c401d93f94d4243ed8cdd5fec101efc9ee265':
docs: add missing path-permissions document
2010-05-12 15:35:47 -07:00
Scott Main
6376833687
am 8b27c965: am f0e4ae56: Merge "docs: fix broken links" into froyo
...
Merge commit '8b27c965c8a4cb8ceb4b50484d55270758703768' into kraken
* commit '8b27c965c8a4cb8ceb4b50484d55270758703768':
docs: fix broken links
2010-05-12 15:35:41 -07:00
Grace Kloba
2fb3b394fb
am bfc63c7b: am 336d7dcb: The default AlertDialog allows cancel. But the default JSConfim doesn\'t have a cancel listener. So when user cancel the dialog, we do not wake up the WebCoreThread. The same code is already done for JSPrompt dialog correctly.
...
Merge commit 'bfc63c7b83160fd3e771e5187d317348e72d6c27' into kraken
* commit 'bfc63c7b83160fd3e771e5187d317348e72d6c27':
The default AlertDialog allows cancel. But the default
2010-05-12 15:35:37 -07:00
Scott Main
c99c401d93
am 38b523af: Merge "docs: add missing path-permissions document" into froyo
...
Merge commit '38b523af5c233dd5f8631ada2cd80b2d75b0efde' into froyo-plus-aosp
* commit '38b523af5c233dd5f8631ada2cd80b2d75b0efde':
docs: add missing path-permissions document
2010-05-12 15:33:38 -07:00
Scott Main
8b27c965c8
am f0e4ae56: Merge "docs: fix broken links" into froyo
...
Merge commit 'f0e4ae563228db584041d517672aeadacecba61f' into froyo-plus-aosp
* commit 'f0e4ae563228db584041d517672aeadacecba61f':
docs: fix broken links
2010-05-12 15:33:35 -07:00
Grace Kloba
bfc63c7b83
am 336d7dcb: The default AlertDialog allows cancel. But the default JSConfim doesn\'t have a cancel listener. So when user cancel the dialog, we do not wake up the WebCoreThread. The same code is already done for JSPrompt dialog correctly.
...
Merge commit '336d7dcb105a43ee4de51fd0f26f277c63662f02' into froyo-plus-aosp
* commit '336d7dcb105a43ee4de51fd0f26f277c63662f02':
The default AlertDialog allows cancel. But the default
2010-05-12 15:33:30 -07:00
The Android Open Source Project
35b1184339
am 1f35de2a: am 79090cb3: merge from open-source master
2010-05-12 15:08:06 -07:00
The Android Open Source Project
1f35de2a2e
am 79090cb3: merge from open-source master
...
Merge commit '79090cb3da132d07cd3888ef9242df9872fb4aa1' into kraken
* commit '79090cb3da132d07cd3888ef9242df9872fb4aa1':
Change license for the UUS Information file.
Remove ProximityAlerts Receiver when last ProximityAlert expires.
2010-05-12 15:06:13 -07:00
Scott Main
38b523af5c
Merge "docs: add missing path-permissions document" into froyo
2010-05-12 15:01:31 -07:00
The Android Open Source Project
7cd6ca9ba8
am d6e24ca2: am 4adacd23: merge from open-source master
2010-05-12 14:57:51 -07:00
The Android Open Source Project
d6e24ca28b
am 4adacd23: merge from open-source master
...
Merge commit '4adacd23d4c91569b16fe50419f1a91f68d805bd' into kraken
* commit '4adacd23d4c91569b16fe50419f1a91f68d805bd':
Add support for EVDO Rev B
2010-05-12 14:56:00 -07:00
Kenny Root
d6effb0696
am e8621534: Merge "ZipUtilsRO rewrite based on Dalvik Zip rewrite" into kraken
2010-05-12 14:55:56 -07:00
Kenny Root
e8621534db
Merge "ZipUtilsRO rewrite based on Dalvik Zip rewrite" into kraken
2010-05-12 14:54:42 -07:00
The Android Open Source Project
79090cb3da
merge from open-source master
...
Change-Id: Ifb008642faddf6b83769cdaa5bd67d21591b9eaa
2010-05-12 14:54:38 -07:00
Scott Main
f0e4ae5632
Merge "docs: fix broken links" into froyo
2010-05-12 14:53:35 -07:00
The Android Open Source Project
4adacd23d4
merge from open-source master
...
Change-Id: If6730b50627b2231bd345e594d8d30a37557849e
2010-05-12 14:53:25 -07:00
Scott Main
5dd0fd5c89
docs: fix broken links
...
Change-Id: I2720ce4fe30b1e6ff35b91f48a98ead8999ed1ab
2010-05-12 14:49:38 -07:00
The Android Open Source Project
fe953c4381
am 2a2174a7: am ccfd99b1: merge from open-source master
2010-05-12 14:44:47 -07:00
The Android Open Source Project
2a2174a7bd
am ccfd99b1: merge from open-source master
...
Merge commit 'ccfd99b1e2a64c72ec433ebf5cf98d644ab24614' into kraken
* commit 'ccfd99b1e2a64c72ec433ebf5cf98d644ab24614':
Support for User to User Signaling (UUS)
2010-05-12 14:41:40 -07:00
The Android Open Source Project
ccfd99b1e2
merge from open-source master
...
Change-Id: Ib092e6ae5151bbcdf56b9b3a7adbaee7bb5df8b5
2010-05-12 14:39:38 -07:00
Grace Kloba
336d7dcb10
The default AlertDialog allows cancel. But the default
...
JSConfim doesn't have a cancel listener. So when
user cancel the dialog, we do not wake up the WebCoreThread.
The same code is already done for JSPrompt dialog correctly.
Fix http://b/issue?id=2679139
2010-05-12 14:28:07 -07:00
The Android Open Source Project
fc97669ad5
am 72a6af1a: am 7d952644: merge from open-source master
2010-05-12 14:14:59 -07:00
The Android Open Source Project
72a6af1ab1
am 7d952644: merge from open-source master
...
Merge commit '7d9526445c8631f347c7bf7d944e5bb1dc35b0b5' into kraken
* commit '7d9526445c8631f347c7bf7d944e5bb1dc35b0b5':
Support to display message when operation is blocked due to FDN being enabled
2010-05-12 14:12:25 -07:00
The Android Open Source Project
7d9526445c
merge from open-source master
...
Change-Id: Ib5ea9745c2b652d64646e3e28c12e63815321ff9
2010-05-12 14:10:23 -07:00
The Android Open Source Project
9a069c80fe
am 63ece47f: am 2a9ae01f: merge from open-source master
2010-05-12 12:46:17 -07:00
The Android Open Source Project
63ece47fec
am 2a9ae01f: merge from open-source master
...
Merge commit '2a9ae01f74e7273ce0d1045754597ea78b88ba69' into kraken
* commit '2a9ae01f74e7273ce0d1045754597ea78b88ba69':
Corrected repeat count for key repeat in input device.
2010-05-12 12:44:27 -07:00
The Android Open Source Project
2a9ae01f74
merge from open-source master
...
Change-Id: I24ecfac151c0ddc27237d711c95b8fe488d7931b
2010-05-12 12:33:35 -07:00
The Android Open Source Project
1b7e3ef417
am 55bef14f: am fb234bbe: merge from open-source master
2010-05-12 12:15:35 -07:00
The Android Open Source Project
55bef14f15
am fb234bbe: merge from open-source master
...
Merge commit 'fb234bbe5e7cbae42b4fc8f4ab353ba561599db2' into kraken
* commit 'fb234bbe5e7cbae42b4fc8f4ab353ba561599db2':
Notify user regarding invalid number during MO call.
Build software AGL library with correct get_tls() macro for ARMv7 based platforms
Fix glReadPixels() to verify that both x and y are non-negative.
2010-05-12 12:13:18 -07:00
Naveen Kalla
052203e50c
Change license for the UUS Information file.
...
Change-Id: Idd77e9078354a46605142c2eb704823aaa7d560d
2010-05-12 12:02:09 -07:00
The Android Open Source Project
fb234bbe5e
merge from open-source master
...
Change-Id: I022d0781a232396e2b8a67a420ecf50e64b87d8c
2010-05-12 11:58:14 -07:00
Scott Main
5385cc20f6
docs: add missing path-permissions document
...
Change-Id: I926f6ead8babbb66ead386890c143e1bc3ddf229
2010-05-12 11:31:03 -07:00
Dirk Dougherty
f41bc12003
am e46defea: am 68b37d14: am a04202b3: Merge "Doc change: remove Google I/O 09 from carousel." into froyo
2010-05-12 11:12:15 -07:00
Dirk Dougherty
e46defea3a
am 68b37d14: am a04202b3: Merge "Doc change: remove Google I/O 09 from carousel." into froyo
...
Merge commit '68b37d14708414d3cee418024c178f0a3c7d8b5b' into kraken
* commit '68b37d14708414d3cee418024c178f0a3c7d8b5b':
Doc change: remove Google I/O 09 from carousel.
2010-05-12 11:10:10 -07:00
Dirk Dougherty
68b37d1470
am a04202b3: Merge "Doc change: remove Google I/O 09 from carousel." into froyo
...
Merge commit 'a04202b3258845688bcd8c6208222235569df733' into froyo-plus-aosp
* commit 'a04202b3258845688bcd8c6208222235569df733':
Doc change: remove Google I/O 09 from carousel.
2010-05-12 11:08:46 -07:00
Dirk Dougherty
a04202b325
Merge "Doc change: remove Google I/O 09 from carousel." into froyo
2010-05-12 11:05:03 -07:00
Jean-Michel Trivi
6d7334c16e
am afbc5fad: Fix build Remove from API 9 definition the two methods that were removed from API 8.
2010-05-12 10:53:50 -07:00
Dirk Dougherty
b0e243b62a
Doc change: remove Google I/O 09 from carousel.
...
Change-Id: I5b97ceef5316930266d1b4581217afad74129372
2010-05-12 10:48:31 -07:00
Jean-Michel Trivi
afbc5fad91
Fix build Remove from API 9 definition the two methods that were
...
removed from API 8.
Change-Id: I4b443a257b5674a7493ccda0a0427999e369fb4f
2010-05-12 10:43:22 -07:00
Scott Main
2c42852cbf
am 1d9b25a0: am 0d967ff0: am 18dc51d4: Merge "docs: fix broken anchor names" into froyo
2010-05-12 08:50:21 -07:00
Dirk Dougherty
b796d6983e
am dd142ac3: am 052e2102: am 0d1b0814: Doc change: updates for new tools, platform, adt versions. Misc other fixes updates in doc files.
2010-05-12 08:50:16 -07:00
Dirk Dougherty
271a15d800
am a1cdf279: am 89f74cf6: am 4d5275e7: Merge "Doc change: update diff report 7-> 8" into froyo
2010-05-12 08:50:12 -07:00
Scott Main
7331e8062c
am 812266dd: am a250e328: am 827a50dd: Merge "docs: remove the dashboard from the sidenav for the offline docs" into froyo
2010-05-12 08:50:08 -07:00
Brett Chabot
342e520b78
am 4924ea49: am c8e84e12: am b4c9a8f6: Merge "Fix imf tests." into froyo
2010-05-12 08:49:57 -07:00
Scott Main
05d4198cb6
am 9809015b: am 21f18e96: am bb129dc5: docs: make Notifying the User an expandable list
2010-05-12 08:49:53 -07:00
Scott Main
604821f846
am 5b46aa36: am d522b270: am a225e3b1: docs: add quickview box with "see also" links for some articles
2010-05-12 08:49:48 -07:00
Scott Main
7d653029e5
am 1dc7c4ab: am 0130e383: am 6bc3304b: Merge "docs: remove allowBackup attribute from documentation" into froyo
2010-05-12 08:49:42 -07:00
