Adam Powell
50ae1dc3a4
New assets for lists and buttons
...
Change-Id: I289f2326cb9e21df963edfd7a6e8f951bdead732
2010-10-24 12:08:22 -07:00
Eric Rowe
5dcf000117
am 288f1373: am 8de43ab5: Merge "Change disable timeout for BT disable stress test" into gingerbread
...
Merge commit '288f13730e6535fb36581781196a55a6f2d198d6'
* commit '288f13730e6535fb36581781196a55a6f2d198d6':
Change disable timeout for BT disable stress test
2010-10-22 18:31:31 -07:00
Nick Pelly
1d952ff85e
am f5b5d177: am 07f3bee2: Push Tag/NdefTag implementation details into the service.
...
Merge commit 'f5b5d177a94bf5b1e59c11fb6f53e2dd40271f59'
* commit 'f5b5d177a94bf5b1e59c11fb6f53e2dd40271f59':
Push Tag/NdefTag implementation details into the service.
2010-10-22 18:31:06 -07:00
Eric Rowe
288f13730e
am 8de43ab5: Merge "Change disable timeout for BT disable stress test" into gingerbread
...
Merge commit '8de43ab5ba818b9552326d5383729b3e6fbf7c82' into gingerbread-plus-aosp
* commit '8de43ab5ba818b9552326d5383729b3e6fbf7c82':
Change disable timeout for BT disable stress test
2010-10-22 18:21:09 -07:00
Nick Pelly
f5b5d177a9
am 07f3bee2: Push Tag/NdefTag implementation details into the service.
...
Merge commit '07f3bee2db8b6e93ebbf7222676bd9f468e85569' into gingerbread-plus-aosp
* commit '07f3bee2db8b6e93ebbf7222676bd9f468e85569':
Push Tag/NdefTag implementation details into the service.
2010-10-22 18:20:52 -07:00
Adam Powell
a139f102d8
Merge "Fix bug 3105695 - Action modes in dialogs or other small windows"
2010-10-22 17:52:01 -07:00
Adam Powell
85446e95af
Fix bug 3105695 - Action modes in dialogs or other small windows
...
Overlay action modes now show in their own windows aligned to the top
of the screen.
Change-Id: I81600bbd1bcaeb59fdcf0a959bd35f82165baa2c
2010-10-22 17:45:31 -07:00
Dianne Hackborn
a7a44d47cb
Merge "Implement issue #3116702 : New manifest tags for supported screen sizes"
2010-10-22 17:16:12 -07:00
Eric Rowe
8de43ab5ba
Merge "Change disable timeout for BT disable stress test" into gingerbread
2010-10-22 17:14:12 -07:00
Eric Rowe
867568314d
Change disable timeout for BT disable stress test
...
Bug: b/3125900
Change-Id: Ie1f599f1c418fc40c29debd1401297441a2a9db3
2010-10-22 16:34:33 -07:00
Nick Pelly
07f3bee2db
Push Tag/NdefTag implementation details into the service.
...
Tag/NdefTag objects should just be simple data objects. Push the mapping of
internal tag type to public rawTarget/ndefTarget into Nfc Service.
This gives an oppurtunity to clean up some Tag/NdefTag API methods. Most
significantly, adding createMockTag() and createMockNdefTag() to help with
application testing.
There will probably be some more tweaking of the types/targets in
Tag/NdefTag to come, this commit makes that a lot easier.
Also:
- Introduce getActivationBytes() and getPollBytes(). These are just stubs
for NFC service to implement, we have feedback these are really important
to help identify NFC tags.
- Based on outside advice, remove 3B_PRIME (roll into 3B) and TOPAZ (roll
into 3A).
Change-Id: I3e6789c047f6ee5c298bf76c65e0885cf3c15d97
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-22 16:29:43 -07:00
Dianne Hackborn
a0b46c9c44
Implement issue #3116702 : New manifest tags for supported screen sizes
...
Merged from GB.
Change-Id: I94730b54bcacd083f77708e84c35f4932a7b9d2e
2010-10-22 16:18:43 -07:00
Eric Fischer
d13f5f4fea
am 67496e59: Merge "Import revised translations. DO NOT MERGE" into gingerbread
2010-10-22 16:08:27 -07:00
Eric Fischer
67496e591d
Merge "Import revised translations. DO NOT MERGE" into gingerbread
2010-10-22 16:06:38 -07:00
Eric Fischer
d0925a88cf
am 26dc88af: am a3e70a43: Merge "Add a space before the weekday in the zh_CN lock screen date format." into gingerbread
2010-10-22 16:04:33 -07:00
Brad Fitzpatrick
1f38636c63
Merge "Expose (internally only) the number of animations currently running."
2010-10-22 16:01:55 -07:00
Eric Fischer
26dc88afdb
am a3e70a43: Merge "Add a space before the weekday in the zh_CN lock screen date format." into gingerbread
2010-10-22 16:01:34 -07:00
Eric Fischer
a3e70a430e
Merge "Add a space before the weekday in the zh_CN lock screen date format." into gingerbread
2010-10-22 15:59:42 -07:00
Brad Fitzpatrick
599ca29986
Expose (internally only) the number of animations currently running.
...
This will be used for StrictMode to annotate violations with
whether or not they janked up an animation.
Change-Id: I5bc691f49b74c45279cd2ae044d2a81dcf1204a9
2010-10-22 15:58:47 -07:00
Shimeng (Simon) Wang
b398fb91eb
Merge "Let double tap reflow text."
2010-10-22 15:26:03 -07:00
Shimeng (Simon) Wang
12e343d6b0
Merge "Ignore viewport viewScale in fixed viewport mode."
2010-10-22 15:25:00 -07:00
Eric Fischer
36504f2d9c
Import revised translations. DO NOT MERGE
...
Change-Id: If41b9f790002bb3cf0adb5214955f496a7170e61
2010-10-22 15:24:30 -07:00
Eric Fischer
c5cde13397
Add a space before the weekday in the zh_CN lock screen date format.
...
Bug 3121853
Change-Id: I3685079bc504544c8d244d8a926c02a5eb367d21
2010-10-22 14:52:46 -07:00
Gilles Debunne
c17942f7b3
Merge "Fix for 3124993. Crash in Browser on long press."
2010-10-22 14:51:15 -07:00
Dianne Hackborn
e6634981f1
resolved conflicts for merge of 9c7489f8 to master
...
Change-Id: I1d8fd1146925f48ad690c89230d24dc8694703f4
2010-10-22 14:35:09 -07:00
Gilles Debunne
77f18b0b83
Fix for 3124993. Crash in Browser on long press.
...
Change-Id: I88c50e3abd3e3a25f92bcc51163b1ef9e62d2afb
2010-10-22 14:33:58 -07:00
Shimeng (Simon) Wang
8117e760ee
Let double tap reflow text.
...
In case when the text wrap scale is out of sync of the zoom scale.
issue:3122512
Change-Id: I9619cc603226503b96e3a0766620bc2884ec1805
2010-10-22 14:16:28 -07:00
Dianne Hackborn
9c7489f8bd
am 38993d8d: Merge "Fix issue #3122240 : Expose xlarge in GB." into gingerbread
2010-10-22 14:03:08 -07:00
Brian Carlstrom
998c01e7af
Merge "Move improved cert chain handling from CertificateChainValidator to TrustManagerImpl"
2010-10-22 13:02:44 -07:00
Dianne Hackborn
5383f502e4
Fix issue #3122240 : Expose xlarge in GB.
...
Plus some other small API cleanup.
Change-Id: I1a3c60f510f99224cccac9cc3f838f04141064f8
2010-10-22 12:59:20 -07:00
Jeff Hamilton
b063e7903e
am 8783b0e2: am 7c68bc38: Merge "Unhide some NFC APIs that are required for the Tag app." into gingerbread
2010-10-22 12:30:54 -07:00
Jeff Hamilton
8783b0e20c
am 7c68bc38: Merge "Unhide some NFC APIs that are required for the Tag app." into gingerbread
2010-10-22 12:11:23 -07:00
Jaikumar Ganesh
5a1e4cf83f
Update BT APIs return type from Set to List.
...
Change-Id: Ia27220dd26cde13007f6938c830517ee7f6968ce
2010-10-22 11:36:28 -07:00
Jaikumar Ganesh
03cd78cf5e
Convert return type of APIs from Set to List.
...
Most of the time it will either be empty or have 1 device.
Using list makes it much a better API and since its supported
by the AIDL format, the code becomes much nicer.
Change-Id: I5a2508b33ba754fc8cc738409d658e1235aaf2cf
2010-10-22 11:36:27 -07:00
Wei-Ta Chen
50db92c452
Merge "Fix 3122139, where previewing an attachment for the second time will fail."
2010-10-22 11:22:59 -07:00
Shimeng (Simon) Wang
9c64bae134
Ignore viewport viewScale in fixed viewport mode.
...
This is to solve macworld.com, which has 900 as viewport but actual
content width is more 1000.
issue: 3003933
Change-Id: I2db3f66828fd00c8be62131599395eb82752b4a2
2010-10-22 10:57:44 -07:00
Dmitri Plotnikov
5c1cf3593d
Merge "Moving cursor to the end of the search query when set explicitly."
2010-10-22 10:54:51 -07:00
Shimeng (Simon) Wang
d15949e65d
Merge "Pass whether a scroll is user-scrolled or not to webkit."
2010-10-22 10:30:57 -07:00
Shimeng (Simon) Wang
50b1034d35
Pass whether a scroll is user-scrolled or not to webkit.
...
This is to eliminate false scrollEvent to webkit. And the side effect
is that the history scroll position will be correctly restored;
otherwise, webkit think there's user scrolled and not send back history
scroll position.
Particulary for NEW_PICTURE_MSG from webkit, the scroll event because of
it are not user-scrolled.
issue: 3063945
Change-Id: I9fdbfcb8baf07baf2331e2c4eed66f88aea744ef
2010-10-22 10:29:19 -07:00
Jeff Hamilton
7c68bc3867
Merge "Unhide some NFC APIs that are required for the Tag app." into gingerbread
2010-10-22 10:20:06 -07:00
Nick Pelly
d29c990874
am c81ec79d: am 0592832c: Merge "Attempt to fix simulator build." into gingerbread
...
Merge commit 'c81ec79d1f88ae8a80e08560a56845655a74f67e'
* commit 'c81ec79d1f88ae8a80e08560a56845655a74f67e':
Attempt to fix simulator build.
2010-10-22 09:17:41 -07:00
Chet Haase
0865f7629a
Merge "Fix native resource leak when OpenGL renderer is not being used."
2010-10-22 09:07:13 -07:00
Nick Pelly
c81ec79d1f
am 0592832c: Merge "Attempt to fix simulator build." into gingerbread
...
Merge commit '0592832c5e61b9c0008a4410f263ea0b0b991f05' into gingerbread-plus-aosp
* commit '0592832c5e61b9c0008a4410f263ea0b0b991f05':
Attempt to fix simulator build.
2010-10-22 09:03:21 -07:00
Chet Haase
27f0b17d85
Fix native resource leak when OpenGL renderer is not being used.
...
Native resources (bitmaps, matrices, paints, shaders) are shared when display lists
are used, and a refcounting system is in place to take care of disposing when all
clients are finished with them. But the cache where these refcounts are tracked is
not enabled when the Open GL renderer is not being used. This results in the native
destructors not being called, and the resources are leaked.
Change-Id: Ic7aeb55e4636dcad229846601407e596160346e6
2010-10-22 08:57:48 -07:00
Nick Pelly
1af97f0b78
Attempt to fix simulator build.
...
Change-Id: I7f912ce58292bdd03fa683d2e5c203480d94e945
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-22 08:48:48 -07:00
Leon Scroggins
f8ca2d71d5
Do not call WebTextView.requestFocus if WebView is not focused.
...
Bug:3118097
Bug:3039912
Change-Id: I4c43f394c9dc3c9db58fb744d588dfb36f3221f4
2010-10-22 10:47:36 -04:00
Steve Block
3b860faec7
Merge "Hook up CookieManager.removeAllCookie() for the Chromium HTTP stack"
2010-10-22 03:56:58 -07:00
Wei-Ta Chen
58c1579ce2
Fix 3122139, where previewing an attachment for the second time will
...
fail.
Use AutoFDSeek to mark and restore the position before we read data from
the descriptor.
Change-Id: I3d4f012dce486e19b113bc90a98b94031cfa8195
2010-10-21 23:40:12 -07:00
Brian Carlstrom
02ca44b13c
Move improved cert chain handling from CertificateChainValidator to TrustManagerImpl
...
Bug: 2658463
Change-Id: Iaf27e6b37ad4ad3951ecccc17eab64049bbfaac0
2010-10-21 23:19:12 -07:00
Jeff Hamilton
da83f513ca
Unhide some NFC APIs that are required for the Tag app.
...
Change-Id: Ic64e00476132dbf4644de5c465e06fe11a264508
2010-10-21 23:43:22 -05:00