35111 Commits

Author SHA1 Message Date
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
Kenny Root
0c4b1a8292 Merge "Reorganize PackageManager dump to avoid NPE" 2010-10-22 12:21:16 -07:00
Kenny Root
faf53c0bf2 am 40763914: Merge "Exit immediately on some linklib failures" into gingerbread 2010-10-22 12:18:46 -07:00
Kenny Root
40763914e3 Merge "Exit immediately on some linklib failures" into gingerbread 2010-10-22 12:17:02 -07:00
Justin Ho
02482e205a am 0b01eb26: Merge "DO NOT MERGE - Re-adding missing status_bar_close_on.9 for mdpi emulator" into gingerbread 2010-10-22 12:15:36 -07:00
Justin Ho
0b01eb266f Merge "DO NOT MERGE - Re-adding missing status_bar_close_on.9 for mdpi emulator" into gingerbread 2010-10-22 12:14:26 -07:00
Dianne Hackborn
4f734cabd0 am 7ce276b5: Merge "Update script for copying NDK headers/library." into gingerbread 2010-10-22 12:11:33 -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
Justin Ho
3162a3cee0 DO NOT MERGE - Re-adding missing status_bar_close_on.9 for mdpi emulator
Change-Id: Ia855f0461a984974e3f54d8f8f5fe146ff330c4f
2010-10-22 11:55:58 -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
Romain Guy
e1627c9d0e Merge "Don't use two different variables to refer to mSnapshot." 2010-10-22 11:33:53 -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
Romain Guy
58ae6db4ff Don't use two different variables to refer to mSnapshot.
Change-Id: Ie4a0616d2fe0b040ac14b734a9ddf77bf1f35b0c
2010-10-22 11:16:37 -07:00
Daniel Sandler
dca9cd6dd0 Merge "Refinements to the notification icon area." 2010-10-22 11:15:04 -07:00
Daniel Sandler
271ea12dc2 Refinements to the notification icon area.
- New icon states per revised UX designs.
 - Basic implementation of do-not-disturb mode.
 - Removed unused grippies.

Change-Id: I506dcdc8ceb855902f2401e3145c3c676c0de207
2010-10-22 14:06:10 -04:00
Dianne Hackborn
7ce276b5a3 Merge "Update script for copying NDK headers/library." into gingerbread 2010-10-22 10:58:35 -07:00