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

47748 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
c8c3729506 Import revised translations. 
Change-Id: I0e0b132f5f4678721fd07193605341b4b68885fe
 2011-03-17 16:51:07 -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
Xavier Ducrohet
f0da151e78 am 47b42991: am a0215953: am 026d6be2: Merge "LayoutLib: TypedArray.getDimensionPixelSize can actually return <0" into honeycomb-mr1 
* commit '47b42991203b7f8e337b1612d601ed120596ef71':
  LayoutLib: TypedArray.getDimensionPixelSize can actually return <0
 2011-03-17 14:20:38 -07:00
Xavier Ducrohet
47b4299120 am a0215953: am 026d6be2: Merge "LayoutLib: TypedArray.getDimensionPixelSize can actually return <0" into honeycomb-mr1 
* commit 'a0215953b0a6930b0ca3dcbdd598e1b9de2e9f02':
  LayoutLib: TypedArray.getDimensionPixelSize can actually return <0
 2011-03-17 14:18:48 -07:00
Xavier Ducrohet
a0215953b0 am 026d6be2: Merge "LayoutLib: TypedArray.getDimensionPixelSize can actually return <0" into honeycomb-mr1 
* commit '026d6be2dcc425f83d9d7ec8740068147497b305':
  LayoutLib: TypedArray.getDimensionPixelSize can actually return <0
 2011-03-17 14:15:38 -07:00
Xavier Ducrohet
026d6be2dc Merge "LayoutLib: TypedArray.getDimensionPixelSize can actually return <0" into honeycomb-mr1 2011-03-17 14:12:49 -07:00
Xavier Ducrohet
67450db03e LayoutLib: TypedArray.getDimensionPixelSize can actually return <0 
Change-Id: I17853dc242e28f0c59916cad1b2a57beed480a57
 2011-03-17 14:11:23 -07:00
Eric Fischer
8dc09ed5f1 am c3a785cb: (-s ours) am b05fea7d: am e6ef8d0b: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit 'c3a785cbc63e9947f5aec868fafe708e7a8b6731':
  Import revised translations.  DO NOT MERGE
 2011-03-17 13:39:07 -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
e6ef8d0b75 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-17 13:29:47 -07:00
Eric Fischer
00436f9bfb Import revised translations. DO NOT MERGE 
Change-Id: I774c6b4e13d3cb53b2364360f6f888e548110e7f
 2011-03-17 13:11:01 -07:00
James Dong
be3c82f25d am 782ffe91: am 9c0c5b56: am 2f1f2248: Fix missing AOSP copyright headers for a bunch of media framework files 
* commit '782ffe91da665c6b1fb9e297faa6e0dc6035f40c':
  Fix missing AOSP copyright headers for a bunch of media framework files
 2011-03-17 12:38:58 -07:00
Gloria Wang
454b2d1c34 am 2c3257b2: am 9940c8b6: am def35f7a: Merge "Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls" into honeycomb-mr1 
* commit '2c3257b21ddf2a3da843f11d1bb3b4fa8e912707':
  Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses   DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls
 2011-03-17 12:38:40 -07:00
James Dong
782ffe91da am 9c0c5b56: am 2f1f2248: Fix missing AOSP copyright headers for a bunch of media framework files 
* commit '9c0c5b5638fd2810b68e033963026cc1830b9ade':
  Fix missing AOSP copyright headers for a bunch of media framework files
 2011-03-17 12:31:09 -07:00
Gloria Wang
2c3257b21d am 9940c8b6: am def35f7a: Merge "Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls" into honeycomb-mr1 
* commit '9940c8b6c8ab1711c9ee77cb9288888879b0b310':
  Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses   DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls
 2011-03-17 12:30:52 -07:00
Romain Guy
08aa2cbd5e Send WebView the current transform and whether we're drawing a layer. 
Bug #3275491

These can be used by WebView to correctly apply alpha and geometric
transforms.

Change-Id: I2ecd4376d68df886dead3c9240317de33f56828f
 2011-03-17 12:04:04 -07:00
James Dong
9c0c5b5638 am 2f1f2248: Fix missing AOSP copyright headers for a bunch of media framework files 
* commit '2f1f2248c8439adbd686810e306c55f9e6a5abc3':
  Fix missing AOSP copyright headers for a bunch of media framework files
 2011-03-17 11:56:05 -07:00
James Dong
2f1f2248c8 Fix missing AOSP copyright headers for a bunch of media framework files 
bug - 4119349

Change-Id: If5924e16a5f596d5d73d9beb66eaf5ac9a6f0e50
 2011-03-17 11:10:40 -07:00
Gloria Wang
9940c8b6c8 am def35f7a: Merge "Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls" into honeycomb-mr1 
* commit 'def35f7a47cde8bf66d4cba4570b289e0e9d625a':
  Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses   DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls
 2011-03-17 10:54:00 -07:00
Gloria Wang
def35f7a47 Merge "Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls" into honeycomb-mr1 2011-03-17 10:49:43 -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
Paul Milovanov
65cf7edf42 am 074903a9: am eca7ff02: am 87f50f19: Merge "PACKAGE_FIRST_LAUNCH intent sent to wrong pkg" into honeycomb-mr1 
* commit '074903a95b2e48ee6431eb7a586dfa541e08d559':
  PACKAGE_FIRST_LAUNCH intent sent to wrong pkg
 2011-03-17 10:33:02 -07:00
Paul Milovanov
074903a95b am eca7ff02: am 87f50f19: Merge "PACKAGE_FIRST_LAUNCH intent sent to wrong pkg" into honeycomb-mr1 
* commit 'eca7ff02fb6e75d4355565f05abf8f3af51731a0':
  PACKAGE_FIRST_LAUNCH intent sent to wrong pkg
 2011-03-17 10:29:50 -07:00
Paul Milovanov
eca7ff02fb am 87f50f19: Merge "PACKAGE_FIRST_LAUNCH intent sent to wrong pkg" into honeycomb-mr1 
* commit '87f50f19eef2e70fcf7294c3b9cd5ca0344b99ee':
  PACKAGE_FIRST_LAUNCH intent sent to wrong pkg
 2011-03-17 10:26:32 -07:00
Paul Milovanov
87f50f19ee Merge "PACKAGE_FIRST_LAUNCH intent sent to wrong pkg" into honeycomb-mr1 2011-03-17 10:23:48 -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
Brad Fitzpatrick
d973bed36c Merge "Removing dead store; it was likely a relict of debuging code." 2011-03-17 09:51:47 -07:00
Mike Lockwood
630e6d7d26 am 132b23f8: am c97022e7: am 11473332: Merge "MtpServer: Do not attempt to stop MTP if it has not been started" into honeycomb-mr1 
* commit '132b23f84905060163be6a30d718074cd4e1770d':
  MtpServer: Do not attempt to stop MTP if it has not been started
 2011-03-17 07:30:53 -07:00
Mike Lockwood
132b23f849 am c97022e7: am 11473332: Merge "MtpServer: Do not attempt to stop MTP if it has not been started" into honeycomb-mr1 
* commit 'c97022e7acc6da71e558e9137036622b4c77ca46':
  MtpServer: Do not attempt to stop MTP if it has not been started
 2011-03-17 07:28:26 -07:00
Mike Lockwood
c97022e7ac am 11473332: Merge "MtpServer: Do not attempt to stop MTP if it has not been started" into honeycomb-mr1 
* commit '11473332b4df78610ebb903e255d69ab35e5bf59':
  MtpServer: Do not attempt to stop MTP if it has not been started
 2011-03-17 07:26:44 -07:00
Mike Lockwood
11473332b4 Merge "MtpServer: Do not attempt to stop MTP if it has not been started" into honeycomb-mr1 2011-03-17 07:24:12 -07:00
Mike Lockwood
a3f8514492 MtpServer: Do not attempt to stop MTP if it has not been started 
Fixes an ANR that occurred if we got a USB disconnected event
before the MTP service had started.

Bug: 4118033

Change-Id: I6cad4281a5911a9926cae923f34d3a6bf98346c5
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-17 09:43:50 -04:00
Daniel Sandler
f6ac83bef9 am 1b4890c9: am 45026366: am 8f5cab8b: Merge "Remove logspew." into honeycomb-mr1 
* commit '1b4890c96898ee9e66380a5513c88f858bbd0dc3':
  Remove logspew.
 2011-03-17 06:40:37 -07:00
Daniel Sandler
1b4890c968 am 45026366: am 8f5cab8b: Merge "Remove logspew." into honeycomb-mr1 
* commit '4502636629ebb3f2ebb8521241c364666d1d7345':
  Remove logspew.
 2011-03-17 06:35:54 -07:00
Daniel Sandler
4502636629 am 8f5cab8b: Merge "Remove logspew." into honeycomb-mr1 
* commit '8f5cab8b31014a261f4e6e12e6d751de51de37c3':
  Remove logspew.
 2011-03-17 06:31:56 -07:00
Daniel Sandler
8f5cab8b31 Merge "Remove logspew." into honeycomb-mr1 2011-03-17 06:23:45 -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
f8d1533b07 Merge "Fix bug 4111271 and bug 4077526 - WebView touch event handling when WebCore is too slow" into honeycomb-mr1 2011-03-17 01:36:47 -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
Jeff Brown
8cb373ad85 am e5feed7e: am 244eb34a: am d98f8aff: Merge "Fix dangling pointer when device closed just after opening." into honeycomb-mr1 
* commit 'e5feed7e5ded92b8af4b5548144b6b8a45491a61':
  Fix dangling pointer when device closed just after opening.
 2011-03-17 01:03:56 -07:00
Jeff Brown
e5feed7e5d am 244eb34a: am d98f8aff: Merge "Fix dangling pointer when device closed just after opening." into honeycomb-mr1 
* commit '244eb34a6712688fa87653dd3e2e2d05cd568eec':
  Fix dangling pointer when device closed just after opening.
 2011-03-17 01:02:28 -07:00