drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,148 Commits 1 Branch 0 Tags
Commit Graph

26148 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Steve Block
a378fa246f Merge "Add a class to represent the set of sensitive features of a web application" 2010-07-01 08:08:11 -07:00
Steve Block
a08491a08b Add a class to represent the set of sensitive features of a web application 
This class is used to store the set of sensitive features for which the web app
is authorised. The data for which is passed as meta data with the intent. The
data is then used to set the security policy for features such as Geolocation
which request permission through the browser chrome.

Bug: 2766920
Change-Id: I2ff259dfd3b50d39bb05fbc187d4943c448d08d6
 2010-07-01 10:37:02 +01:00
Steve Block
f96d23ae1a Merge "Pass the WebView context to the GeolocationService from WebKit" 2010-07-01 02:18:24 -07:00
Mike Lockwood
7c32c0dfb4 Merge "Try to fix the simulator build." 2010-06-30 19:23:42 -07:00
Romain Guy
c18a9f2051 Merge "Add implementation for drawBitmap(Bitmap, Rect, Rect, Paint)" 2010-06-30 19:23:08 -07:00
Romain Guy
8ba548f81d Add implementation for drawBitmap(Bitmap, Rect, Rect, Paint) 
Change-Id: I10904d2325a5431d15801aebcec1048715678e8c
 2010-06-30 19:21:21 -07:00
Mike Lockwood
0723394051 Try to fix the simulator build. 
Change-Id: I3640e9eba433e711e23af1c6182e38c86c5b60bb
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-06-30 22:19:24 -04:00
Shimeng (Simon) Wang
7940e8472b Merge "Fix the initial reflow width when switch between basic pages." 2010-06-30 18:03:53 -07:00
Romain Guy
e07f6eeb3a Merge "Add implementation for drawBitmap()." 2010-06-30 17:58:12 -07:00
Romain Guy
c1396e93b6 Add implementation for drawBitmap(). 
Change-Id: Iada9325f3c5642b61c2e0c4cd80bcfbc92cb491e
 2010-06-30 17:56:19 -07:00
Shimeng (Simon) Wang
0a4a70daba Fix the initial reflow width when switch between basic pages. 
issue: 2778976
Change-Id: Ib77c91628792258db8197459656b8f42bf787c9c
 2010-06-30 17:28:12 -07:00
Adam Powell
2ae5a4d908 Merge "Define measuring behavior for action bar/context mode custom views" 2010-06-30 17:16:29 -07:00
Adam Powell
a7db03705f Define measuring behavior for action bar/context mode custom views 
Change-Id: Idbe25c81a16005f153d5b425fb366eef4bea290f
 2010-06-30 17:08:47 -07:00
Alex Sakhartchouk
50331a1e2f Merge "Fixing freetype init/uninit code. Removing debug output from stream." 2010-06-30 16:56:10 -07:00
Alex Sakhartchouk
b6b34891fa Fixing freetype init/uninit code. 
Removing debug output from stream.

Change-Id: I401232e77cc011953e5ccc59069b22ec59958214
 2010-06-30 16:53:43 -07:00
Dianne Hackborn
efcd77407b 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
177c405a24 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
01959f6552 Merge "Remove unnecessary return and add bitmap generation ID tracking." 2010-06-30 16:07:09 -07:00
Mathias Agopian
1dc623e3b3 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
Romain Guy
fe8809471a Remove unnecessary return and add bitmap generation ID tracking. 
Change-Id: Icf5e0635e789f5ea53268c22fad51cf733b5b1a6
 2010-06-30 16:05:32 -07:00
Dianne Hackborn
c6e1d88022 Merge "Introduce official public NativeWindow type." into gingerbread 2010-06-30 16:05:30 -07:00
The Android Open Source Project
47598d51b1 am c511d4f8: merge from open-source master 
Merge commit 'c511d4f84cd2f71df610286e9373ca0fe38b1353'

* commit 'c511d4f84cd2f71df610286e9373ca0fe38b1353':
 2010-06-30 16:02:45 -07:00
Mathias Agopian
e341a0b5e9 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
c511d4f84c merge from open-source master 
Change-Id: I99a88f61bc0f3ddcc233b6784e24427a7f8978be
 2010-06-30 15:59:42 -07:00
Mathias Agopian
30fe6fa07a Merge "fix live wallpapers on Droid" into gingerbread 2010-06-30 15:59:02 -07:00
Romain Guy
364703c6fa Fix the build. 
Change-Id: I08bd6daf25351daca3ae552e1cfcfce85eefa73b
 2010-06-30 15:51:03 -07:00
Romain Guy
68e9a49aeb Merge "Add hooks for drawBitmap()." 2010-06-30 15:50:05 -07:00
Jeff Brown
5840b7c119 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
45886e6065 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
9529f2ce8a 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
7f35403a7a 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
9ae3f66f14 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
0aa646736b Merge "resolved conflicts for merge of 7f6c6e8f to master" 2010-06-30 15:46:29 -07:00
Dianne Hackborn
25a98b8e21 resolved conflicts for merge of 7f6c6e8f to master 
Change-Id: Id9dddb78c51f16ff8c4b60339421c94fde506db2
 2010-06-30 15:44:58 -07:00
Mathias Agopian
4cfb3a69d2 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
d62775b375 Merge "user agent string change: remove "Mobile" for large screen configuration" 2010-06-30 15:40:33 -07:00
Scott Main
b6643d90e6 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
0c2df98425 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
705a2df97c 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
9b4b74becf 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
86405cbd53 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
6db0ef09c4 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
7f6c6e8ffa 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
b2d1a71bcc 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
8b49bd1a2f 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
cbf42ecef2 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
Romain Guy
ce0537b800 Add hooks for drawBitmap(). 
Change-Id: I58e962c3a8b2bc75c2605fe369ad3002579d86e0

Add texture cache.

Change-Id: I1c0e5581d228869e114438258a1014e33e024ad7
 2010-06-30 15:21:01 -07:00
Jeff Brown
d8ae28854e Merge "Fix injection of specially intercepted keys like HOME." into gingerbread 2010-06-30 15:03:04 -07:00
Christopher Tate
c8525edcba Merge "Remove memory monitoring from the system watchdog" into gingerbread 2010-06-30 14:55:44 -07:00
Mike Lockwood
81ea83d108 Move MTP JNI code from libandroid_runtime to libmedia_jni 
Signed-off-by: Mike Lockwood <lockwood@android.com>

Change-Id: I0c54bbe4e6146beba7d22e782e02ded420f50dbd
 2010-06-30 17:54:10 -04:00