Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,903 Commits 3 Branches 0 Tags
409a57504fe6bb915d85f1091267206f7e0dfdcd
Commit Graph

13726 Commits

Author SHA1 Message Date
Robert Greenwalt
a6dfa15e64 am 4e925f8a: am cab133a7: am 33eb7767: Merge "NetworkManagementService: Add interface counters & throttle API" into froyo 2010-04-01 10:36:05 -07:00
Dirk Dougherty
2d8234b73d Merge "doc change: cherry pick 75c66da209. (clarify fill_parent/match_parent transition in ViewGroup.LayoutParams and R.attr. Mention match_parent in dev guide "declaring layout" doc.)" into froyo 2010-04-01 10:35:21 -07:00
Robert Greenwalt
4e925f8afb am cab133a7: am 33eb7767: Merge "NetworkManagementService: Add interface counters & throttle API" into froyo 
Merge commit 'cab133a7fa39969f136e3f401f97f6ce843514bb' into kraken

* commit 'cab133a7fa39969f136e3f401f97f6ce843514bb':
  NetworkManagementService: Add interface counters & throttle API
 2010-04-01 10:27:04 -07:00
Robert Greenwalt
cab133a7fa am 33eb7767: Merge "NetworkManagementService: Add interface counters & throttle API" into froyo 
Merge commit '33eb7767fb49482643df80c8b5567da83aa0e49f' into froyo-plus-aosp

* commit '33eb7767fb49482643df80c8b5567da83aa0e49f':
  NetworkManagementService: Add interface counters & throttle API
 2010-04-01 10:22:51 -07:00
Robert Greenwalt
33eb7767fb Merge "NetworkManagementService: Add interface counters & throttle API" into froyo 2010-04-01 10:19:57 -07:00
Kristian Monsen
1170cbfc2d am 86a09e4d: am 4ba57a4e: am 70c22a48: Merge "Fix for bug 2558156: Encodig is null" into froyo 2010-04-01 10:07:34 -07:00
Kristian Monsen
86a09e4d76 am 4ba57a4e: am 70c22a48: Merge "Fix for bug 2558156: Encodig is null" into froyo 
Merge commit '4ba57a4e0ab56126e54d5c7137cfda1d47845578' into kraken

* commit '4ba57a4e0ab56126e54d5c7137cfda1d47845578':
  Fix for bug 2558156: Encodig is null
 2010-04-01 10:00:08 -07:00
Kristian Monsen
4ba57a4e0a am 70c22a48: Merge "Fix for bug 2558156: Encodig is null" into froyo 
Merge commit '70c22a48e605cd59c35ccbbc5eee05b5a30f0a2a' into froyo-plus-aosp

* commit '70c22a48e605cd59c35ccbbc5eee05b5a30f0a2a':
  Fix for bug 2558156: Encodig is null
 2010-04-01 09:57:12 -07:00
Kristian Monsen
70c22a48e6 Merge "Fix for bug 2558156: Encodig is null" into froyo 2010-04-01 09:54:47 -07:00
Kristian Monsen
d08127fff1 Fix for bug 2558156: Encodig is null 
This does not actually pass the test since the test has wrong expectations, but it is at least doing the right thing.

Change-Id: I7da29a3f101647bb628805514cf2bdef24864e50
 2010-04-01 17:38:07 +01:00
Dirk Dougherty
3d5f648f8f doc change: cherry pick 75c66da209. (clarify fill_parent/match_parent transition in ViewGroup.LayoutParams and R.attr. Mention match_parent in dev guide "declaring layout" doc.) 
Change-Id: I1d2b80b8dc3f8b2e3c1befcbb7c4c522d78a2db8
 2010-04-01 09:16:08 -07:00
Dirk Dougherty
75c66da209 sdk doc change: clarify fill_parent/match_parent transition in ViewGroup.LayoutParams and R.attr. Mention match_parent in dev guide "declaring layout" doc. 
Change-Id: I07f6858f78e3b48ccaa99e87d81d18bf0499bdc0
 2010-04-01 09:08:35 -07:00
Kenny Root
ab023301b0 Merge "Don't measure for a secondary caret unless we have one." 2010-04-01 09:01:45 -07:00
Ben Murdoch
6036fb37d4 am 2e646429: am bf691348: am 352cf1a4: Merge changes Ic9531e3c,I3f04433b into froyo 2010-04-01 08:53:41 -07:00
Ben Murdoch
2e646429f4 am bf691348: am 352cf1a4: Merge changes Ic9531e3c,I3f04433b into froyo 
Merge commit 'bf6913481eff68a69d1e6ba312227e2fcea29793' into kraken

* commit 'bf6913481eff68a69d1e6ba312227e2fcea29793':
  Cherry pick from master.
  Cherry pick from master.
 2010-04-01 08:47:58 -07:00
Ben Murdoch
bf6913481e am 352cf1a4: Merge changes Ic9531e3c,I3f04433b into froyo 
Merge commit '352cf1a45e26803a466d096ca2d679ea5a3ac249' into froyo-plus-aosp

* commit '352cf1a45e26803a466d096ca2d679ea5a3ac249':
  Cherry pick from master.
  Cherry pick from master.
 2010-04-01 08:44:58 -07:00
Ben Murdoch
352cf1a45e Merge changes Ic9531e3c,I3f04433b into froyo 
* changes:
  Cherry pick from master.
  Cherry pick from master.
 2010-04-01 08:42:14 -07:00
San Mehat
91cac64cd0 NetworkManagementService: Add interface counters & throttle API 
Change-Id: I4976549cdbb027ba7859335e69bf866e738961c9
Signed-off-by: San Mehat <san@google.com>
 2010-04-01 08:34:20 -07:00
Grace Kloba
433dc6a764 am 0aca8f9c: am fe72c533: am 461cef5d: Merge "As we don\'t support over scroll any more, we need to pin the (x,y) if we handle the drag after the plugin choose not to handle the event." into froyo 2010-04-01 08:26:07 -07:00
Grace Kloba
0aca8f9c6b am fe72c533: am 461cef5d: Merge "As we don\'t support over scroll any more, we need to pin the (x,y) if we handle the drag after the plugin choose not to handle the event." into froyo 
Merge commit 'fe72c533fe210e147111e0a862360032365dd987' into kraken

* commit 'fe72c533fe210e147111e0a862360032365dd987':
  As we don't support over scroll any more, we need
 2010-04-01 08:20:48 -07:00
Steve Block
0348440e4a Cherry pick from master. 
This change forwards to the WebView HTTP authentication credentials that
are supplied to an XHR from JavaScript. This allows the WebView to store these
credentials for use with later requests.

This is a re-working of https://android-git.corp.google.com/g/46430

Bug: 2544330
Change-Id: I3f04433b00233d7b7bf4f7e3471d8d15d8817f93
 2010-04-01 16:19:39 +01:00
Grace Kloba
fe72c533fe am 461cef5d: Merge "As we don\'t support over scroll any more, we need to pin the (x,y) if we handle the drag after the plugin choose not to handle the event." into froyo 
Merge commit '461cef5d209fd072c82f6a70eb106e4690b7ef97' into froyo-plus-aosp

* commit '461cef5d209fd072c82f6a70eb106e4690b7ef97':
  As we don't support over scroll any more, we need
 2010-04-01 08:17:35 -07:00
Grace Kloba
461cef5d20 Merge "As we don't support over scroll any more, we need to pin the (x,y) if we handle the drag after the plugin choose not to handle the event." into froyo 2010-04-01 08:15:09 -07:00
Bjorn Bringert
48d9980d0c Expose Context.STORAGE_SERVICE in master 
This was recently hidden in Froyo, and the the change automerged
to Master, where it broke the SDK build since StorageManager is
exposed in Master.

Change-Id: I44f9f666c7644e1c16e3274adc6ae6cd5ac0fdd4
 2010-04-01 14:33:22 +01:00
Romain Guy
f4d67ca61d Merge "Don't ignore the parameters passed to the load methods." 2010-04-01 01:02:01 -07:00
Romain Guy
43d390085d Don't ignore the parameters passed to the load methods. 
Change-Id: Id2090a2a0a39dc19b821ee6a01dd206de366397e
 2010-04-01 01:01:17 -07:00
Dianne Hackborn
a72073e945 am 3bd18537: am 6ff57ee3: am db3ea3d0: Merge "Fix issue #2529154 Found SurfaceFlinger timeout in logcat when wake up Camcorder" into froyo 2010-03-31 23:34:24 -07:00
Dianne Hackborn
c1c1d63e05 am d0b5b3cb: am 2d8d4d7b: am 513ae361: Merge "Fix issue #2560791: Expose API to go in to car mode." into froyo 2010-03-31 23:34:16 -07:00
Adam Powell
ffd8e0fe94 am fff52b6a: am 5af7ef60: am 40cd1cf6: Merge "Fix bug 2562240 and clean up scrollbar behavior" into froyo 2010-03-31 23:34:04 -07:00
Dianne Hackborn
3bd1853798 am 6ff57ee3: am db3ea3d0: Merge "Fix issue #2529154 Found SurfaceFlinger timeout in logcat when wake up Camcorder" into froyo 
Merge commit '6ff57ee310290715c000fd771cd7e18b1537ccbc' into kraken

* commit '6ff57ee310290715c000fd771cd7e18b1537ccbc':
  Fix issue #2529154 Found SurfaceFlinger timeout in logcat when wake up Camcorder
 2010-03-31 23:23:20 -07:00
Dianne Hackborn
d0b5b3cb61 am 2d8d4d7b: am 513ae361: Merge "Fix issue #2560791: Expose API to go in to car mode." into froyo 
Merge commit '2d8d4d7b16b474ef58c86ae9ccd3dc70d7132c23' into kraken

* commit '2d8d4d7b16b474ef58c86ae9ccd3dc70d7132c23':
  Fix issue #2560791: Expose API to go in to car mode.
 2010-03-31 23:23:16 -07:00
Adam Powell
fff52b6a3d am 5af7ef60: am 40cd1cf6: Merge "Fix bug 2562240 and clean up scrollbar behavior" into froyo 
Merge commit '5af7ef60277060b94604a0b9679bb08a4dc1e731' into kraken

* commit '5af7ef60277060b94604a0b9679bb08a4dc1e731':
  Fix bug 2562240 and clean up scrollbar behavior
 2010-03-31 23:23:02 -07:00
Dianne Hackborn
6ff57ee310 am db3ea3d0: Merge "Fix issue #2529154 Found SurfaceFlinger timeout in logcat when wake up Camcorder" into froyo 
Merge commit 'db3ea3d0064e0aeae350bca5e548e67f50f06982' into froyo-plus-aosp

* commit 'db3ea3d0064e0aeae350bca5e548e67f50f06982':
  Fix issue #2529154 Found SurfaceFlinger timeout in logcat when wake up Camcorder
 2010-03-31 23:18:32 -07:00
Dianne Hackborn
2d8d4d7b16 am 513ae361: Merge "Fix issue #2560791: Expose API to go in to car mode." into froyo 
Merge commit '513ae3610e5d6eac3af71c3e51a4e5e8b55b5256' into froyo-plus-aosp

* commit '513ae3610e5d6eac3af71c3e51a4e5e8b55b5256':
  Fix issue #2560791: Expose API to go in to car mode.
 2010-03-31 23:18:28 -07:00
Adam Powell
5af7ef6027 am 40cd1cf6: Merge "Fix bug 2562240 and clean up scrollbar behavior" into froyo 
Merge commit '40cd1cf6aab4e9ef773cd3f6b8c8107da30bd705' into froyo-plus-aosp

* commit '40cd1cf6aab4e9ef773cd3f6b8c8107da30bd705':
  Fix bug 2562240 and clean up scrollbar behavior
 2010-03-31 23:18:17 -07:00
Grace Kloba
ad7a1d79f7 As we don't support over scroll any more, we need 
to pin the (x,y) if we handle the drag after the
plugin choose not to handle the event.

Fix http://b/issue?id=2563143
 2010-03-31 23:04:56 -07:00
Dianne Hackborn
db3ea3d006 Merge "Fix issue #2529154 Found SurfaceFlinger timeout in logcat when wake up Camcorder" into froyo 2010-03-31 23:04:22 -07:00
Dianne Hackborn
513ae3610e Merge "Fix issue #2560791: Expose API to go in to car mode." into froyo 2010-03-31 23:03:26 -07:00
Dianne Hackborn
726426ee73 Fix issue #2529154 Found SurfaceFlinger timeout in logcat when wake up Camcorder 
We need to make sure, if the window size changes, to have onSurfaceChanged()
called for the surface to be redrawn.

Change-Id: Iad518199fa400de8059a77ed34d50d6eb93a6aff
 2010-03-31 22:55:26 -07:00
Romain Guy
feb4fb9682 Fix the build, really 
Change-Id: Id5e00cf7eb822dabb0b2b95b541855871ff0fe07
 2010-03-31 21:09:19 -07:00
Adam Powell
40cd1cf6aa Merge "Fix bug 2562240 and clean up scrollbar behavior" into froyo 2010-03-31 20:11:33 -07:00
Romain Guy
ec1ca4200c Fix the build 
Change-Id: Ia55ab3e19e6cf81d719759eac48e00849bc0b73b
 2010-03-31 19:34:08 -07:00
Romain Guy
81d56ac157 Merge "Add support for XML-defined adapters. This is preliminary work for new types of Launcher widgets." 2010-03-31 19:09:50 -07:00
Adam Powell
a0d645cb69 Fix bug 2562240 and clean up scrollbar behavior 
Change-Id: I551803a1c997c9d10e1d004ce14472af6090f432
 2010-03-31 17:27:49 -07:00
Freeman Ng
943606004b Merge "Give all PreferenceActivity subclasses ability to be launched in wizard mode with Back/Next buttons" 2010-03-31 16:39:54 -07:00
Dianne Hackborn
9c9c532d36 Fix issue #2560791: Expose API to go in to car mode. 
Also fix bug where night mode was being used in desk dock.

Change-Id: I56c1cf3d6fe800a4f986d40cc4cb2e70b76ac261
 2010-03-31 16:25:53 -07:00
Romain Guy
30346c4399 Add support for XML-defined adapters. 
This is preliminary work for new types of Launcher widgets.

See javadoc in android.widget.Adapters for more details.

Change-Id: I413b8d5f97673e255d84dc07ad112c333c0ce9dc
 2010-03-31 16:07:35 -07:00
Doug Felt
4e0c5e55e1 Don't measure for a secondary caret unless we have one. 
Also, clean up imports and trailing whitespace.

Change-Id: I5ebaaceb756600a1ca7370ab3ef078ce200545ef
 2010-03-31 14:57:41 -07:00
The Android Open Source Project
9bab8f115b am 4790259c: am 8de2cf4c: merge from open-source master 2010-03-31 14:23:19 -07:00
The Android Open Source Project
4790259c32 am 8de2cf4c: merge from open-source master 
Merge commit '8de2cf4cce9ae2e121fccb4732fd23c64aace102' into kraken

* commit '8de2cf4cce9ae2e121fccb4732fd23c64aace102':
  Fix last character of password field being visible after rotation
  gl_code : add end of line.
 2010-03-31 14:17:32 -07:00