Eric Fischer
d3f5bf5aac
am ecae6e06: Merge "Import translations for status bar." into gingerbread
...
Merge commit 'ecae6e06a3bed9b6ab108629e4180fe55f4726ed' into gingerbread-plus-aosp
* commit 'ecae6e06a3bed9b6ab108629e4180fe55f4726ed':
Import translations for status bar.
2010-10-22 18:21:14 -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
Eric Laurent
cc02ac54ac
Fix issue 3126094.
...
android_media_Visualizer.cpp:
Delete local reference to jArray in captureCallback() in
the case of waveform capture.
Change-Id: Ia822ab6d9945fff93605f7732e56120c19fd42a5
2010-10-22 18:08:13 -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
Romain Guy
ae88e5e8e9
Fix rendering issue with layers.
...
A change was made earlier in the renderer to not snap the current clip rect
on every clip operation. The clip rect must not be snapped to pixel boundaries
before being used for pixel precision operations. Some operations were doing
this correctly, others were not. For instance, a layer was always created by
rounding to the correct pixels, but composing a layer was done with a non
rounded clip, thus resulting in slightly odd behaviors.
Change-Id: I31c2cf0a343450470bcd449c3f13fe37648b9c7c
2010-10-22 17:49:18 -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 Fischer
ecae6e06a3
Merge "Import translations for status bar." into gingerbread
2010-10-22 17:14:36 -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 Fischer
4aa82a7b7a
Import translations for status bar.
...
Change-Id: I5f40e9c507530fb4110da711e54465c2ae920a94
2010-10-22 16:49:14 -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
70e4c0f1b6
am d13f5f4f: (-s ours) am 67496e59: Merge "Import revised translations. DO NOT MERGE" into gingerbread
2010-10-22 16:10:25 -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
Xavier Ducrohet
a6ca66af0c
Merge "Layoutlib_Create: Fix order of class adapters."
2010-10-22 15:42:40 -07:00
Xavier Ducrohet
c08e175f14
Merge "Layoutlib_create: fix binary name of delegate methods."
2010-10-22 15:42:26 -07:00
Raphael
e2e8ba904b
Layoutlib_Create: Fix order of class adapters.
...
The Transform adapter was running last, instead of
running on the output of the Delegate adapter.
Change-Id: I2cd777add7b0972c6bb197aaac6693d39dd5a103
2010-10-22 15:29:04 -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
Leon Scroggins
fd2d50e82b
Provide strings for text selection options in WebView.
...
Bug:3125023
This is consistent with TextView.
Change-Id: Ia9216939f2fe0c73f9dd670c3884518e730f43ed
2010-10-22 18:00:52 -04: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
James Dong
2351e69a13
Merge "OMX extension to support storing meta data in video input buffers during recording"
2010-10-22 14:07:41 -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
Xavier Ducrohet
2191b4b22f
Merge "Remove dependency on ASM util classes."
2010-10-22 14:03:07 -07:00
Dianne Hackborn
38993d8d83
Merge "Fix issue #3122240 : Expose xlarge in GB." into gingerbread
2010-10-22 14:01:25 -07:00
Raphael
280372e2c7
Layoutlib_create: fix binary name of delegate methods.
...
Change-Id: Iebd7d730b23e12f770e6ecadafb2f5c3459958db
2010-10-22 13:58:31 -07:00
Xavier Ducrohet
ee9642c2ba
am 2051a1be: am c5371fad: Merge "Make layoutlib use the prebuilt of layoutlib_api"
2010-10-22 13:41:08 -07:00
Xavier Ducrohet
2051a1be52
am c5371fad: Merge "Make layoutlib use the prebuilt of layoutlib_api"
2010-10-22 13:38:58 -07:00
Raphael
d556d8ba36
Remove dependency on ASM util classes.
...
Change-Id: I975b103f8c207e727699e4135170755f6ba2a084
2010-10-22 13:33:50 -07:00
Xavier Ducrohet
c5371fadf2
Merge "Make layoutlib use the prebuilt of layoutlib_api"
2010-10-22 13:28:39 -07:00
Daniel Sandler
cf3c7cf3c9
Avoid graphics deadlock in DND mode.
...
(Workaround for bug 3031039; will fix by moving to new-style
animations)
Change-Id: I4fd65ac6f3266686eaa809dc1e7dfe46c7d59cd0
2010-10-22 16:04:37 -04: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
Kenny Root
95fb8396ca
am faf53c0b: am 40763914: Merge "Exit immediately on some linklib failures" into gingerbread
2010-10-22 12:31:26 -07:00
Justin Ho
22c4b8958d
am 02482e20: (-s ours) am 0b01eb26: Merge "DO NOT MERGE - Re-adding missing status_bar_close_on.9 for mdpi emulator" into gingerbread
2010-10-22 12:31:22 -07:00
Dianne Hackborn
8fff4bff4d
am 4f734cab: am 7ce276b5: Merge "Update script for copying NDK headers/library." into gingerbread
2010-10-22 12:31:09 -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