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

12195 Commits

Author SHA1 Message Date
Dirk Dougherty
4ef36afa32 am 18cbc0e5: am 3466e1fc: Merge "Doc change: escape angle brackets in javadoc comment." into gingerbread 
Merge commit '18cbc0e58a0e68411dff655f116a7010c3f464a2'

* commit '18cbc0e58a0e68411dff655f116a7010c3f464a2':
  Doc change: escape angle brackets in javadoc comment.
 2010-10-21 10:55:21 -07:00
Brad Fitzpatrick
385a753dea resolved conflicts for merge of 368fdba4 to master 
Change-Id: I42b7b433c86a71a5da5db67109f056a280077c9d
 2010-10-21 07:39:10 -07:00
Chris Tate
a376d030a2 Merge "Fix obtain() when the pool is still empty" 2010-10-20 19:04:34 -07:00
Chris Tate
c02c7af0ec Fix obtain() when the pool is still empty 
Fixes bug 3116798

Change-Id: I187e79892cd2b60173ef4ebef5d2eab56eb5eb42
 2010-10-20 19:01:55 -07:00
Wink Saville
1b35f942ec Merge "Add AsyncChannel and AsyncService." 2010-10-20 15:51:23 -07:00
Wink Saville
d20a5d6b5a Add AsyncChannel and AsyncService. 
Change-Id: Ie6f9aed58f49defcd1c051611ce791e2e62a9474
 2010-10-20 15:17:28 -07:00
Dirk Dougherty
18cbc0e58a am 3466e1fc: Merge "Doc change: escape angle brackets in javadoc comment." into gingerbread 
Merge commit '3466e1fc6db1fed35e2707c67a9ab17673aaf9de' into gingerbread-plus-aosp

* commit '3466e1fc6db1fed35e2707c67a9ab17673aaf9de':
  Doc change: escape angle brackets in javadoc comment.
 2010-10-20 13:54:09 -07:00
Vasu Nori
c63c320c09 Merge "remove duplicate code" 2010-10-20 13:46:19 -07:00
Vasu Nori
ef7e33b9b8 remove duplicate code 
Change-Id: I60faf921de4b9add619e2450e0a19a111ede7984
 2010-10-20 13:37:33 -07:00
Amith Yamasani
b1818e83f4 Update dropdown colors and list readability for SearchView. 
Dismiss IME on launching suggestion.
 2010-10-20 13:32:24 -07:00
Irfan Sheriff
4f5f7c9683 Fix wake and scan behavior 
- Add wakelock for driver start/stop to ensure a wifilock
  acquisition kick starts driver. Also cleaned up state machine
  driver start/stop behavior.
- Add periodic scans when driver is started to ensure wifi
  reconnections when wifilock exists or when user chooses
  never to sleep
- some minor clean up

Change-Id: I844eb70491d5aa2f8c8933b3d8dd01ba237ee534
 2010-10-20 12:04:21 -07:00
Ben Murdoch
be00398005 Merge "Set the unique id of the AutoFill profile WebKit can read it" 2010-10-20 11:35:47 -07:00
Ben Murdoch
b1b82a8df8 Set the unique id of the AutoFill profile WebKit can read it 
After the recent Chromium merge to 7.0.540.0, it seems that we are no
longer allowed to use a profile unique id of 0. Set the unique id
in the AutoFillProfile class so that WebKit can access it.

Change-Id: I88cd1e91b8c6043c732a1709a89fda4a3c9f921f
 2010-10-20 18:56:23 +01:00
Dirk Dougherty
3466e1fc6d Merge "Doc change: escape angle brackets in javadoc comment." into gingerbread 2010-10-20 09:34:24 -07:00
Ben Murdoch
9532677ad8 Merge "Implement file downloads for Chrome HTTP stack (Java side)" 2010-10-20 08:36:17 -07:00
Iain Merrick
d77f9b7b39 Implement file downloads for Chrome HTTP stack (Java side) 
This just adds an extra entrypoint to BrowserFrame. It delegates
directly to the identical method in CallbackProxy, and from there
downloads are handled in the same way as before.

See matching C++ change in external/webkit (I81300400)

Change-Id: I87e71debe475d0d24e13a5763fbe803e3cd78cf5
 2010-10-20 15:55:12 +01:00
Jack Wang
b1d042dc31 Merge "Added RepetitiveTest annotation and test runner support" 2010-10-20 03:23:49 -07:00
Adam Powell
548f76f135 Fix bug 3113015 - ProgressDialogs using wrong theme. 
Change-Id: I161e7feeb2e1a712dff4372417c20913c1dba661
 2010-10-19 19:01:55 -07:00
Jack Wang
3fc03e619f Added RepetitiveTest annotation and test runner support 
Change-Id: I7bf0871ede6dd69512c6b6ea3484693ba5b78e89
 2010-10-19 18:23:18 -07:00
Mindy Pereira
62ad0db623 am 6fbc5d9c: DO NOT MERGE. Make sure to invalidate after pulling on an edgeglow. 
Merge commit '6fbc5d9c19388e8f1c9a1833bc0e15fcf6b499f1' into gingerbread-plus-aosp

* commit '6fbc5d9c19388e8f1c9a1833bc0e15fcf6b499f1':
  DO NOT MERGE. Make sure to invalidate after pulling on an edgeglow.
 2010-10-19 18:23:18 -07:00
Patrick Dubroy
382f7a140e Merge "Fix memory leak with TouchTargets not being recycled." 2010-10-19 18:03:46 -07:00
Adam Powell
34625c6b41 Merge "Add ActionBar tab callback method onTabReselected" 2010-10-19 17:58:20 -07:00
Mindy Pereira
6fbc5d9c19 DO NOT MERGE. Make sure to invalidate after pulling on an edgeglow. 
Fixes b/3111778 overscroll glitch in news & weather

Change-Id: Ic255da1f7c4301ea3980acc4fa033c9f17a60dac
 2010-10-19 17:38:24 -07:00
Patrick Dubroy
fb0547d2c0 Fix memory leak with TouchTargets not being recycled. 2010-10-19 17:36:18 -07:00
Adam Powell
7f9b90542e Add ActionBar tab callback method onTabReselected 
onTabReselected is called if an already-selected tab is chosen again.
For many apps this will be a no-op, but some may treat it as a signal
to return to the top level of a given navigation category.

Change-Id: Ic51fbe477b979562f2d848c4070b2016b217a90f
 2010-10-19 17:18:20 -07:00
Dmitri Plotnikov
99291b95b2 Merge "Adding Insert.DATA extra for new/edit contact intents." 2010-10-19 15:49:25 -07:00
Chris Tate
a949d7d881 Merge "Introduce an OnDragListener mechanism" 2010-10-19 13:58:07 -07:00
Chris Tate
32affef4f8 Introduce an OnDragListener mechanism 
If the listener's onDrag(view, event) returns 'false', the view's own
onDragEvent() will be called.  If the listener returns 'true', it
consumes the event (and declares that it will handle the rest of the
drag event sequence, in the case of DRAG_STARTED actions).

Change-Id: I01aff0e4f59f71e55f5eea1049905c80714f0607
 2010-10-19 13:56:17 -07:00
Brad Fitzpatrick
6be063d8a9 am 5a67749a: am 987e8d7f: Merge "Fix Vibrator permission CTS test broken earlier." into gingerbread 
Merge commit '5a67749a35bcbb70bfcc5f4c18da6a196bda33c1'

* commit '5a67749a35bcbb70bfcc5f4c18da6a196bda33c1':
  Fix Vibrator permission CTS test broken earlier.
 2010-10-19 13:38:00 -07:00
Leon Scroggins
4f4a567217 Tell nativeFindAll whether the new search matches the last one. 
Bug:3108852

Requires a change in external/webkit.

Change-Id: I4333532b4febfa9e832272cf903c3f96ebff0203
 2010-10-19 15:56:56 -04:00
Brad Fitzpatrick
6799864d6c am 59993d9b: Merge "Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX" into gingerbread 
Merge commit '59993d9bc589089e6be55371c6536a42afe21a64' into gingerbread-plus-aosp

* commit '59993d9bc589089e6be55371c6536a42afe21a64':
  Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX
 2010-10-19 12:44:19 -07:00
Brad Fitzpatrick
59993d9bc5 Merge "Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX" into gingerbread 2010-10-19 12:40:53 -07:00
Joe Onorato
368fdba47a am bdf1706a: Merge "Reduce logging." into gingerbread 
Merge commit 'bdf1706ac680c0fe74765b8d6d34823b8ac05306' into gingerbread-plus-aosp

* commit 'bdf1706ac680c0fe74765b8d6d34823b8ac05306':
  Reduce logging.
 2010-10-19 12:29:43 -07:00
Brad Fitzpatrick
5a67749a35 am 987e8d7f: Merge "Fix Vibrator permission CTS test broken earlier." into gingerbread 
Merge commit '987e8d7f9748018d3fee5778645b267a9ee06ff6' into gingerbread-plus-aosp

* commit '987e8d7f9748018d3fee5778645b267a9ee06ff6':
  Fix Vibrator permission CTS test broken earlier.
 2010-10-19 12:25:46 -07:00
Amith Yamasani
5931b1f415 Fix layout issues, add a maxWidth attribute to SearchView. 
Bug: 3067611
Bug: 3067595
 2010-10-19 12:24:27 -07:00
Joe Onorato
bdf1706ac6 Merge "Reduce logging." into gingerbread 2010-10-19 12:23:51 -07:00
Brad Fitzpatrick
44d2c69ad3 Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX 
Bug: 3110967
Change-Id: I156070956528c8c7d1eb6db5d2e8bb1fe119178d
 2010-10-19 12:19:41 -07:00
Joe Onorato
431bb22695 Reduce logging. 
Remember, the system and main logs are
    - Shared resources
    - Primarily for recording problems
    - To be used only for large grained events during normal operation

Bug: 3104855
Change-Id: I136fbd101917dcbc8ebc3f96f276426b48bde7b7
 2010-10-19 15:08:05 -04:00
Adam Powell
067222d11f Merge "Fix bug 3109812 - NPE in ButtonGroup.dispatchDraw" 2010-10-19 12:04:49 -07:00
Adam Powell
35f21fe0ff Fix bug 3109812 - NPE in ButtonGroup.dispatchDraw 
Change-Id: Ie8d9b2c0862cc901ed9534e81465fe41ade1f9a0
 2010-10-19 11:54:10 -07:00
Wu-cheng Li
4b3370a31c am 9bf511db: am f73d48d7: Merge "Fix some camera orientation javadoc errors." into gingerbread 
Merge commit '9bf511db85db8e8eff8833b3ec2c30cef12f9188'

* commit '9bf511db85db8e8eff8833b3ec2c30cef12f9188':
  Fix some camera orientation javadoc errors.
 2010-10-19 11:19:15 -07:00
Sylvain Fonteneau
ca2a75ad56 am 824de4b3: am dd7341f7: Added missing implementation for NdefRecord. 
Merge commit '824de4b3e378a5ef41de1704ee3f50a49d408a66'

* commit '824de4b3e378a5ef41de1704ee3f50a49d408a66':
  Added missing implementation for NdefRecord.
 2010-10-19 11:17:52 -07:00
Brad Fitzpatrick
26e9cf38b2 Fix Vibrator permission CTS test broken earlier. 
Bug: 3106964
Change-Id: I76138780ac64f761fe09ef8ba74382c7ee05d794
 2010-10-19 11:02:20 -07:00
Brad Fitzpatrick
49889d4ffc am c9cff071: am b4157a43: Merge "StrictMode: fix docs to actually compile and add a utility method." into gingerbread 
Merge commit 'c9cff071af175e559339c54876136612ac5eda3b'

* commit 'c9cff071af175e559339c54876136612ac5eda3b':
  StrictMode: fix docs to actually compile and add a utility method.
 2010-10-19 10:44:52 -07:00
Shimeng (Simon) Wang
b0f67c9d06 am b65058a4: am 6b2274a1: Merge "Don\'t force ended when full screen video is returned manually." into gingerbread 
Merge commit 'b65058a45544ba4b9ff5dbad3cc306d86e9554e5'

* commit 'b65058a45544ba4b9ff5dbad3cc306d86e9554e5':
  Don't force ended when full screen video is returned manually.
 2010-10-19 10:44:46 -07:00
Nick Pelly
29d9849fd7 am 7dced8de: am 2b51fcb9: Merge "NFC: broadcast intent constants for adapter state change" into gingerbread 
Merge commit '7dced8de3813aa42edb59e13e3ea3a2657d06125'

* commit '7dced8de3813aa42edb59e13e3ea3a2657d06125':
  NFC: broadcast intent constants for adapter state change
 2010-10-19 09:56:01 -07:00
Nick Pelly
5bc8c853f5 am c2e4daac: am 1f90908c: Merge "Prevent use of NFC api if device is not featurized for NFC." into gingerbread 
Merge commit 'c2e4daacb4470bd43d5db3cf6b82f39be757ebe8'

* commit 'c2e4daacb4470bd43d5db3cf6b82f39be757ebe8':
  Prevent use of NFC api if device is not featurized for NFC.
 2010-10-19 09:53:03 -07:00
Wu-cheng Li
9bf511db85 am f73d48d7: Merge "Fix some camera orientation javadoc errors." into gingerbread 
Merge commit 'f73d48d754b11f6ed0fba017f5bc8f27acdfbe4f' into gingerbread-plus-aosp

* commit 'f73d48d754b11f6ed0fba017f5bc8f27acdfbe4f':
  Fix some camera orientation javadoc errors.
 2010-10-19 08:44:13 -07:00
Dianne Hackborn
4fa1a221b4 Remove public resource padding. 
Change-Id: Id4f28ecfb7a87267c256571ed5f98652730b44fc
 2010-10-19 08:16:49 -07:00
Wu-cheng Li
2fe6fcaff4 Fix some camera orientation javadoc errors. 
bug:3105659
Change-Id: I0e54f6dd3aa8aeb2494f2596130a5aeb9e1449ba
 2010-10-19 19:14:04 +08:00