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

20873 Commits

Author SHA1 Message Date
Eino-Ville Talvala
ce06ebfda4 Merge "Add support for timestamps into SurfaceTexture." 2011-03-17 15:52:34 -07:00
Teng-Hui Zhu
e92f2121a7 am 6b3c25c8: am 0318d6bf: am 73091273: Merge "Fix the aspect ratio for full screen playing" into honeycomb-mr1 
* commit '6b3c25c859ef72e7f65527c6aae68e77df580b94':
  Fix the aspect ratio for full screen playing
 2011-03-17 14:25:47 -07:00
Teng-Hui Zhu
6b3c25c859 am 0318d6bf: am 73091273: Merge "Fix the aspect ratio for full screen playing" into honeycomb-mr1 
* commit '0318d6bfd3882b3f6fb82b03aca496e68c36d1f9':
  Fix the aspect ratio for full screen playing
 2011-03-17 14:23:38 -07:00
Teng-Hui Zhu
0318d6bfd3 am 73091273: Merge "Fix the aspect ratio for full screen playing" into honeycomb-mr1 
* commit '73091273bb5160567f2230e1e7fcde5b0218ad9d':
  Fix the aspect ratio for full screen playing
 2011-03-17 14:22:26 -07:00
Teng-Hui Zhu
73091273bb Merge "Fix the aspect ratio for full screen playing" into honeycomb-mr1 2011-03-17 14:20:39 -07:00
Eric Fischer
c3a785cbc6 am b05fea7d: am e6ef8d0b: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit 'b05fea7dc586173d5dcf7980e51966ac4ae761a0':
  Import revised translations.  DO NOT MERGE
 2011-03-17 13:36:38 -07:00
Teng-Hui Zhu
1ab0df7f5a Fix the aspect ratio for full screen playing 
bug:4116475

Change-Id: I0b04ef4a6db24a9bc5c8d0f0a987783695bc3489
 2011-03-17 13:36:33 -07:00
Eric Fischer
b05fea7dc5 am e6ef8d0b: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit 'e6ef8d0b75494e8d1e8f619b2a461c11fe8fb965':
  Import revised translations.  DO NOT MERGE
 2011-03-17 13:32:58 -07:00
Eric Fischer
00436f9bfb Import revised translations. DO NOT MERGE 
Change-Id: I774c6b4e13d3cb53b2364360f6f888e548110e7f
 2011-03-17 13:11:01 -07:00
Eino-Ville Talvala
c5f94d8a47 Add support for timestamps into SurfaceTexture. 
API addition: The timestamps are represented as nanoseconds from some
arbitrary time point. Like the SurfaceTexture transform matrix, the
timestamp retrieved by getTimestamp is for the last frame sent to the
GL texture using updateTexImage().

Camera HAL change: Expect vendors to set these timestamps using
native_window_set_buffers_timestamp().  For now, they are
autogenerated by SurfaceTextureClient if set_buffers_timestamp() is
never called, but such timing is likely not accurate enough to pass a
CTS test.

bug:3300707

Change-Id: Ife131a0c2a826ac27342e11b8a6c42ff49e1bea7
 2011-03-17 13:10:03 -07:00
Brad Fitzpatrick
4d733f5207 am 8698c912: am b8332786: am d973bed3: Merge "Removing dead store; it was likely a relict of debuging code." 
* commit '8698c91204d56ea52a4393cd8cf91c9a3a49c4c8':
  Removing dead store; it was likely a relict of debuging code.
 2011-03-17 10:39:21 -07:00
Brad Fitzpatrick
8698c91204 am b8332786: am d973bed3: Merge "Removing dead store; it was likely a relict of debuging code." 
* commit 'b8332786e3ac6d58504a7c3128e94e63255b3515':
  Removing dead store; it was likely a relict of debuging code.
 2011-03-17 10:36:47 -07:00
Brad Fitzpatrick
b8332786e3 am d973bed3: Merge "Removing dead store; it was likely a relict of debuging code." 
* commit 'd973bed36cb4d4da1d97f309119f4114f60e7171':
  Removing dead store; it was likely a relict of debuging code.
 2011-03-17 10:18:15 -07:00
Adam Powell
7270f62c1f am 9cd93f09: am ea775ca3: am f8d1533b: Merge "Fix bug 4111271 and bug 4077526 - WebView touch event handling when WebCore is too slow" into honeycomb-mr1 
* commit '9cd93f09d451afacb8fffeee5e71806e0f91cf31':
  Fix bug 4111271 and bug 4077526 - WebView touch event handling when WebCore is too slow
 2011-03-17 01:41:30 -07:00
Adam Powell
9cd93f09d4 am ea775ca3: am f8d1533b: Merge "Fix bug 4111271 and bug 4077526 - WebView touch event handling when WebCore is too slow" into honeycomb-mr1 
* commit 'ea775ca3ac793033e91b4d1cc05dfdb53ab807be':
  Fix bug 4111271 and bug 4077526 - WebView touch event handling when WebCore is too slow
 2011-03-17 01:39:44 -07:00
Adam Powell
ea775ca3ac am f8d1533b: Merge "Fix bug 4111271 and bug 4077526 - WebView touch event handling when WebCore is too slow" into honeycomb-mr1 
* commit 'f8d1533b07b51935e295b2cf92e2ea2aa94b303f':
  Fix bug 4111271 and bug 4077526 - WebView touch event handling when WebCore is too slow
 2011-03-17 01:38:15 -07:00
Adam Powell
d0197f3669 Fix bug 4111271 and bug 4077526 - WebView touch event handling when 
WebCore is too slow

Make sure that we can recover properly from a bad gesture with missing
events that never come back from webcore. Lower timeout to 1 second.

Confirm movement on touch event enqueue so that we don't get phantom
taps or long presses when webcore is slow to respond.

Add sanity check in ScaleGestureDetector to end a gesture early on a
bad MotionEvent stream rather than throwing up.

Change-Id: I69690409d7edd6b4320dbcf3b052aba4023360fe
 2011-03-17 01:32:17 -07:00
Jozef BABJAK
f1aa297b17 Removing dead store; it was likely a relict of debuging code. 
Change-Id: I4daab1359d7c4b300ef61e3de1578d9fecb6f8da
 2011-03-17 09:23:32 +01:00
Teng-Hui Zhu
607a10c5c9 am a13640b9: am 7a0949c6: am 7af7e00b: Merge "Support html5 video switching b/t full screen and inline mode" into honeycomb-mr1 
* commit 'a13640b9efe1706ad0b6b608ccfca800166d7c01':
  Support html5 video switching b/t full screen and inline mode
 2011-03-16 23:08:20 -07:00
Teng-Hui Zhu
a13640b9ef am 7a0949c6: am 7af7e00b: Merge "Support html5 video switching b/t full screen and inline mode" into honeycomb-mr1 
* commit '7a0949c60df2085fc38eea71d78f9c17eb26cd65':
  Support html5 video switching b/t full screen and inline mode
 2011-03-16 23:05:41 -07:00
Teng-Hui Zhu
7a0949c60d am 7af7e00b: Merge "Support html5 video switching b/t full screen and inline mode" into honeycomb-mr1 
* commit '7af7e00b9112f15d1683ae93975a6fcd9dd34da8':
  Support html5 video switching b/t full screen and inline mode
 2011-03-16 23:03:04 -07:00
Teng-Hui Zhu
7af7e00b91 Merge "Support html5 video switching b/t full screen and inline mode" into honeycomb-mr1 2011-03-16 23:01:03 -07:00
Teng-Hui Zhu
10ab654943 Support html5 video switching b/t full screen and inline mode 
bug:2126902

Change-Id: I5c4b25358c76e35f0f51794d6d04fcc5098a0d70
 2011-03-16 22:06:28 -07:00
Bart Sears
16c4f35692 am 2983bb6a: am 247820c0: am 8e42d39f: Merge "partial inval" into honeycomb-mr1 
* commit '2983bb6a363010403668d39fdc42f5712bff5eb3':
  partial inval
 2011-03-16 21:54:38 -07:00
Bart Sears
2983bb6a36 am 247820c0: am 8e42d39f: Merge "partial inval" into honeycomb-mr1 
* commit '247820c0a756413986643a0ed9a8d446afc747ee':
  partial inval
 2011-03-16 21:52:23 -07:00
Bart Sears
247820c0a7 am 8e42d39f: Merge "partial inval" into honeycomb-mr1 
* commit '8e42d39f0b1c2a60ab9c2f88cd3835ef8ae690ed':
  partial inval
 2011-03-16 21:50:52 -07:00
Bart Sears
8e42d39f0b Merge "partial inval" into honeycomb-mr1 2011-03-16 21:49:09 -07:00
Eric Fischer
8504423f00 am c657fcce: am 20ccaf6c: Import revised translations. DO NOT MERGE 
* commit 'c657fcce45fa4d9817589e96508f5ddf0ae09c61':
  Import revised translations.  DO NOT MERGE
 2011-03-16 17:11:54 -07:00
Eric Fischer
c657fcce45 am 20ccaf6c: Import revised translations. DO NOT MERGE 
* commit '20ccaf6cc1a79a3f7973e5875c66e2bce2ebee7c':
  Import revised translations.  DO NOT MERGE
 2011-03-16 17:10:09 -07:00
Eric Fischer
20ccaf6cc1 Import revised translations. DO NOT MERGE 
Change-Id: I59b21268d693f0fac87e787fceb4f41b3f3e6acd
 2011-03-16 16:48:09 -07:00
Nicolas Roard
f2674c1a2c partial inval 
Change-Id: Ib8ba0fdbbbcae3061692043d33fecb8ffa8ee100
 2011-03-16 16:05:19 -07:00
Jesse Wilson
94e085fda0 Merge "Don't leak JsonReaders in example code." 2011-03-16 15:48:07 -07:00
Jesse Wilson
47a2a4eaad Merge "Fix a bogus comment on LruCache.hitCount()" 2011-03-16 15:05:10 -07:00
Jesse Wilson
9d30ea0333 Don't leak JsonReaders in example code. 
Change-Id: Id81fb44e26f895d7ac6ecf87eddfa9d14c643159
 2011-03-16 15:02:48 -07:00
Jesse Wilson
a460c1871e Fix a bogus comment on LruCache.hitCount() 
Change-Id: I219b65bd73b85a414c21d4c4abe59296c9c5945a
 2011-03-16 14:57:01 -07:00
Shimeng (Simon) Wang
0ec5c78a80 am 0c4f09be: am f2532d16: am 464b690a: Pass firstLayout info to native webview when setting baseLayer. 
* commit '0c4f09be5b73bd6bf19921d907fadc50d853deaf':
  Pass firstLayout info to native webview when setting baseLayer.
 2011-03-16 14:51:21 -07:00
Shimeng (Simon) Wang
0c4f09be5b am f2532d16: am 464b690a: Pass firstLayout info to native webview when setting baseLayer. 
* commit 'f2532d16a4a2ca4dffe9bf9568fdd24475369cac':
  Pass firstLayout info to native webview when setting baseLayer.
 2011-03-16 14:49:18 -07:00
Shimeng (Simon) Wang
f2532d16a4 am 464b690a: Pass firstLayout info to native webview when setting baseLayer. 
* commit '464b690ada24428f3dff4102659048db7128835f':
  Pass firstLayout info to native webview when setting baseLayer.
 2011-03-16 14:47:32 -07:00
Shimeng (Simon) Wang
464b690ada Pass firstLayout info to native webview when setting baseLayer. 
issue: 4094300
Change-Id: I4fdbc0cee73230a731b1356f44372cd86a5c4ad1
 2011-03-16 13:56:37 -07:00
Michael Kolb
dce574a191 am 5b7a1bd7: am b0a07f0c: am 6bb2020e: Merge "add comment to deprecated tag" into honeycomb-mr1 
* commit '5b7a1bd7906b24e92d61b967abe736cc3559bf08':
  add comment to deprecated tag
 2011-03-16 13:43:30 -07:00
Michael Kolb
5b7a1bd790 am b0a07f0c: am 6bb2020e: Merge "add comment to deprecated tag" into honeycomb-mr1 
* commit 'b0a07f0ce54ee812f9a00cc53f43919051d563c3':
  add comment to deprecated tag
 2011-03-16 13:38:24 -07:00
Michael Kolb
b0a07f0ce5 am 6bb2020e: Merge "add comment to deprecated tag" into honeycomb-mr1 
* commit '6bb2020e6e9914f6df3dc7d69dbd21782267fbd4':
  add comment to deprecated tag
 2011-03-16 13:34:30 -07:00
Michael Kolb
24e53b00b0 add comment to deprecated tag 
Change-Id: Id0c30c43abfeb9005f9b69e0a565644c7c956295
 2011-03-16 12:56:39 -07:00
Michael Kolb
0677d2526d am d799caa9: am 9a0df3c5: am 95fd065e: Merge "deprecate getVisibleTitleHeight" into honeycomb-mr1 
* commit 'd799caa9a6623de4af581bebc9759272c10b6588':
  deprecate getVisibleTitleHeight
 2011-03-16 12:35:42 -07:00
Jeff Brown
5949f89f3c Merge "Add 3D mode key and others." 2011-03-16 11:46:00 -07:00
Michael Kolb
d799caa9a6 am 9a0df3c5: am 95fd065e: Merge "deprecate getVisibleTitleHeight" into honeycomb-mr1 
* commit '9a0df3c5c730ff12e050945f2bad0d86a37c5b2f':
  deprecate getVisibleTitleHeight
 2011-03-16 11:37:23 -07:00
Michael Kolb
9a0df3c5c7 am 95fd065e: Merge "deprecate getVisibleTitleHeight" into honeycomb-mr1 
* commit '95fd065e3cef0bef723a2e624191b08bb00ce6f8':
  deprecate getVisibleTitleHeight
 2011-03-16 11:35:45 -07:00
Michael Kolb
95fd065e3c Merge "deprecate getVisibleTitleHeight" into honeycomb-mr1 2011-03-16 11:33:13 -07:00
Jeff Brown
9812aed276 Add 3D mode key and others. 
Related to an AOSP change request.

Change-Id: I3f4f84b56a1af626a8783f5ecbb823eb12ba9fbe
 2011-03-16 11:31:42 -07:00
Svetoslav Ganov
4ad45c4d15 Merge "Pressed state not cleared if view is disabled in long click handler" 2011-03-16 11:13:41 -07:00