Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
112,384 Commits 3 Branches 0 Tags
afb0317fa09280cc57ccd1ab11efa5dfc8ff2235
Commit Graph

33906 Commits

Author SHA1 Message Date
Igor Murashkin
afb0317fa0 am 6cbd7a8f: am 979cf8e4: Merge "camera2: Don\'t NPE when closing the CameraDevice" into klp-dev 
* commit '6cbd7a8f4fd921ea1b0ad3d1da0580b384a1855e':
  camera2: Don't NPE when closing the CameraDevice
 2013-09-03 17:53:46 -07:00
Alan Viverette
c80531ae5f am f37fb4d9: am 40fbaa79: Merge "Fix pre tag formatting in getDragToOpenListener documentation" into klp-dev 
* commit 'f37fb4d95b6ed790b7c2de5268bd3e20d76aa146':
  Fix pre tag formatting in getDragToOpenListener documentation
 2013-09-03 17:53:43 -07:00
Igor Murashkin
6cbd7a8f4f am 979cf8e4: Merge "camera2: Don\'t NPE when closing the CameraDevice" into klp-dev 
* commit '979cf8e461c6790747b2bb6dcc4c0784ca34dbdd':
  camera2: Don't NPE when closing the CameraDevice
 2013-09-03 17:47:43 -07:00
Alan Viverette
f37fb4d95b am 40fbaa79: Merge "Fix pre tag formatting in getDragToOpenListener documentation" into klp-dev 
* commit '40fbaa79bc31aadefc5dacb314f66b5bcb6d52ae':
  Fix pre tag formatting in getDragToOpenListener documentation
 2013-09-03 17:47:39 -07:00
Aravind Akella
567753c895 am ce025258: am 14abafa1: Merge "Sensor batching. Implementation for registerListener(with batch support) and flush APIs." into klp-dev 
* commit 'ce025258ed12d1885150bae41f367248c0f65f97':
  Sensor batching. Implementation for registerListener(with batch support) and flush APIs.
 2013-09-03 17:45:24 -07:00
Geoffrey Borggaard
ae1010646d am 5ea93036: am 4cf435a0: Merge "UX improvements to the restrictions PIN" into klp-dev 
* commit '5ea9303651ae9c1412eef42b59fb427f177f842e':
  UX improvements to the restrictions PIN
 2013-09-03 17:45:21 -07:00
Igor Murashkin
979cf8e461 Merge "camera2: Don't NPE when closing the CameraDevice" into klp-dev 2013-09-04 00:44:31 +00:00
Alan Viverette
40fbaa79bc Merge "Fix pre tag formatting in getDragToOpenListener documentation" into klp-dev 2013-09-04 00:44:11 +00:00
Aravind Akella
ce025258ed am 14abafa1: Merge "Sensor batching. Implementation for registerListener(with batch support) and flush APIs." into klp-dev 
* commit '14abafa10853d979d184e2e934253aaded105137':
  Sensor batching. Implementation for registerListener(with batch support) and flush APIs.
 2013-09-03 17:43:50 -07:00
Geoffrey Borggaard
5ea9303651 am 4cf435a0: Merge "UX improvements to the restrictions PIN" into klp-dev 
* commit '4cf435a038be4731c06602785f7dab8bee0b55af':
  UX improvements to the restrictions PIN
 2013-09-03 17:43:47 -07:00
Aravind Akella
14abafa108 Merge "Sensor batching. Implementation for registerListener(with batch support) and flush APIs." into klp-dev 2013-09-04 00:41:52 +00:00
Geoffrey Borggaard
4cf435a038 Merge "UX improvements to the restrictions PIN" into klp-dev 2013-09-04 00:41:26 +00:00
Aravind Akella
b4c76b18a3 Sensor batching. Implementation for registerListener(with batch support) and flush APIs. 
Bug: 10109508
Change-Id: I6dfdd986bd8c3368cb568fa7d90abf9c03de9aef
 2013-09-03 17:02:41 -07:00
Alan Viverette
84ae8913a7 am 751176ef: am 6416729c: Merge "Add methods for managing subtitle overlays in VideoView" into klp-dev 
* commit '751176ef3903239dc2de55664c3c1c273917201e':
  Add methods for managing subtitle overlays in VideoView
 2013-09-03 16:57:11 -07:00
Alan Viverette
751176ef39 am 6416729c: Merge "Add methods for managing subtitle overlays in VideoView" into klp-dev 
* commit '6416729c4732be6bcdbc5f303752a9d1885f86d0':
  Add methods for managing subtitle overlays in VideoView
 2013-09-03 16:52:54 -07:00
Alan Viverette
6416729c47 Merge "Add methods for managing subtitle overlays in VideoView" into klp-dev 2013-09-03 23:51:35 +00:00
Alan Viverette
419c8ebbdc am b29cb9ec: am de59baab: Merge "Ensure list scrolling API is in parity with view scrolling API" into klp-dev 
* commit 'b29cb9ec4c343248dfd06b130459db13ae61142d':
  Ensure list scrolling API is in parity with view scrolling API
 2013-09-03 16:38:58 -07:00
Alan Viverette
b29cb9ec4c am de59baab: Merge "Ensure list scrolling API is in parity with view scrolling API" into klp-dev 
* commit 'de59baab31271a186a2f32719abd19a8adbda1e3':
  Ensure list scrolling API is in parity with view scrolling API
 2013-09-03 16:35:56 -07:00
Alan Viverette
de59baab31 Merge "Ensure list scrolling API is in parity with view scrolling API" into klp-dev 2013-09-03 23:33:03 +00:00
Alan Viverette
de213f708f Add methods for managing subtitle overlays in VideoView 
Overlays are added directly to the VideoView, laid out to the
size of the video view, and rendered in draw().

BUG: 10260603
Change-Id: Ie8c30e5e6dcd5c6e1a2063af898afce0108a87bf
 2013-09-03 16:18:42 -07:00
Alan Viverette
ba29906334 Ensure list scrolling API is in parity with view scrolling API 
Change-Id: Icaf533c0085b80f3c52cc026e0da7468698724f9
 2013-09-03 16:01:51 -07:00
Lajos Molnar
3e63d77837 am a7cd8835: am a861245f: Merge "VideoView: add addSubtitleSource" into klp-dev 
* commit 'a7cd8835bb1392d5512012160bc8bd2ccad3efaf':
  VideoView: add addSubtitleSource
 2013-09-03 15:54:54 -07:00
Lajos Molnar
a7cd8835bb am a861245f: Merge "VideoView: add addSubtitleSource" into klp-dev 
* commit 'a861245f06e854d47ff44155ebd3ac0e31c0cb2c':
  VideoView: add addSubtitleSource
 2013-09-03 15:53:28 -07:00
Lajos Molnar
a861245f06 Merge "VideoView: add addSubtitleSource" into klp-dev 2013-09-03 22:51:32 +00:00
Matthew Xie
b90908eb9e am 171f8be4: am 02a25a97: Merge "Block ble adv api based on resource config" into klp-dev 
* commit '171f8be41215c2d9662c2da29329e9c4040fc3e0':
  Block ble adv api based on resource config
 2013-09-03 15:43:24 -07:00
Matthew Xie
171f8be412 am 02a25a97: Merge "Block ble adv api based on resource config" into klp-dev 
* commit '02a25a97a24e06768159ddc2b680c253a2ce71c7':
  Block ble adv api based on resource config
 2013-09-03 15:40:14 -07:00
Matthew Xie
02a25a97a2 Merge "Block ble adv api based on resource config" into klp-dev 2013-09-03 22:36:09 +00:00
Dianne Hackborn
801a7fc41c am 2f3a88b4: am f0abed57: Merge "Fix issue #10461469: KLP API Review: EXTRA_SHUTDOWN_USERSPACE_ONLY" into klp-dev 
* commit '2f3a88b4df96b1557439609c91907ade44d44f2c':
  Fix issue #10461469: KLP API Review: EXTRA_SHUTDOWN_USERSPACE_ONLY
 2013-09-03 15:09:16 -07:00
Dianne Hackborn
2f3a88b4df am f0abed57: Merge "Fix issue #10461469: KLP API Review: EXTRA_SHUTDOWN_USERSPACE_ONLY" into klp-dev 
* commit 'f0abed57397c18f71efe47f02aa69a719390adb5':
  Fix issue #10461469: KLP API Review: EXTRA_SHUTDOWN_USERSPACE_ONLY
 2013-09-03 15:06:05 -07:00
Dianne Hackborn
f0abed5739 Merge "Fix issue #10461469: KLP API Review: EXTRA_SHUTDOWN_USERSPACE_ONLY" into klp-dev 2013-09-03 22:04:44 +00:00
Dianne Hackborn
d318e0b19f Fix issue #10461469: KLP API Review: EXTRA_SHUTDOWN_USERSPACE_ONLY 
Maybe adding more words will make it more clear. :)

Change-Id: Ie729eaba1df542d4ffcd0502ccba3807d641fd72
 2013-09-03 14:55:01 -07:00
Romain Guy
083cdca013 am 3d179241: am 3e8105e2: Merge "Update Bitmap.Config.ARGB_4444 documentation Bug #10510122" into klp-dev 
* commit '3d179241bfbdeb4e293d2b773cfe6a586158d4b0':
  Update Bitmap.Config.ARGB_4444 documentation Bug #10510122
 2013-09-03 14:49:41 -07:00
Romain Guy
3d179241bf am 3e8105e2: Merge "Update Bitmap.Config.ARGB_4444 documentation Bug #10510122" into klp-dev 
* commit '3e8105e212e65005c0ef0ecc345b47eb0bf129bd':
  Update Bitmap.Config.ARGB_4444 documentation Bug #10510122
 2013-09-03 14:46:25 -07:00
Romain Guy
3e8105e212 Merge "Update Bitmap.Config.ARGB_4444 documentation Bug #10510122" into klp-dev 2013-09-03 21:41:39 +00:00
Amith Yamasani
e1f634d37e am 882bfb9d: am 7eed075a: Merge "Don\'t call setLastChosen if it\'s a chooser activity instance" into klp-dev 
* commit '882bfb9ddac6e90db30cb2f6e4bf92c778e18ec5':
  Don't call setLastChosen if it's a chooser activity instance
 2013-09-03 13:27:28 -07:00
Amith Yamasani
882bfb9dda am 7eed075a: Merge "Don\'t call setLastChosen if it\'s a chooser activity instance" into klp-dev 
* commit '7eed075a43479ea646821c798b61b49bf53945b3':
  Don't call setLastChosen if it's a chooser activity instance
 2013-09-03 13:24:52 -07:00
Amith Yamasani
7eed075a43 Merge "Don't call setLastChosen if it's a chooser activity instance" into klp-dev 2013-09-03 20:22:15 +00:00
Martijn Coenen
dca11c9913 am e22cb840: am b143c669: Merge "Add drawable for Apdu Services, fix build." into klp-dev 
* commit 'e22cb840d5691c073d24cfa56c0df7f706fa4405':
  Add drawable for Apdu Services, fix build.
 2013-09-03 12:35:13 -07:00
Martijn Coenen
e22cb840d5 am b143c669: Merge "Add drawable for Apdu Services, fix build." into klp-dev 
* commit 'b143c66987d596d9101a5b12fcd7572d4a6026fb':
  Add drawable for Apdu Services, fix build.
 2013-09-03 12:32:07 -07:00
Amith Yamasani
588dd2a3d6 Don't call setLastChosen if it's a chooser activity instance 
Bug: 10605359
Change-Id: If76f5cf2f45442dc25f9bfbd20a4d671b9caa358
 2013-09-03 12:31:42 -07:00
Martijn Coenen
b143c66987 Merge "Add drawable for Apdu Services, fix build." into klp-dev 2013-09-03 19:29:46 +00:00
Martijn Coenen
c85fb576b8 Add drawable for Apdu Services, fix build. 
Change-Id: I7c138adb60b2efe19377b58b35360cd234628424
 2013-09-03 12:24:18 -07:00
Jonathan Dixon
8c6a71ffd3 resolved conflicts for merge of b5539b68 to master 
Change-Id: I946c5faeed02b5bb2577eb871e53b2e15c67ddae
 2013-09-03 12:15:55 -07:00
Kristian Monsen
b5539b68fc am 073ff1a6: Merge "Add tracing to WebView API methods and callbacks" into klp-dev 
* commit '073ff1a6634b36727af4d00db1a3aef3c8a62568':
  Add tracing to WebView API methods and callbacks
 2013-09-03 11:57:17 -07:00
Kristian Monsen
073ff1a663 Merge "Add tracing to WebView API methods and callbacks" into klp-dev 2013-09-03 18:54:50 +00:00
Martijn Coenen
db587b6bfa am a3c92d65: am fb2f8337: NFC: @hide and remove abstract from processCommandApdu(). 
* commit 'a3c92d65de85a8b861f9aa3d5f7fb32732e73747':
  NFC: @hide and remove abstract from processCommandApdu().
 2013-09-03 11:52:32 -07:00
Romain Guy
25ba1c8694 Update Bitmap.Config.ARGB_4444 documentation 
Bug #10510122

ARGB_4444 is deprecated and always replaced with ARGB_8888.

Change-Id: I0da96216af701a7df00ad35913066fbfa997d790
 2013-09-03 11:50:23 -07:00
Martijn Coenen
a3c92d65de am fb2f8337: NFC: @hide and remove abstract from processCommandApdu(). 
* commit 'fb2f8337f6fca9809156ddbaf0a7fe468bc1329f':
  NFC: @hide and remove abstract from processCommandApdu().
 2013-09-03 11:49:27 -07:00
Martijn Coenen
fb2f8337f6 NFC: @hide and remove abstract from processCommandApdu(). 
Replaced by new version with Bundle extras.

Bug: 10550349
Change-Id: If5f284c6d9b14ab32670ebc84881f459813b5b56
 2013-09-03 11:40:35 -07:00
Svetoslav Ganov
ebc10202c5 am 38c5b2b8: am ad0ec16f: Merge "Bug fixes in the printer dialog activity and fused printer loader." into klp-dev 
* commit '38c5b2b8793e34c2526ba2607c43aa514fdc0479':
  Bug fixes in the printer dialog activity and fused printer loader.
 2013-09-03 11:07:30 -07:00