34841 Commits

Author SHA1 Message Date
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
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
Romain Guy
b0be86e08e Merge "Don't perform glCopyTextImage with coordinates outside the buffer." 2010-10-22 10:42:48 -07:00
Romain Guy
ae517591d9 Don't perform glCopyTextImage with coordinates outside the buffer.
Bug #3122179

Change-Id: I91ed397e9e553a8eeb69d82d0c5b1e49a3cdd5ff
2010-10-22 10:40:27 -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
Kenny Root
1174f71e94 Reorganize PackageManager dump to avoid NPE
versionCode and mVersionName were added recently but ps.pkg can be null
in some situations. Move them to where it will check before
dereferencing it.

Bug: 3121050
Change-Id: I46081f300e7a40354cb757f9eaa7ec98b9334c8b
2010-10-22 10:07:11 -07:00
Wink Saville
2f791fd868 Change dumpstate so the logs use threadtime instead of time as the default.
The threadtime option display both the pid and tid which can
assist pinpointing bugs.

Change-Id: Ib4620d3534a59b291507b757352f9fecb06f7cef
2010-10-22 09:48:19 -07:00
Joe Onorato
eb95b0877a Show app services in adb bugreport (dumpstate).
There is a 60s timeout for this command.  I'd rather do it as an individual timeout
for each of the services, but this is easier and will probably cover for busted apps
well enough.  Also, this is running last in dumpstate, so if it's lost... oh well.

Also, clean up the formatting of the service dump so it's more readable in bugreport.

Change-Id: Ibd727f4b3366f7af9e7ef1e231868f5cedc48132
2010-10-22 12:36:07 -04:00
Joe Onorato
8d0083423f Merge "Fix bug introduced in Change I856118d8." 2010-10-22 09:22:50 -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
Mike Lockwood
4c918335ef am d78c8d8b: am f6572e7e: Merge "GPS: Fix network type logic in requestRefLocation" into gingerbread
Merge commit 'd78c8d8bb9516878eb5042a28d76bd6bcf4c6780'

* commit 'd78c8d8bb9516878eb5042a28d76bd6bcf4c6780':
  GPS: Fix network type logic in requestRefLocation
2010-10-22 09:17:38 -07:00
Kenny Root
da36c84a97 am 7ba8c44e: am 8ad30b5b: Merge "Initialized check in ZipFileRO::findEntryByName" into gingerbread
Merge commit '7ba8c44ef7ba22d83a670e50314d69d0ddce1b9c'

* commit '7ba8c44ef7ba22d83a670e50314d69d0ddce1b9c':
  Initialized check in ZipFileRO::findEntryByName
2010-10-22 09:14:28 -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
Mike Lockwood
d78c8d8bb9 am f6572e7e: Merge "GPS: Fix network type logic in requestRefLocation" into gingerbread
Merge commit 'f6572e7ee413a87f5d243b3d44f798260ac1a18b' into gingerbread-plus-aosp

* commit 'f6572e7ee413a87f5d243b3d44f798260ac1a18b':
  GPS: Fix network type logic in requestRefLocation
2010-10-22 09:03:17 -07:00