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

112409 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Hao
5e70f2fb90 am 2c57b903: am 482dfd55: am 6110d16b: Merge "Change IsMethodTracingActive to GetMethodTracingMode for frameworks." 
* commit '2c57b903554d3953f94b18752d10240ae7e25e1b':
  Change IsMethodTracingActive to GetMethodTracingMode for frameworks.
 2013-08-30 15:23:35 -07:00
Jeff Hao
2c57b90355 am 482dfd55: am 6110d16b: Merge "Change IsMethodTracingActive to GetMethodTracingMode for frameworks." 
* commit '482dfd55485cbd179910dc01e1d29543476675ed':
  Change IsMethodTracingActive to GetMethodTracingMode for frameworks.
 2013-08-30 15:20:37 -07:00
Jeff Hao
482dfd5548 am 6110d16b: Merge "Change IsMethodTracingActive to GetMethodTracingMode for frameworks." 
* commit '6110d16b8dd08d276902d2c6d8e90562a3d3694d':
  Change IsMethodTracingActive to GetMethodTracingMode for frameworks.
 2013-08-30 15:19:01 -07:00
Jeff Hao
6110d16b8d Merge "Change IsMethodTracingActive to GetMethodTracingMode for frameworks." 2013-08-30 22:17:12 +00:00
Jonathan Dixon
69f9f9305c Add tracing to WebView API methods and callbacks 
Bug: 10488419

This is useful for debugging numerous SxS issues.

Change-Id: I5d0d2e253499741c5f9454582988c99e42dc0a81
 2013-08-30 15:07:25 -07:00
Lajos Molnar
af30982435 VideoView: add addSubtitleSource 
A way to add external subtitle file to VideoView.

Change-Id: Ic110238408550a5b4088851bc5da5e94eb58d831
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 10326117
 2013-08-30 14:59:46 -07:00
Matthew Williams
c5d0d9cd78 am eea358a7: (-s ours) am 9d7c4d4a: Merge "DO NOT MERGE. Remove service component for KLP." into klp-dev 
* commit 'eea358a70b48f7611ce1544d3e09ef9a4abc76ce':
  DO NOT MERGE. Remove service component for KLP.
 2013-08-30 14:46:27 -07:00
Alan Viverette
3f9832d3c7 Fix pre tag formatting in getDragToOpenListener documentation 
BUG: 10549164
Change-Id: Ie3e05e918edbd737326c724e4e712279ac410238
 2013-08-30 14:43:25 -07:00
Alan Viverette
8d1a22f0a8 am 3e09c1a3: am 083199ef: Merge "Update captioning APIs" into klp-dev 
* commit '3e09c1a3c63b242b6d83671e8409f44d371cb9a3':
  Update captioning APIs
 2013-08-30 14:42:49 -07:00
Matthew Williams
eea358a70b am 9d7c4d4a: Merge "DO NOT MERGE. Remove service component for KLP." into klp-dev 
* commit '9d7c4d4a6e4683862931b3a11c974715073514ab':
  DO NOT MERGE. Remove service component for KLP.
 2013-08-30 14:42:02 -07:00
Jeff Hao
6f0a04f5d2 Change IsMethodTracingActive to GetMethodTracingMode for frameworks. 
(cherry picked from commit ffbe799f3824f4be705ca726988355d3943a9004)

Change-Id: Ic87a254171fca7dfdf02c8643cd367055c8889cd
 2013-08-30 14:40:26 -07:00
Matthew Williams
9d7c4d4a6e Merge "DO NOT MERGE. Remove service component for KLP." into klp-dev 2013-08-30 21:39:15 +00:00
Alan Viverette
3e09c1a3c6 am 083199ef: Merge "Update captioning APIs" into klp-dev 
* commit '083199efed839274619eb7a003a7d7c9229e5ffc':
  Update captioning APIs
 2013-08-30 14:38:20 -07:00
Alan Viverette
083199efed Merge "Update captioning APIs" into klp-dev 2013-08-30 21:34:43 +00:00
Alan Viverette
cb168795fe Update internal AutoScrollHelper to match support lib version 
BUG: 10547956
Change-Id: I7d5b1b9fb89ae8ff4294cc2dfd01e29b55ed3eba
 2013-08-30 14:33:13 -07:00
Matthew Williams
6222288bfb DO NOT MERGE. Remove service component for KLP. 
1) As discussed, lack of internal clients -> remove SyncService
component from KLP. This CL reverts that addition.
2) Also includes javadoc cleanup of existing API.
3) Fix naming of allowMetered() -> disallowMetered() in API
4) Removed one-off sync in the future, as it doesn't make sense
for sync adapters.

Change-Id: I1b17094e6edafb2955cdfb99f39b44274fbe86f9
 2013-08-30 21:28:53 +00:00
Jeff Hao
c0a38c227e am 3a9c7161: am 6627e5b2: Merge "Change IsMethodTracingActive to GetMethodTracingMode for frameworks." into klp-dev 
* commit '3a9c7161dfd6f16baddd2eb209a013609b927da7':
  Change IsMethodTracingActive to GetMethodTracingMode for frameworks.
 2013-08-30 14:17:27 -07:00
Jesse Hall
e721327ee7 am 64582578: am 655cff17: Merge "EGL10.eglCreateWindowSurface should set producerControlledByApp" into klp-dev 
* commit '6458257836da466347f1d82a78c9c3ca3f16ec33':
  EGL10.eglCreateWindowSurface should set producerControlledByApp
 2013-08-30 14:17:22 -07:00
Jeff Hao
3a9c7161df am 6627e5b2: Merge "Change IsMethodTracingActive to GetMethodTracingMode for frameworks." into klp-dev 
* commit '6627e5b2aef2783cfa505a48195d7b8153eda25c':
  Change IsMethodTracingActive to GetMethodTracingMode for frameworks.
 2013-08-30 14:15:46 -07:00
Jesse Hall
6458257836 am 655cff17: Merge "EGL10.eglCreateWindowSurface should set producerControlledByApp" into klp-dev 
* commit '655cff1799c3b7cce616676500e38bf43f83bc34':
  EGL10.eglCreateWindowSurface should set producerControlledByApp
 2013-08-30 14:12:10 -07:00
Jeff Hao
6627e5b2ae Merge "Change IsMethodTracingActive to GetMethodTracingMode for frameworks." into klp-dev 2013-08-30 21:10:40 +00:00
Jesse Hall
655cff1799 Merge "EGL10.eglCreateWindowSurface should set producerControlledByApp" into klp-dev 2013-08-30 21:09:12 +00:00
Ed Tam
468c60b334 am 00e4c672: am f85aa0fc: Merge "Telephony: SMS over IMS, DO NOT MERGE" into jb-mr2-dev 
* commit '00e4c6721b344eca1d8b0de0e82e5de6f4f21f16':
  Telephony: SMS over IMS, DO NOT MERGE
 2013-08-30 14:06:47 -07:00
Ed Tam
00e4c6721b am f85aa0fc: Merge "Telephony: SMS over IMS, DO NOT MERGE" into jb-mr2-dev 
* commit 'f85aa0fc12edccf529dbaf0340372bf3a19bc4be':
  Telephony: SMS over IMS, DO NOT MERGE
 2013-08-30 14:04:45 -07:00
Ed Tam
f85aa0fc12 Merge "Telephony: SMS over IMS, DO NOT MERGE" into jb-mr2-dev 2013-08-30 20:50:36 +00:00
Jesse Hall
0fa257fe53 EGL10.eglCreateWindowSurface should set producerControlledByApp 
Bug: 10521699
Change-Id: Ief3f01edf7dabc7996b7af1a756dfd00f0987f1a
 2013-08-30 13:49:14 -07:00
Jim Miller
c1693cab70 am bd77aa6b: am dd238b56: Merge "Attempt to fix missing clock bug" into klp-dev 
* commit 'bd77aa6bfda755a250be36581f95f0da8e7241a7':
  Attempt to fix missing clock bug
 2013-08-30 12:59:00 -07:00
Jim Miller
bd77aa6bfd am dd238b56: Merge "Attempt to fix missing clock bug" into klp-dev 
* commit 'dd238b5604e14d0da458f9b7589097d365a9dfd1':
  Attempt to fix missing clock bug
 2013-08-30 12:56:52 -07:00
Jim Miller
dd238b5604 Merge "Attempt to fix missing clock bug" into klp-dev 2013-08-30 19:55:42 +00:00
Vinit Deshapnde
29bb646a74 am 52105c17: am 90b91805: Merge "Synchronize access to single supplicant path" into klp-dev 
* commit '52105c17e1bae851514dc0ab8f2034b08b22c648':
  Synchronize access to single supplicant path
 2013-08-30 12:53:28 -07:00
Vinit Deshapnde
52105c17e1 am 90b91805: Merge "Synchronize access to single supplicant path" into klp-dev 
* commit '90b9180580128b337b76a5de72d8f76646ec5aec':
  Synchronize access to single supplicant path
 2013-08-30 12:50:20 -07:00
Vinit Deshapnde
90b9180580 Merge "Synchronize access to single supplicant path" into klp-dev 2013-08-30 19:48:13 +00:00
Vinit Deshapnde
fab5c2b28e Synchronize access to single supplicant path 
Both wlan0 and p2p0 state machines are accessing the supplicant socket
simultaneously; and may get responses of each other's command. This
change introduces synchronization between these two processes.

Bug: 10375978
Change-Id: I0ac0b2771311b642affc353958cc9ba2e5dd5716
 2013-08-30 12:31:25 -07:00
Jonathan Dixon
7d2d7235a0 am cfb0048b: am 7ef3bfec: Merge "Remove WebViewClassic specific test code" into klp-dev 
* commit 'cfb0048b714fa52e8bfb9884357d36c1490a3edc':
  Remove WebViewClassic specific test code
 2013-08-30 12:21:05 -07:00
Jonathan Dixon
cfb0048b71 am 7ef3bfec: Merge "Remove WebViewClassic specific test code" into klp-dev 
* commit '7ef3bfec0aa171460d0c0a1072a887a1ce830206':
  Remove WebViewClassic specific test code
 2013-08-30 12:18:29 -07:00
Jonathan Dixon
7ef3bfec0a Merge "Remove WebViewClassic specific test code" into klp-dev 2013-08-30 19:15:41 +00:00
Zhentao Sun
e1985c1073 am 34515fd7: am ef9778ba: Merge "Fixed b/10512887." into klp-dev 
* commit '34515fd78894c5eaa6e577c65e61d3266129e2c0':
  Fixed b/10512887.
 2013-08-30 12:15:31 -07:00
Zhentao Sun
34515fd788 am ef9778ba: Merge "Fixed b/10512887." into klp-dev 
* commit 'ef9778ba39d73f67970f674893d56e48407823fd':
  Fixed b/10512887.
 2013-08-30 12:13:00 -07:00
Zhentao Sun
ef9778ba39 Merge "Fixed b/10512887." into klp-dev 2013-08-30 19:11:29 +00:00
Martijn Coenen
52246087f4 HCE API review. 
Keeping some of the old stuff @hide until all
clients have upgraded.

Bug: 10550349
Change-Id: Id5de7ab74c9b38c179fd20bd4746d95b7df8f033
 2013-08-30 11:29:45 -07:00
Fabrice Di Meglio
3265685e4d am 9385d515: am e3d64640: Merge "Fix bug #10549094 KLP API Review: android.util.LayoutDirection" into klp-dev 
* commit '9385d5153e20dc4125d4e0519b0a82de143b5194':
  Fix bug #10549094 KLP API Review: android.util.LayoutDirection
 2013-08-30 11:06:19 -07:00
Fabrice Di Meglio
9385d5153e am e3d64640: Merge "Fix bug #10549094 KLP API Review: android.util.LayoutDirection" into klp-dev 
* commit 'e3d64640f1083797cb188f08ff55a7d435f93eb9':
  Fix bug #10549094 KLP API Review: android.util.LayoutDirection
 2013-08-30 11:03:48 -07:00
Jeff Hao
ac27705f75 Change IsMethodTracingActive to GetMethodTracingMode for frameworks. 
Bug: 9968521

Change-Id: Ic63340e0d2fef18f27fdfabdd056ac5304c3d54f
(cherry picked from commit ffbe799f3824f4be705ca726988355d3943a9004)
 2013-08-30 18:02:52 +00:00
Fabrice Di Meglio
e3d64640f1 Merge "Fix bug #10549094 KLP API Review: android.util.LayoutDirection" into klp-dev 2013-08-30 18:00:19 +00:00
Selim Gurun
1b62b6e796 am 629cafb6: (-s ours) am 51e4c4c1: Merge "DO NOT MERGE Printing API changes for supporting better page layout" into klp-dev 
* commit '629cafb69331066fda0af7751726ad0933d05a27':
  DO NOT MERGE Printing API changes for supporting better page layout
 2013-08-30 10:17:52 -07:00
Selim Gurun
629cafb693 am 51e4c4c1: Merge "DO NOT MERGE Printing API changes for supporting better page layout" into klp-dev 
* commit '51e4c4c13b75ecd47e328b0f4487ba9918a62589':
  DO NOT MERGE Printing API changes for supporting better page layout
 2013-08-30 10:16:11 -07:00
Tom O'Neill
546113d4c2 Improve constant names for settings injection API 
- Add timing for getStatus() call to encourage implementors to be fast

- Affects b/10461474

Change-Id: I503cbae5cf27008c587a39ab4e60d8e09daedecc
 2013-08-30 10:09:39 -07:00
Selim Gurun
51e4c4c13b Merge "DO NOT MERGE Printing API changes for supporting better page layout" into klp-dev 2013-08-30 17:09:23 +00:00
John Spurlock
242f98c1fc am 2d68a25b: am b7cdbcef: Add a few SystemUI xxhdpi stragglers. 
* commit '2d68a25bd6535668b14bab043f7f7d477d8f2620':
  Add a few SystemUI xxhdpi stragglers.
 2013-08-30 08:44:59 -07:00
John Spurlock
2d68a25bd6 am b7cdbcef: Add a few SystemUI xxhdpi stragglers. 
* commit 'b7cdbcef9ed9ff45e57b9cb6b4148bc74eb569a0':
  Add a few SystemUI xxhdpi stragglers.
 2013-08-30 08:43:01 -07:00