Commit Graph

17769 Commits

Author SHA1 Message Date
Mike Lockwood
63103848cd Merge "Try to fix the simulator build." 2010-06-30 19:23:42 -07:00
Romain Guy
fb338da840 Merge "Add implementation for drawBitmap(Bitmap, Rect, Rect, Paint)" 2010-06-30 19:23:08 -07:00
Shimeng (Simon) Wang
0979fa2ef2 Merge "Fix the initial reflow width when switch between basic pages." 2010-06-30 18:03:53 -07:00
Romain Guy
3d23c4e988 Merge "Add implementation for drawBitmap()." 2010-06-30 17:58:12 -07:00
Adam Powell
dc8e84d972 Merge "Define measuring behavior for action bar/context mode custom views" 2010-06-30 17:16:29 -07:00
Alex Sakhartchouk
c852735c95 Merge "Fixing freetype init/uninit code. Removing debug output from stream." 2010-06-30 16:56:10 -07:00
Dianne Hackborn
ed2b843c91 am 177c405a: am c6e1d880: Merge "Introduce official public NativeWindow type." into gingerbread
Merge commit '177c405a242e811b1010bd8382b5807ab8df31a8'

* commit '177c405a242e811b1010bd8382b5807ab8df31a8':
  Introduce official public NativeWindow type.
2010-06-30 16:11:21 -07:00
Dianne Hackborn
d729836ff8 am c6e1d880: Merge "Introduce official public NativeWindow type." into gingerbread
Merge commit 'c6e1d88022db800773401c16803e1ab27fd01a7e' into gingerbread-plus-aosp

* commit 'c6e1d88022db800773401c16803e1ab27fd01a7e':
  Introduce official public NativeWindow type.
2010-06-30 16:08:24 -07:00
Romain Guy
cf2b4e79ff Merge "Remove unnecessary return and add bitmap generation ID tracking." 2010-06-30 16:07:09 -07:00
Mathias Agopian
41360867a3 am e341a0b5: am 30fe6fa0: Merge "fix live wallpapers on Droid" into gingerbread
Merge commit 'e341a0b5e9a1e30a020970a69c58c34f902ea06f'

* commit 'e341a0b5e9a1e30a020970a69c58c34f902ea06f':
  fix live wallpapers on Droid
2010-06-30 16:05:37 -07:00
Dianne Hackborn
e12e3d7692 Merge "Introduce official public NativeWindow type." into gingerbread 2010-06-30 16:05:30 -07:00
The Android Open Source Project
b6a7df812c am c511d4f8: merge from open-source master
Merge commit 'c511d4f84cd2f71df610286e9373ca0fe38b1353'

* commit 'c511d4f84cd2f71df610286e9373ca0fe38b1353':
2010-06-30 16:02:45 -07:00
Mathias Agopian
aca61c7eb2 am 30fe6fa0: Merge "fix live wallpapers on Droid" into gingerbread
Merge commit '30fe6fa07a9b9c6e7498198608125add8eb40744' into gingerbread-plus-aosp

* commit '30fe6fa07a9b9c6e7498198608125add8eb40744':
  fix live wallpapers on Droid
2010-06-30 16:01:33 -07:00
The Android Open Source Project
743aa84b28 merge from open-source master
Change-Id: I99a88f61bc0f3ddcc233b6784e24427a7f8978be
2010-06-30 15:59:42 -07:00
Mathias Agopian
05dedd17ec Merge "fix live wallpapers on Droid" into gingerbread 2010-06-30 15:59:02 -07:00
Romain Guy
cee2e682cd Merge "Add hooks for drawBitmap()." 2010-06-30 15:50:05 -07:00
Jeff Brown
ac18906a2e am 0c2df984: am d8ae2885: Merge "Fix injection of specially intercepted keys like HOME." into gingerbread
Merge commit '0c2df98425c8fa4ce092eebea80ae197547f6a86'

* commit '0c2df98425c8fa4ce092eebea80ae197547f6a86':
  Fix injection of specially intercepted keys like HOME.
2010-06-30 15:48:50 -07:00
Christopher Tate
b07600128e am 705a2df9: am c8525edc: Merge "Remove memory monitoring from the system watchdog" into gingerbread
Merge commit '705a2df97c51c3e31ed36831a4302d705e0532b2'

* commit '705a2df97c51c3e31ed36831a4302d705e0532b2':
  Remove memory monitoring from the system watchdog
2010-06-30 15:48:46 -07:00
Daniel Sandler
2abb80ca63 am 9b4b74be: am 294c9fb8: Improved graphics for the intruder alert.
Merge commit '9b4b74becf0e99b0a9090758d6337c6615cff1d1'

* commit '9b4b74becf0e99b0a9090758d6337c6615cff1d1':
  Improved graphics for the intruder alert.
2010-06-30 15:48:41 -07:00
Andreas Huber
e8a6b1586d am 86405cbd: am caad0a5c: Merge "Support for vanilla YUV420sp => RGB565 color conversion." into gingerbread
Merge commit '86405cbd53f43529898000112bc9346c21569d26'

* commit '86405cbd53f43529898000112bc9346c21569d26':
  Support for vanilla YUV420sp => RGB565 color conversion.
2010-06-30 15:48:37 -07:00
Doug Zongker
b59dfc3c5e am 6db0ef09: am 24c737cc: am d581484e: Merge "Verify hostname where possible, and clarify where not." into froyo
Merge commit '6db0ef09c4a8b7c1842fc08d37c62692f4f91ebb'

* commit '6db0ef09c4a8b7c1842fc08d37c62692f4f91ebb':
  Verify hostname where possible, and clarify where not.
2010-06-30 15:48:33 -07:00
Dianne Hackborn
cbef8b45c8 Merge "resolved conflicts for merge of 7f6c6e8f to master" 2010-06-30 15:46:29 -07:00
Dianne Hackborn
b2007c4b89 resolved conflicts for merge of 7f6c6e8f to master
Change-Id: Id9dddb78c51f16ff8c4b60339421c94fde506db2
2010-06-30 15:44:58 -07:00
Mathias Agopian
a8f3e4e53c fix live wallpapers on Droid
On omap3 h/w we force opaque formats to RGB_565 instead of RGBX_8888
because the GL driver doesn't support it. RGBX_8888 is always remapped
to RGBA_8888.

Change-Id: I0bfabeb98c8d3a399079e6797cf2a0ee95915324
2010-06-30 15:43:47 -07:00
Michael Kolb
b67720a88e Merge "user agent string change: remove "Mobile" for large screen configuration" 2010-06-30 15:40:33 -07:00
Scott Main
02d9133447 am b2d1a71b: am 92dbad8a: am b4d2e42a: docs: revise menu guide to focus more on using menu resources instead of defining menus in code. And revise some style.
Merge commit 'b2d1a71bcc7d40f2a6ca06ddcc92e3cd2a135d1e'

* commit 'b2d1a71bcc7d40f2a6ca06ddcc92e3cd2a135d1e':
  docs: revise menu guide to focus more on using menu resources
2010-06-30 15:36:02 -07:00
Jeff Brown
2427ff8529 am d8ae2885: Merge "Fix injection of specially intercepted keys like HOME." into gingerbread
Merge commit 'd8ae28854e1ed9bd90d7407f94c2e5ed9028b712' into gingerbread-plus-aosp

* commit 'd8ae28854e1ed9bd90d7407f94c2e5ed9028b712':
  Fix injection of specially intercepted keys like HOME.
2010-06-30 15:33:41 -07:00
Christopher Tate
13eb402508 am c8525edc: Merge "Remove memory monitoring from the system watchdog" into gingerbread
Merge commit 'c8525edcba58cba7ce17ef72bc64fc3439943c08' into gingerbread-plus-aosp

* commit 'c8525edcba58cba7ce17ef72bc64fc3439943c08':
  Remove memory monitoring from the system watchdog
2010-06-30 15:33:35 -07:00
Daniel Sandler
513c0e9795 am 294c9fb8: Improved graphics for the intruder alert.
Merge commit '294c9fb8990ded73be52a3c1bfddbe1cebcd8b8e' into gingerbread-plus-aosp

* commit '294c9fb8990ded73be52a3c1bfddbe1cebcd8b8e':
  Improved graphics for the intruder alert.
2010-06-30 15:33:25 -07:00
Andreas Huber
420a4be1ec am caad0a5c: Merge "Support for vanilla YUV420sp => RGB565 color conversion." into gingerbread
Merge commit 'caad0a5c6318678902402362df1791d286636344' into gingerbread-plus-aosp

* commit 'caad0a5c6318678902402362df1791d286636344':
  Support for vanilla YUV420sp => RGB565 color conversion.
2010-06-30 15:33:09 -07:00
Doug Zongker
b8df3c8b5e am 24c737cc: am d581484e: Merge "Verify hostname where possible, and clarify where not." into froyo
Merge commit '24c737ccdd64475178d53677f90a300fcfbab79f' into gingerbread-plus-aosp

* commit '24c737ccdd64475178d53677f90a300fcfbab79f':
  Verify hostname where possible, and clarify where not.
2010-06-30 15:33:04 -07:00
Dianne Hackborn
590d4124ba am 3c80a4a0: Implement default key handling for native code.
Merge commit '3c80a4a044865bdf1289c7896baffa1c082d835c' into gingerbread-plus-aosp

* commit '3c80a4a044865bdf1289c7896baffa1c082d835c':
  Implement default key handling for native code.
2010-06-30 15:32:54 -07:00
Scott Main
53c82444ef am 92dbad8a: am b4d2e42a: docs: revise menu guide to focus more on using menu resources instead of defining menus in code. And revise some style.
Merge commit '92dbad8ab0c8e242c4c3e52c339ed3296ae7901c' into gingerbread-plus-aosp

* commit '92dbad8ab0c8e242c4c3e52c339ed3296ae7901c':
  docs: revise menu guide to focus more on using menu resources
2010-06-30 15:32:28 -07:00
Dianne Hackborn
4b5e91e482 Introduce official public NativeWindow type.
Not yet hooked up to anything in the NDK, but requires renaming
the existing android_native_window_t type everywhere.

Change-Id: Iffee6ea39c93b8b34e20fb69e4d2c7c837e5ea2e
2010-06-30 15:32:04 -07:00
Chet Haase
970e9bbf4a Merge "Initial checkin of new animation system. package, APIs, functionality all subject to change. package is hidden for now." 2010-06-30 15:27:33 -07:00
Jeff Brown
3813eebfa8 Merge "Fix injection of specially intercepted keys like HOME." into gingerbread 2010-06-30 15:03:04 -07:00
Christopher Tate
2b682a853e Merge "Remove memory monitoring from the system watchdog" into gingerbread 2010-06-30 14:55:44 -07:00
Jeff Brown
c393eb6cf5 Fix injection of specially intercepted keys like HOME.
This change mainly unwinds a premature optimization in the
dispatch pipeline.
To test HOME injection, run 'adb shell input keyevent 3'.

Change-Id: I1c4b7377c205da7c898014b8b07fc6dc1d46e4dd
2010-06-30 14:41:59 -07:00
Andreas Huber
8154265bf1 Merge "Support for vanilla YUV420sp => RGB565 color conversion." into gingerbread 2010-06-30 11:32:31 -07:00
Doug Zongker
0b2274607d am d581484e: Merge "Verify hostname where possible, and clarify where not." into froyo
Merge commit 'd581484ef8fac80c15ebf652e66f918374df5109' into gingerbread

* commit 'd581484ef8fac80c15ebf652e66f918374df5109':
  Verify hostname where possible, and clarify where not.
2010-06-30 11:17:00 -07:00
Doug Zongker
a71f3aff40 Merge "Verify hostname where possible, and clarify where not." into froyo 2010-06-30 11:12:19 -07:00
Mike Lockwood
7ac978cc51 Merge "MTP: replace printfs with logcat" 2010-06-30 11:03:41 -07:00
Brian Carlstrom
8bc6bfd081 Merge "frameworks/base updates to track merge from dalvik-dev - frameworks and CoreTests modules now depend on bouncycastle - update preloades classes for NativeBN package change - moved CryptoTest to libcore - updated api" 2010-06-30 10:55:07 -07:00
Dianne Hackborn
189ed23c10 Implement default key handling for native code.
The native code now maintains a list of all keys that may use
default handling.  If the app finishes one of these keys
without handling it, the key will be passed back off to Java
for default treatment.

Change-Id: I6a842a0d728eeafa4de7142fae573f8c11099e18
2010-06-30 10:49:40 -07:00
Ben Murdoch
f7d62f4eb7 Merge "Receive notification from native webcore that the page being viewed has marked itself as being an installable web app. Default implementation in the WebChromeClient does nothing." 2010-06-30 10:35:08 -07:00
Scott Main
42e7c9734b am b4d2e42a: docs: revise menu guide to focus more on using menu resources instead of defining menus in code. And revise some style.
Merge commit 'b4d2e42a8508a09f944b13f27c043952eef6c1cc' into gingerbread

* commit 'b4d2e42a8508a09f944b13f27c043952eef6c1cc':
  docs: revise menu guide to focus more on using menu resources
2010-06-30 09:01:01 -07:00
Mike Lockwood
671ec12cf8 am 2a28f4b4: am 5b8364a9: GPS: stifle some logging
Merge commit '2a28f4b40c36ab3a8a80467eb5781ae6e5811369'

* commit '2a28f4b40c36ab3a8a80467eb5781ae6e5811369':
  GPS: stifle some logging
2010-06-30 07:07:06 -07:00
Mike Lockwood
f769116c30 am 5b8364a9: GPS: stifle some logging
Merge commit '5b8364a929e26b30d55de9d330e1cb9a11df6208' into gingerbread-plus-aosp

* commit '5b8364a929e26b30d55de9d330e1cb9a11df6208':
  GPS: stifle some logging
2010-06-30 07:04:28 -07:00
James Dong
b4699a53aa am 42dd9908: am f7679a04: Merge "Added encoding parameters set up for H263 video encoder" into gingerbread
Merge commit '42dd99084d0069ccd90f0305ce374fd943a09de7'

* commit '42dd99084d0069ccd90f0305ce374fd943a09de7':
  Added encoding parameters set up for H263 video encoder
2010-06-29 17:30:42 -07:00
James Dong
36418af6e1 am f7679a04: Merge "Added encoding parameters set up for H263 video encoder" into gingerbread
Merge commit 'f7679a0493d59da8c759a6be639be5110c50fb98' into gingerbread-plus-aosp

* commit 'f7679a0493d59da8c759a6be639be5110c50fb98':
  Added encoding parameters set up for H263 video encoder
2010-06-29 17:27:29 -07:00