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

20676 Commits

Author SHA1 Message Date
Glenn Kasten
7647091436 Merge "Bug 3515073 Add ANativeWindow_fromSurfaceTexture" into honeycomb-mr1 2011-03-11 16:31:55 -08:00
Mike Lockwood
62cfeeb821 USB: minor cleanup work 
Bug: 4067029

Change-Id: Icd8f912ab8732b5f770a217b9b3731092597ce02
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-11 18:51:29 -05:00
Nicolas Roard
c6c311f774 am f0230cca: Merge "HTML5 Video improvements" into honeycomb-mr1 
* commit 'f0230cca194c840684bab959856c56725fc40b87':
  HTML5 Video improvements
 2011-03-11 15:11:14 -08:00
Nicolas Roard
f0230cca19 Merge "HTML5 Video improvements" into honeycomb-mr1 2011-03-11 14:35:32 -08:00
Nicolas Roard
0e778a1ab0 HTML5 Video improvements 
- add support for the fullscreen button

counterpart webkit CL: https://android-git.corp.google.com/g/#change,101484

bug:2126902
Change-Id: Ibcc8c5b115089ad1f30ebe76e4d5c31b2d6389f9
 2011-03-11 14:29:05 -08:00
Dianne Hackborn
cf407ad88b Fix issues #4087362 and #4087356 
4087362: Provide a safer way to call DialogFragment.dismiss()
4087356: PreferenceActivity.invalidateHeaders() can cause
IllegalStateException: Can not perform this action after onSaveInstanceState

These are very safe; the first is just a new public API that
allows you to use an existing feature in DialogFragment, and the
second just uses the version of commit that avoids the failure if
happening at a point where the operation would be lost if restored
from the last state (which is no big deal for preferences).

Change-Id: I53971c9fb1efdcd599694cdcd4585b81afc156b8
 2011-03-11 13:48:32 -08:00
Adam Powell
c37308f116 Fix bug 4083825 - Gesture zoom locked along content edges under some 
circumstances

Tune the procedure used to handle "zoom slop" during a webview
pan+zoom gesture.

Change-Id: Ia706722ba6a46e64cce8814d4668e3857b16e562
 2011-03-11 11:44:08 -08:00
Mike Lockwood
75c95e9a6d am 0eb7b697: Merge changes Ib63ab95a,I585b0610,Ia84da0b5 into honeycomb-mr1 
* commit '0eb7b697b7c180660647b5cd0cd7dd067f6b6abb':
  UsbManager: Hide APIs not needed for USB host or accessory support.
  Remove MtpClient class from framework and public API
  UsbDevice: Move IO related methods to new UsbDeviceConnection class
 2011-03-11 11:37:14 -08:00
Mike Lockwood
0eb7b697b7 Merge changes Ib63ab95a,I585b0610,Ia84da0b5 into honeycomb-mr1 
* changes:
  UsbManager: Hide APIs not needed for USB host or accessory support.
  Remove MtpClient class from framework and public API
  UsbDevice: Move IO related methods to new UsbDeviceConnection class
 2011-03-11 10:57:06 -08:00
Christopher Tate
ab1f2a824b am 9856fbd4: Merge "Broaden the filter for wallpaper restore" into honeycomb-mr1 
* commit '9856fbd40470c9f441b6c38b980210cfdef821e9':
  Broaden the filter for wallpaper restore
 2011-03-11 10:48:46 -08:00
Christopher Tate
9856fbd404 Merge "Broaden the filter for wallpaper restore" into honeycomb-mr1 2011-03-11 10:45:17 -08:00
Mike Lockwood
a75075e167 UsbManager: Hide APIs not needed for USB host or accessory support. 
Bug: 4067029

Change-Id: Ib63ab95a6571d6a691834bfb583a68d2e4cfd22e
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-11 11:26:38 -05:00
Mike Lockwood
acc29cc91b UsbDevice: Move IO related methods to new UsbDeviceConnection class 
UsbDevice is now just an immutable parcelable object like UsbInterface and
UsbEndpoint.
All IO related functionality is now contained in UsbDeviceConnection
and UsbRequest.

Bug: 4067029

Change-Id: Ia84da0b512a697acc940eee0c3566711c62e1a68
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-11 10:24:21 -05:00
Jim Miller
7b7a8ca615 am 352987e0: Merge "Fix 3201849: Enable hardware acceleration in LockScreen WaveView [DO NOT MERGE]" into honeycomb-mr1 
* commit '352987e0889b6fa8862f489bc31ba7e9de8d1cbe':
  Fix 3201849: Enable hardware acceleration in LockScreen WaveView [DO NOT MERGE]
 2011-03-10 23:01:42 -08:00
Jim Miller
352987e088 Merge "Fix 3201849: Enable hardware acceleration in LockScreen WaveView [DO NOT MERGE]" into honeycomb-mr1 2011-03-10 22:59:57 -08:00
Adam Powell
2737dfe0a5 am 5ec35c17: Merge "Fix bug 4082512 IAE "pointerIndex out of range" while zooming over flashplayer in browser" into honeycomb-mr1 
* commit '5ec35c172ad0628b7092ab34f962ff2c063905d8':
  Fix bug 4082512 IAE "pointerIndex out of range" while zooming over flashplayer in browser
 2011-03-10 21:43:45 -08:00
Adam Powell
5ec35c172a Merge "Fix bug 4082512 IAE "pointerIndex out of range" while zooming over flashplayer in browser" into honeycomb-mr1 2011-03-10 21:40:38 -08:00
Huahui Wu
372161b755 am 769e132a: Merge "b/4080388 Improving the performance of ZoomManager" into honeycomb-mr1 
* commit '769e132ae30b6615353dd6bd7d8779b6ef1b0b31':
  b/4080388 Improving the performance of ZoomManager
 2011-03-10 21:27:24 -08:00
Huahui Wu
769e132ae3 Merge "b/4080388 Improving the performance of ZoomManager" into honeycomb-mr1 2011-03-10 21:25:47 -08:00
Adam Powell
8f626a1917 Fix bug 4082512 IAE "pointerIndex out of range" while zooming over 
flashplayer in browser

Fix an issue where gestures weren't being fully canceled by webkit to
the multitouch detector. This will prevent ScaleGestureDetector from
attempting to resume its regularly scheduled gesture already in
progress.

Change-Id: Id4881eeb1df8414dfa23174481bd7dc70fd08fee
 2011-03-10 21:20:07 -08:00
Ken Sumrall
9246e4edba am c7fcc507: Merge "Teach the framework to use the new android_reboot() function." into honeycomb-mr1 
* commit 'c7fcc5076fb2988fba699a2167d19475fd58ed0b':
  Teach the framework to use the new android_reboot() function.
 2011-03-10 19:27:05 -08:00
Ken Sumrall
c7fcc5076f Merge "Teach the framework to use the new android_reboot() function." into honeycomb-mr1 2011-03-10 19:24:42 -08:00
Christopher Tate
9b95a4fcdc Broaden the filter for wallpaper restore 
Tweak the filter parameters so that we now use any restored wallpaper image
that is larger than our ideal size, and will reject any smaller images only
if they are *much* smaller than our ideal size.  The specific threshold used
here will just barely reject Nexus One or Droid sized wallpapers for restore
onto a Xoom, but will pass anything larger.

Bug 4070129

Change-Id: I889bdb3ef5011343b2fccb2f81c6abc2f4603ee2
 2011-03-10 17:53:53 -08:00
Huahui Wu
31484fbe28 b/4080388 Improving the performance of ZoomManager 
This is a re-factor of cl b/3307761.
It uses an circular array to implement the queue instead of linked list.
And it saves the time to convert float to Float.

Change-Id: I1076aabec2310b2cc299d7f485bf9c4710107045
 2011-03-10 17:48:38 -08:00
Jim Miller
1b365921e8 Fix 3201849: Enable hardware acceleration in LockScreen WaveView [DO NOT MERGE] 
Change-Id: I07bbed7843857158cd2c1ffd9b184bde7fd5860d
 2011-03-10 17:20:21 -08:00
Gilles Debunne
6d0268bf6e Paste popup uses a disabled icon when there is nothing to paste. 
Change-Id: I982aa46ecd225fdea5c879fa2a3e897f5e0e810a
 2011-03-10 17:16:13 -08:00
Teng-Hui Zhu
37ee248b52 am 2fc79763: Merge "Inline HTML5 Video support" into honeycomb-mr1 
* commit '2fc7976399e5f0f4c6e1dae528df727e7dcbdc8e':
  Inline HTML5 Video support
 2011-03-10 17:13:03 -08:00
Teng-Hui Zhu
2fc7976399 Merge "Inline HTML5 Video support" into honeycomb-mr1 2011-03-10 17:10:29 -08:00
Adam Powell
6615362b14 am cf63b66c: Merge "Fix bug 4080407 - Browser stuck after scrolling- page stops responding" into honeycomb-mr1 
* commit 'cf63b66cfd49dda473806a3b001db72fca48af5a':
  Fix bug 4080407 - Browser stuck after scrolling- page stops responding
 2011-03-10 17:07:52 -08:00
Adam Powell
cf63b66cfd Merge "Fix bug 4080407 - Browser stuck after scrolling- page stops responding" into honeycomb-mr1 2011-03-10 17:06:11 -08:00
Teng-Hui Zhu
661e8b1f21 Inline HTML5 Video support 
Use the HTML5VideoView to make inline HTML5 video possible.
Full screen support will be the next step.

The native side change is at 101310.

bug:3506407, 2126902
Change-Id: I012f33a4d0c7b83d37b184fceb3923e1fb277b80
 2011-03-10 16:58:24 -08:00
Adam Powell
80615b0075 Fix bug 4080407 - Browser stuck after scrolling- page stops responding 
Account for gaps in touch queue sequence numbering when we flush out
canceled events from webcore's queue. Add a 2-second timeout to auto-flush
old events when a new gesture begins.

Change-Id: I764a7fcd673b3afb629055b001e9346f5b959dba
 2011-03-10 16:45:12 -08:00
Nick Pelly
38d0d5628d am 367f41f8: Implement new NFC-EE API\'s as shared library (frameworks/base). 
* commit '367f41f8f61126c2ab34a34cc676756a9fc23ac2':
  Implement new NFC-EE API's as shared library (frameworks/base).
 2011-03-10 16:32:28 -08:00
Nick Pelly
367f41f8f6 Implement new NFC-EE API's as shared library (frameworks/base). 
Change-Id: I45c4eaf59ec78167fc236fdd59676465a5e1bcb7
 2011-03-10 16:03:46 -08:00
Xia Wang
05ab5caa80 am cf994cc5: Merge "resolved conflicts for merge of 16cbe575 to honeycomb-mr1" into honeycomb-mr1 
* commit 'cf994cc57df33121cea7a0082c8ea55ca125279c':
  Add WifiStressTest to Wi-Fi only test suite.
 2011-03-10 15:57:27 -08:00
Xia Wang
4bc5c4a1f5 resolved conflicts for merge of 16cbe575 to honeycomb-mr1 
Change-Id: Ic55f0bdeb5fc63bdabb4f4546fa7e1aa3201a6e0
 2011-03-10 15:09:46 -08:00
Eric Fischer
adcaca260e am ff25b975: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit 'ff25b975052ddf0e74627cccca742cddd1c8e2f2':
  Import revised translations.  DO NOT MERGE
 2011-03-10 14:47:57 -08:00
Eric Fischer
ff25b97505 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-10 14:46:18 -08:00
Eric Fischer
4942d9936a Import revised translations. DO NOT MERGE 
Change-Id: I754a2637bbe533e80f5d863a52e2fbda7731638a
 2011-03-10 14:25:11 -08:00
Justin Ho
9caea5efd9 am fa1d72c8: Merge "New textfield search assets Bug: 3321263" into honeycomb-mr1 
* commit 'fa1d72c894af5b2ab622a1d7612a3307d3f8b2e1':
  New textfield search assets Bug: 3321263
 2011-03-10 13:55:21 -08:00
Justin Ho
fa1d72c894 Merge "New textfield search assets Bug: 3321263" into honeycomb-mr1 2011-03-10 13:53:48 -08:00
Eric Fischer
b23196d647 am 8d257f85: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit '8d257f85acc3316b9ba451337f7cbea9000eb8cf':
  Import revised translations.  DO NOT MERGE
 2011-03-10 13:46:28 -08:00
Eric Fischer
8d257f85ac Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-10 11:42:24 -08:00
Eric Fischer
c66ef5ab33 Import revised translations. DO NOT MERGE 
Change-Id: I0ee1d6152852c0cb085cc073ed0684dcc03d6ba7
 2011-03-10 11:23:57 -08:00
Shimeng (Simon) Wang
40f240166a am 0837fde9: Merge "Don\'t limit zoom scale change by the minimum increment." into honeycomb-mr1 
* commit '0837fde9fd9e29f8ef66a3fe00764e15a6f3d515':
  Don't limit zoom scale change by the minimum increment.
 2011-03-10 09:07:22 -08:00
Kristian Monsen
4543b8d4b0 am 79b87df5: Merge "Fix for bug 4064291 WebView uses PackageManager#getInstalledApps" into honeycomb-mr1 
* commit '79b87df58861faeedd85804f6ea4f24eb67aef12':
  Fix for bug 4064291 WebView uses PackageManager#getInstalledApps
 2011-03-10 09:05:18 -08:00
Shimeng (Simon) Wang
0837fde9fd Merge "Don't limit zoom scale change by the minimum increment." into honeycomb-mr1 2011-03-10 09:04:12 -08:00
Kristian Monsen
79b87df588 Merge "Fix for bug 4064291 WebView uses PackageManager#getInstalledApps" into honeycomb-mr1 2011-03-10 09:01:58 -08:00
Mike Lockwood
84edf14b62 am cc08c439: Merge "UsbAccessory: Add URI string, replace type string with description" into honeycomb-mr1 
* commit 'cc08c439bc7b0afbdafc5ca18c584d2f7724f3df':
  UsbAccessory: Add URI string, replace type string with description
 2011-03-10 07:52:30 -08:00
Mike Lockwood
cc08c439bc Merge "UsbAccessory: Add URI string, replace type string with description" into honeycomb-mr1 2011-03-10 07:50:30 -08:00