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

11582 Commits

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
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
Shimeng (Simon) Wang
7940e8472b Merge "Fix the initial reflow width when switch between basic pages." 2010-06-30 18:03:53 -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
Romain Guy
68e9a49aeb Merge "Add hooks for drawBitmap()." 2010-06-30 15:50:05 -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
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
Michael Kolb
d62775b375 Merge "user agent string change: remove "Mobile" for large screen configuration" 2010-06-30 15:40:33 -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
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
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
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
Christopher Tate
c27181c7f3 Remove memory monitoring from the system watchdog 
This was originally written as an in-case-we-need-it facility, but was
never actually used in production.  It also soaked up a surprising amount
of cpu on occasion, as well as doing sketchy things like demoting the
system_server's primary looper thread to the background cgroup at times.

Change-Id: I9a81a8d1e9caea9e0a1277d97785fe96add438d7
 2010-06-30 14:53:39 -07:00
Michael Kolb
a172e7d0d9 user agent string change: remove "Mobile" for large screen configuration 
bug: http://b/issue?id=2778676

Change-Id: I268d8c0f8834bdbd099d59fdbc462da26234241a
 2010-06-30 14:50:02 -07:00
Chet Haase
17fb4b0d1c Initial checkin of new animation system. package, APIs, functionality all subject to change. package is hidden for now. 
Change-Id: Ieca54cd1f09c171abb5adc6419ff337083f586be
 2010-06-30 14:49:13 -07:00
Mike Lockwood
98ef64e4a8 MTP: Add MtpServer Java class to wrap MTP device support. 
Change-Id: I818c2d3b3f52ad5bb515acc4d3288b2b43e11908
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-06-30 17:02:07 -04:00
Daniel Sandler
294c9fb899 Improved graphics for the intruder alert. 
Change-Id: I9aa6c8995da39f332b724fabe67ed5efe584552f
 2010-06-30 15:32:26 -04:00
Doug Zongker
24c737ccdd 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
Dianne Hackborn
3c80a4a044 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
08968fa59e 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
Dan Egnor
7fc93c36ae Verify hostname where possible, and clarify where not. 
Bug: 2807409
Change-Id: I6f6a6b22a48149d9f1f45ff8f53103b25706ecc0
 2010-06-29 19:19:10 -07:00
Adam Powell
0e94b5151d Add subtitles for action bars and context modes. 
Fix an issue where context mode content was cleared before animating out.

Change-Id: Ie7a065e65bc18e3da32de07543d0f71d2a2d648c
 2010-06-29 19:00:15 -07:00
Adam Powell
9f0fda8430 Merge "Added context modes to ActionBar API." 2010-06-29 14:37:41 -07:00
Adam Powell
89e0645b41 Added context modes to ActionBar API. 
Change-Id: I7c3e782cbf01be7bc671b377fb4d706040888833
 2010-06-29 14:04:58 -07:00
Dianne Hackborn
639061d9c2 am b5f05d00: am 0934fbb6: Merge "Update native activity & event APIs to follow correct conventions." into gingerbread 
Merge commit 'b5f05d0018d72531e40c2afadfee90e9bc0c8893'

* commit 'b5f05d0018d72531e40c2afadfee90e9bc0c8893':
  Update native activity & event APIs to follow correct conventions.
 2010-06-29 12:21:16 -07:00
Dianne Hackborn
b5f05d0018 am 0934fbb6: Merge "Update native activity & event APIs to follow correct conventions." into gingerbread 
Merge commit '0934fbb6b81006fdf6a76b6519201d2f472a1908' into gingerbread-plus-aosp

* commit '0934fbb6b81006fdf6a76b6519201d2f472a1908':
  Update native activity & event APIs to follow correct conventions.
 2010-06-29 12:18:58 -07:00
Dianne Hackborn
0934fbb6b8 Merge "Update native activity & event APIs to follow correct conventions." into gingerbread 2010-06-29 12:17:20 -07:00
Xia Wang
2c8b142708 am 591908fd: am 120a58fb: Extend unit test framework for Wifi soft AP configuration Add test case: testApSsidWithAlphabet 
Merge commit '591908fd3fd1a84303bbc76c5c44d5cb0ee0bc94'

* commit '591908fd3fd1a84303bbc76c5c44d5cb0ee0bc94':
  Extend unit test framework for Wifi soft AP configuration
 2010-06-29 11:34:18 -07:00
Xia Wang
591908fd3f am 120a58fb: Extend unit test framework for Wifi soft AP configuration Add test case: testApSsidWithAlphabet 
Merge commit '120a58fb80ec9ba5b62e4b7453ea45703d1ce58a' into gingerbread-plus-aosp

* commit '120a58fb80ec9ba5b62e4b7453ea45703d1ce58a':
  Extend unit test framework for Wifi soft AP configuration
 2010-06-29 11:32:09 -07:00
Xia Wang
120a58fb80 Extend unit test framework for Wifi soft AP configuration 
Add test case: testApSsidWithAlphabet

Change-Id: Ie188f241d15603015d264a7d568ed44ce4ca3ad8
 2010-06-29 11:23:34 -07:00
Ben Murdoch
6312de2a9a 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.

Requires an external/webkit change.

b/2766917

Change-Id: I7aae1b097f866e3d1c6c6a7a31a55bb12ff6a441
 2010-06-29 19:20:53 +01:00
Mike Lockwood
dad497e598 am 0d929d7f: am 059f009d: Make android.hardware.action.USB_STATE a protected broadcast. 
Merge commit '0d929d7f094f2ea743c9ce2e17d5e40780cfe757'

* commit '0d929d7f094f2ea743c9ce2e17d5e40780cfe757':
  Make android.hardware.action.USB_STATE a protected broadcast.
 2010-06-29 11:10:33 -07:00
Joe Onorato
c5c2f5b5e5 resolved conflicts for merge of 32b739b6 to master 
Change-Id: I5a1791d12ca57ee682e46ade7d24b21e9f59aff2
 2010-06-29 13:57:19 -04:00
Dianne Hackborn
2e9f93e8db Update native activity & event APIs to follow correct conventions. 
Change-Id: Ie64fb3a9c68bc9c117fa5621b75d1f609e304e0e
 2010-06-29 10:43:54 -07:00
Joe Onorato
6443de56f3 resolved conflicts for merge of 7f9ede96 to master 
Change-Id: Iaa688e5f7adaa363c88e0824b44233c8906e9e26
 2010-06-29 12:58:39 -04:00
Mike Lockwood
0d929d7f09 am 059f009d: Make android.hardware.action.USB_STATE a protected broadcast. 
Merge commit '059f009d970fb37ac4e408dcf8e1d2d2cdcf0a84' into gingerbread-plus-aosp

* commit '059f009d970fb37ac4e408dcf8e1d2d2cdcf0a84':
  Make android.hardware.action.USB_STATE a protected broadcast.
 2010-06-29 09:17:36 -07:00
Mike Lockwood
059f009d97 Make android.hardware.action.USB_STATE a protected broadcast. 
Change-Id: I84160e9342025228c1f810077f5aa25f5cc83023
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-06-29 12:12:04 -04:00
Joe Onorato
32b739b61e am 1c95ecb4: recombine StatusBarService and PhoneStatusBarService 
Merge commit '1c95ecb47a19e18d0c51f3fd2931d13e9bd845b9' into gingerbread-plus-aosp

* commit '1c95ecb47a19e18d0c51f3fd2931d13e9bd845b9':
  recombine StatusBarService and PhoneStatusBarService
 2010-06-29 08:04:13 -07:00