Commit Graph

23976 Commits

Author SHA1 Message Date
Mathias Agopian
ce51b99b82 am b20c2e7c: am 477c4fee: Merge "[3163098] Fix bug in angleChange funtion which caused the returned angle change to be zeroall the time. The fix is to use PrevR instead of computing the difference between R and R." into gingerbread
* commit 'b20c2e7ca03f5ef2694b20ff9a7a10a7249eb936':
  [3163098] Fix bug in angleChange funtion which caused the returned angle change to be zeroall the time. The fix is to use PrevR instead of computing the difference between R and R.
2010-11-04 10:29:09 -07:00
Hiroshi Lockheimer
8515b9cbab am 0ce42c9d: (-s ours) am c181a082: Merge "Support rotation in media recorder" into gingerbread
* commit '0ce42c9d315ea6bf0e4f81b14b9e1a38f8979897':
  Support rotation in media recorder
2010-11-04 10:29:05 -07:00
Gilles Debunne
ae64e5ba14 Merge "Tapping on paste popup with an empty clipboard does not crash in TextView." 2010-11-04 10:13:00 -07:00
Gilles Debunne
9aaa36b5c6 am 67e1ae5b: am 698dd812: Merge "ldpi assets created from hdpi in core." into gingerbread
* commit '67e1ae5b96bc3be5f9fc57350dada06194eb7f68':
  ldpi assets created from hdpi in core.
2010-11-04 09:57:14 -07:00
Hiroshi Lockheimer
fb2be98105 am 5f5bcf50: am e0887cc7: Merge "Squash ANRs in UsbStorageActivity." into gingerbread
* commit '5f5bcf5039774050eec587dcc31905bd5a370b7b':
  Squash ANRs in UsbStorageActivity.
2010-11-04 09:56:57 -07:00
Jason Chen
d5a56c520c resolved conflicts for merge of f0452c25 to master
Change-Id: Ie8f5e81393ac965fd570f99239ab8be8ea0db00c
2010-11-04 09:29:55 -07:00
Scott Main
1096ee3f44 am d9bb6bc2: am 08810efc: docs: provide overview of the web apps docs and revise images in the targeting doc
* commit 'd9bb6bc283b3f7ee75da14c42c8a563214103c05':
  docs: provide overview of the web apps docs and revise images in the targeting doc
2010-11-04 07:20:33 -07:00
satok
0af8273221 Merge "Find the most applicable subtype when there is no selected subtype but IME has subtypes" 2010-11-03 23:09:46 -07:00
Jason Sams
b98625164e Merge "Update ScriptC constructor to remove depricated param." 2010-11-03 23:03:06 -07:00
Chet Haase
33c5844ab5 Merge "Fixed problem with setting updated values on existing animators" 2010-11-03 22:42:02 -07:00
Wink Saville
81cdad9bf7 Merge "Allow DataConnectionTrackers to manage multiple data connections." 2010-11-03 21:58:20 -07:00
Justin Ho
2158186d45 am ade230ed: (-s ours) am 112b5b1f: Merge "DO NOT MERGE - Updated VPNServices stat_sys icons" into gingerbread
* commit 'ade230ed99097a09584a793ce720cc869c9ffeb4':
  DO NOT MERGE - Updated VPNServices stat_sys icons
2010-11-03 20:11:28 -07:00
Jeff Hamilton
8b4c5042a7 am 1212d4fd: am ef569469: Merge "Remove the My Tag feature." into gingerbread
* commit '1212d4fdc9bdc09c2c4c4d676b0918172eb09380':
  Remove the My Tag feature.
2010-11-03 20:11:23 -07:00
Romain Guy
fb5e7c8b79 Merge "Fix rendering bug with saveLayerAlpha/drawColor." 2010-11-03 20:03:42 -07:00
Mathias Agopian
55cdadc0a2 am 477c4fee: Merge "[3163098] Fix bug in angleChange funtion which caused the returned angle change to be zeroall the time. The fix is to use PrevR instead of computing the difference between R and R." into gingerbread
* commit '477c4feee2f0922dbc8952639cc12987d5cdce04':
  [3163098] Fix bug in angleChange funtion which caused the returned angle change to be zeroall the time. The fix is to use PrevR instead of computing the difference between R and R.
2010-11-03 17:59:47 -07:00
Hiroshi Lockheimer
284f432b75 am c181a082: Merge "Support rotation in media recorder" into gingerbread
* commit 'c181a08209dc85c80e4da5d20cd3980998def40d':
  Support rotation in media recorder
2010-11-03 17:59:43 -07:00
Mathias Agopian
61ee1a86df Merge "[3163098] Fix bug in angleChange funtion which caused the returned angle change to be zeroall the time. The fix is to use PrevR instead of computing the difference between R and R." into gingerbread 2010-11-03 17:57:32 -07:00
Hiroshi Lockheimer
2c08def60c Merge "Support rotation in media recorder" into gingerbread 2010-11-03 17:57:28 -07:00
Gilles Debunne
17cf27a872 am 698dd812: Merge "ldpi assets created from hdpi in core." into gingerbread
* commit '698dd8127636fcf57c56dcc90688fb5e8afb8abb':
  ldpi assets created from hdpi in core.
2010-11-03 17:38:50 -07:00
Gilles Debunne
7b9085d53b Merge "ldpi assets created from hdpi in core." into gingerbread 2010-11-03 17:37:28 -07:00
Hiroshi Lockheimer
57548f0cb3 am e0887cc7: Merge "Squash ANRs in UsbStorageActivity." into gingerbread
* commit 'e0887cc7febe2a03f1685e4aa3cb131c455d8cd0':
  Squash ANRs in UsbStorageActivity.
2010-11-03 17:10:33 -07:00
Hiroshi Lockheimer
e51cdee3eb Merge "Squash ANRs in UsbStorageActivity." into gingerbread 2010-11-03 17:08:03 -07:00
Dmitry Shmidt
b606fa90f1 Merge "bugreport: Fix dump of netcfg command" 2010-11-03 17:06:29 -07:00
Robert Greenwalt
85c4ddd6db Merge "Add some network/phone type constants." 2010-11-03 17:05:24 -07:00
Romain Guy
8d83ad9542 Merge "Fix rendering issue with layers." 2010-11-03 16:23:41 -07:00
Alexander Lucas
2b7865c81d am 6f4a084e: Merge "Added SIP Demo" into gingerbread
* commit '6f4a084e33c917b7e04309a4296404aef7325fca':
  Added SIP Demo
2010-11-03 15:35:29 -07:00
Alexander Lucas
211a28eaae Merge "Added SIP Demo" into gingerbread 2010-11-03 15:32:57 -07:00
Scott Main
4cb81c01b2 am 08810efc: docs: provide overview of the web apps docs and revise images in the targeting doc
* commit '08810efc1a1868261fb042355f75ab049438b6e3':
  docs: provide overview of the web apps docs and revise images in the targeting doc
2010-11-03 15:18:10 -07:00
Jaikumar Ganesh
18765af648 Merge "Add STATE_AUDIO_CONNECTING state." 2010-11-03 14:58:00 -07:00
Andreas Huber
7ccd10dde8 Merge "Experimentally reenable mpeg4 and h.263 hardware decoders." 2010-11-03 14:40:27 -07:00
Shimeng (Simon) Wang
527970679d Merge "Prevent 0 content width." 2010-11-03 14:33:28 -07:00
Jason Sams
44254951ea Merge "RS Error cleanup. Thow java exception during init if the GL driver fails rather than native crash." 2010-11-03 14:29:16 -07:00
Bryan Mawhinney
ec8d299a0b Merge "Avoid copying byte arrays when just decoding bounds." 2010-11-03 14:05:54 -07:00
Justin Ho
82d5353f73 am 112b5b1f: Merge "DO NOT MERGE - Updated VPNServices stat_sys icons" into gingerbread
* commit '112b5b1f304846a1f6999a8347f45dae43719b8f':
  DO NOT MERGE - Updated VPNServices stat_sys icons
2010-11-03 13:43:09 -07:00
Justin Ho
87933f223c Merge "DO NOT MERGE - Updated VPNServices stat_sys icons" into gingerbread 2010-11-03 13:39:26 -07:00
Jeff Hamilton
ab29443cd4 am ef569469: Merge "Remove the My Tag feature." into gingerbread
* commit 'ef5694692f88bb91ed6ee1191b11a66ec594ff39':
  Remove the My Tag feature.
2010-11-03 13:37:22 -07:00
Jeff Hamilton
8de195a531 Merge "Remove the My Tag feature." into gingerbread 2010-11-03 13:34:39 -07:00
Xavier Ducrohet
080c4462f7 Merge "Layoutlib native delegate: primitive shapes and shaders" 2010-11-03 13:30:22 -07:00
Xavier Ducrohet
ccaa0bf614 Merge "More layout Canvas/Paint implementation." 2010-11-03 13:30:17 -07:00
Daniel Sandler
53bf8dfb5e am 9f4f20c2: am 65816a32: Merge "Fix the fix for storage ANRs." into gingerbread
* commit '9f4f20c2451325850cb81e886f1e76155e7e098d':
  Fix the fix for storage ANRs.
2010-11-03 12:42:35 -07:00
Daniel Sandler
bceacf01a5 am 65816a32: Merge "Fix the fix for storage ANRs." into gingerbread
* commit '65816a32ee2c2181895e3be636f3173a6e769f67':
  Fix the fix for storage ANRs.
2010-11-03 12:38:40 -07:00
Daniel Sandler
9fd94b9d10 Merge "Fix the fix for storage ANRs." into gingerbread 2010-11-03 12:36:31 -07:00
Irfan Sheriff
7259b1cad8 Merge "Set country code in the driver and remove channel set" 2010-11-03 12:23:01 -07:00
Gilles Debunne
3251974cda Merge "Tapping in a empty textEdit shows the handle." 2010-11-03 12:21:16 -07:00
Ben Komalo
b8b9851beb Merge "Fix issue where home layout click listener was being attached before it was initialized." 2010-11-03 12:18:40 -07:00
Adam Powell
9bd875503f Merge "Make Theme.Holo.Dialog.Alert and Theme.Holo.Light.Dialog.Alert public" 2010-11-03 12:06:44 -07:00
James Dong
ae61ee66dc am a3f5b615: (-s ours) am f3847e87: Merge "DO NOT MERGE" into gingerbread
* commit 'a3f5b615d7adc5a644cbedd55100deba562ec0ac':
  DO NOT MERGE
2010-11-03 12:02:53 -07:00
Chris Tate
76640971d1 Merge "Fix drag enter/exit reporting" 2010-11-03 12:00:56 -07:00
Dianne Hackborn
787adb0877 am 0ce0f72c: am 906b830d: Revert "UMS: Avoid SystemUI ANRs during long vold operations."
* commit '0ce0f72c1eb92cf654667c15477f19b4a7e84cd1':
  Revert "UMS: Avoid SystemUI ANRs during long vold operations."
2010-11-03 11:43:16 -07:00
Daniel Sandler
0698f89d36 am 1df8765a: am cbc3219d: Merge "UMS: Avoid SystemUI ANRs during long vold operations." into gingerbread
* commit '1df8765ac05ed83c212e899fa6c74a6cc012e7b0':
  UMS: Avoid SystemUI ANRs during long vold operations.
2010-11-03 11:43:03 -07:00