Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
205,398 Commits 3 Branches 0 Tags
a4da90dbabca0dc54424dec09f4da98a0903a81a
Commit Graph

55248 Commits

Author SHA1 Message Date
Jeff Sharkey
a4da90dbab am 28339797: am 6e77499a: am fb10a760: am 79204a32: am 15369c6c: Merge "Fix volume naming when surfaced over MTP." into mnc-dev 
* commit '28339797043834e5f1cd196363ef3cfdd66607ad':
  Fix volume naming when surfaced over MTP.
 2015-07-08 02:05:19 +00:00
Alan Viverette
b6bd296f60 am 6dcbc0a5: am 382fe3b8: am 292a1564: am 407630e7: am f12c91f5: Merge "Remember focused child during layout when adapter has stable IDs" into mnc-dev 
* commit '6dcbc0a578100b0484c199e64be251cbb5212330':
  Remember focused child during layout when adapter has stable IDs
 2015-07-08 02:04:57 +00:00
Chien-Yu Chen
2748e8c8d5 am 392b917e: am 61430694: am 843236b6: am abd68058: am 3054f595: Merge "Camera2: implement Key.toString()" into mnc-dev 
* commit '392b917e1b25e1a1a8dfe3ec054058e82ded56ce':
  Camera2: implement Key.toString()
 2015-07-08 02:04:11 +00:00
Chien-Yu Chen
b07de6d418 am 32ade1ab: am 1ae0a7d3: am dd21689b: am cceb8268: am 69421363: Merge "ImageWriter: Exception when Surface is abandoned" into mnc-dev 
* commit '32ade1ab7b7a3ca11a586abda99b3f9a8b5b8ec8':
  ImageWriter: Exception when Surface is abandoned
 2015-07-08 02:03:55 +00:00
Adam Powell
6147a9f272 am 2ed09409: am 940abed2: am 6f3f660c: am 24bf1226: am e9cbf415: Merge "Sort and limit ChooserActivity targets from ChooserTargetServices" into mnc-dev 
* commit '2ed094090a36c00fce96bc288bc544fe28ae9fcf':
  Sort and limit ChooserActivity targets from ChooserTargetServices
 2015-07-08 02:03:42 +00:00
Eino-Ville Talvala
810bc8d335 am af72d92b: am 314877b8: am 2915f3c6: am 26dfd03d: am 384a04d9: Merge "Camera: Add ZERO_SHUTTER_LAG modes to noise reduction and edge enhancement" into mnc-dev 
* commit 'af72d92bf124697dd2f4528a730806c56bff503d':
  Camera: Add ZERO_SHUTTER_LAG modes to noise reduction and edge enhancement
 2015-07-08 02:03:35 +00:00
Alan Viverette
b2cc376e8c am 75f4278d: am 3c254aba: am 90433ee7: am e89c65fb: am 8830db0a: Merge "Never fully detach header or footer views in AbsListView" into mnc-dev 
* commit '75f4278d73d701191ad82cb0e3b5566feff8d873':
  Never fully detach header or footer views in AbsListView
 2015-07-08 02:03:18 +00:00
Dongwon Kang
0d74a94eb2 am 6ac3a485: am e94f5f55: am 279864ca: am aaac72ac: am 0c582293: Merge "Revert "Use AlertDialog for MediaRouteControllerDialog"" into mnc-dev 
* commit '6ac3a485440c5b6ee73b55d53863d299fd6308c7':
  Revert "Use AlertDialog for MediaRouteControllerDialog"
 2015-07-08 02:02:49 +00:00
Aravind Akella
5baa0e4a35 am f606595c: am 5444b6be: am 1656c024: am 2ea6c646: am c5889757: Merge "Clean up get sensorList." into mnc-dev 
* commit 'f606595c7697060663b234dc31fbf2cb79419ed5':
  Clean up get sensorList.
 2015-07-08 02:02:29 +00:00
Jeff Sharkey
2833979704 am 6e77499a: am fb10a760: am 79204a32: am 15369c6c: Merge "Fix volume naming when surfaced over MTP." into mnc-dev 
* commit '6e77499a04e5aa379236e2dcbaf959e1f562e6ef':
  Fix volume naming when surfaced over MTP.
 2015-07-08 01:39:34 +00:00
Alan Viverette
6dcbc0a578 am 382fe3b8: am 292a1564: am 407630e7: am f12c91f5: Merge "Remember focused child during layout when adapter has stable IDs" into mnc-dev 
* commit '382fe3b82bda9898fbb288f947c9d85fa507c6c3':
  Remember focused child during layout when adapter has stable IDs
 2015-07-08 01:39:15 +00:00
Chien-Yu Chen
392b917e1b am 61430694: am 843236b6: am abd68058: am 3054f595: Merge "Camera2: implement Key.toString()" into mnc-dev 
* commit '6143069410d8f56a97b6c848f1dff812581f0ab7':
  Camera2: implement Key.toString()
 2015-07-08 01:38:04 +00:00
Chien-Yu Chen
32ade1ab7b am 1ae0a7d3: am dd21689b: am cceb8268: am 69421363: Merge "ImageWriter: Exception when Surface is abandoned" into mnc-dev 
* commit '1ae0a7d39bfe87d0857268070cbf0ff7fa666e37':
  ImageWriter: Exception when Surface is abandoned
 2015-07-08 01:37:52 +00:00
Adam Powell
2ed094090a am 940abed2: am 6f3f660c: am 24bf1226: am e9cbf415: Merge "Sort and limit ChooserActivity targets from ChooserTargetServices" into mnc-dev 
* commit '940abed246f37454426f56c9cbb37e12ec4cdfb5':
  Sort and limit ChooserActivity targets from ChooserTargetServices
 2015-07-08 01:37:38 +00:00
Eino-Ville Talvala
af72d92bf1 am 314877b8: am 2915f3c6: am 26dfd03d: am 384a04d9: Merge "Camera: Add ZERO_SHUTTER_LAG modes to noise reduction and edge enhancement" into mnc-dev 
* commit '314877b849dee7c5b06a2cd282c74ce9bbb35fc1':
  Camera: Add ZERO_SHUTTER_LAG modes to noise reduction and edge enhancement
 2015-07-08 01:37:25 +00:00
Alan Viverette
75f4278d73 am 3c254aba: am 90433ee7: am e89c65fb: am 8830db0a: Merge "Never fully detach header or footer views in AbsListView" into mnc-dev 
* commit '3c254abac56e145dae11d86254bd4a7e0a2b5397':
  Never fully detach header or footer views in AbsListView
 2015-07-08 01:37:09 +00:00
Dongwon Kang
6ac3a48544 am e94f5f55: am 279864ca: am aaac72ac: am 0c582293: Merge "Revert "Use AlertDialog for MediaRouteControllerDialog"" into mnc-dev 
* commit 'e94f5f556f5a46cf6745ae642d245ca712e1f254':
  Revert "Use AlertDialog for MediaRouteControllerDialog"
 2015-07-08 01:36:36 +00:00
Aravind Akella
f606595c76 am 5444b6be: am 1656c024: am 2ea6c646: am c5889757: Merge "Clean up get sensorList." into mnc-dev 
* commit '5444b6be805d51964f19c8437e322a676ad8ea2a':
  Clean up get sensorList.
 2015-07-08 01:36:17 +00:00
Jeff Sharkey
15369c6c3b Merge "Fix volume naming when surfaced over MTP." into mnc-dev 2015-07-07 23:42:44 +00:00
Alan Viverette
f12c91f5e6 Merge "Remember focused child during layout when adapter has stable IDs" into mnc-dev 2015-07-07 23:26:36 +00:00
Chien-Yu Chen
3054f59514 Merge "Camera2: implement Key.toString()" into mnc-dev 2015-07-07 22:17:08 +00:00
Chien-Yu Chen
69421363c6 Merge "ImageWriter: Exception when Surface is abandoned" into mnc-dev 2015-07-07 22:16:10 +00:00
Adam Powell
e9cbf41561 Merge "Sort and limit ChooserActivity targets from ChooserTargetServices" into mnc-dev 2015-07-07 21:55:45 +00:00
Jeff Sharkey
7a788a865e Fix volume naming when surfaced over MTP. 
Otherwise we show everything as "Unknown."

Bug: 22256092
Change-Id: I19fe8a25aff02db8ca9aff288e6715d469f65327
 2015-07-07 14:40:28 -07:00
Eino-Ville Talvala
384a04d936 Merge "Camera: Add ZERO_SHUTTER_LAG modes to noise reduction and edge enhancement" into mnc-dev 2015-07-07 21:36:47 +00:00
Alan Viverette
8830db0a6a Merge "Never fully detach header or footer views in AbsListView" into mnc-dev 2015-07-07 21:08:32 +00:00
Eino-Ville Talvala
0dd17509a9 Camera: Add ZERO_SHUTTER_LAG modes to noise reduction and edge enhancement 
This mode splits processing quality based on stream resolution, to
enable ZSL operation where low-resolution (preview/recording) streams
require more processing since they are immediately user-visible, while
the high-resolution intermediate ZSL stream should have minimal/no
processing since it will be reprocessed into final quality when
necessary

Bug: 22266686

Change-Id: Ib41102b66b07d61a099f021f8c6251f28c62686f
 2015-07-07 13:39:55 -07:00
Chris Craik
42afac8864 am 7f6a3303: am b5892a41: am 93d7725b: am 268ad521: am 6ef57e97: Merge "Don\'t update DisplayLists when dumping" into mnc-dev 
* commit '7f6a33039ab9c560fae8c09f88a7f694a2722fba':
  Don't update DisplayLists when dumping
 2015-07-07 20:37:44 +00:00
Dongwon Kang
0c58229306 Merge "Revert "Use AlertDialog for MediaRouteControllerDialog"" into mnc-dev 2015-07-07 20:22:40 +00:00
Aravind Akella
c5889757cb Merge "Clean up get sensorList." into mnc-dev 2015-07-07 19:53:46 +00:00
Chris Craik
7f6a33039a am b5892a41: am 93d7725b: am 268ad521: am 6ef57e97: Merge "Don\'t update DisplayLists when dumping" into mnc-dev 
* commit 'b5892a4156c446d875838cce3404579d8f066ca3':
  Don't update DisplayLists when dumping
 2015-07-07 19:47:16 +00:00
Chien-Yu Chen
12a8385b7e Camera2: implement Key.toString() 
Implement toString() for CameraCharacteristics.Key,
CaptureResult.Key, and CaptureRequest.Key.

Bug: 22279124
Change-Id: Ib1076e3f6d7bcbffbb148a7a01f72133daccebb8
 2015-07-07 12:17:22 -07:00
Ian Pedowitz
ecb7af7d10 am 0a5e18bf: am a3599c78: am 8ea98a8a: am 13c2a4f5: am 937edac8: Revert "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" 
* commit '0a5e18bfe23f4b256bbda995a1f3e383fa979ee3':
  Revert "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission"
 2015-07-07 19:09:08 +00:00
Zoltan Szatmary-Ban
daed4c4c3e am 91a92009: am 6ad79259: am 745873f4: am bf307991: am 41df5bfc: Merge "Update javadoc on DPM.setGlobalSetting" into mnc-dev 
* commit '91a920099f871125bab78f7843bedf6984c2a71b':
  Update javadoc on DPM.setGlobalSetting
 2015-07-07 19:08:38 +00:00
Richard Coles
1636ad867e am 4683bea8: am 2ec1f9d5: am 604e0cc7: am 2bb68288: am fad2e49c: Merge "Add WebView permission MIDI sysex" into mnc-dev 
* commit '4683bea8b60285e7480f997b6fb4c0e2e9f6106b':
  Add WebView permission MIDI sysex
 2015-07-07 19:08:30 +00:00
Andrei Stingaceanu
734d61c2c2 am 4a981c3a: am 8f40a25d: am 5fcfa576: am bb09a7cd: am bc687f96: Merge "Drag handles persist after lost focus in extracted mode" into mnc-dev 
* commit '4a981c3a25cdce5d3a5c95beb7c2215476309d45':
  Drag handles persist after lost focus in extracted mode
 2015-07-07 19:08:16 +00:00
Chris Craik
6ef57e9741 Merge "Don't update DisplayLists when dumping" into mnc-dev 2015-07-07 18:42:15 +00:00
Alan Viverette
1638133b3f Never fully detach header or footer views in AbsListView 
AbsListView has special handling of header and footer views that avoids
full attachment; however, we still need to fully detach and reattach
non-header/footer views that cannot be recycled.

Bug: 22239425
Bug: 22238597
Bug: 22214485
Change-Id: Iae5f954fc76522c0a52d0c25e19985ae0196efa2
 2015-07-07 11:04:32 -07:00
Abodunrinwa Toki
c3a75a434c am 2487557a: am 10daed5e: am b9e46b9d: am 0bb0e226: am 4603bd34: Merge "FloatingToolbar: Offset visible rect by the rootview\'s offset" into mnc-dev 
* commit '2487557a168ca06eb4c889fe973de59dee03e199':
  FloatingToolbar: Offset visible rect by the rootview's offset
 2015-07-07 17:45:35 +00:00
Chris Craik
356b5fe086 Don't update DisplayLists when dumping 
bug:22234438

Updating the displaylist is invalid since this debug method isn't
called on the UI thread, and it defeats the purpose of seeing what
the hierarchy is currently rendering.

Change-Id: I10c5cc6dbae8d304559dfc6e863b0ede158d554f
 2015-07-07 10:39:39 -07:00
Ian Pedowitz
0a5e18bfe2 am a3599c78: am 8ea98a8a: am 13c2a4f5: am 937edac8: Revert "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" 
* commit 'a3599c7819fc29880695b30679af3bb327808e7c':
  Revert "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission"
 2015-07-07 17:34:45 +00:00
Zoltan Szatmary-Ban
91a920099f am 6ad79259: am 745873f4: am bf307991: am 41df5bfc: Merge "Update javadoc on DPM.setGlobalSetting" into mnc-dev 
* commit '6ad79259540e9e73c3d4664b03c103a560433db0':
  Update javadoc on DPM.setGlobalSetting
 2015-07-07 17:34:23 +00:00
Richard Coles
4683bea8b6 am 2ec1f9d5: am 604e0cc7: am 2bb68288: am fad2e49c: Merge "Add WebView permission MIDI sysex" into mnc-dev 
* commit '2ec1f9d594f0c5f95db08cbf04830b854e6c701c':
  Add WebView permission MIDI sysex
 2015-07-07 17:34:17 +00:00
Andrei Stingaceanu
4a981c3a25 am 8f40a25d: am 5fcfa576: am bb09a7cd: am bc687f96: Merge "Drag handles persist after lost focus in extracted mode" into mnc-dev 
* commit '8f40a25de70bdb6878a5622fce2818039c4fdfbb':
  Drag handles persist after lost focus in extracted mode
 2015-07-07 17:34:04 +00:00
Abodunrinwa Toki
2487557a16 am 10daed5e: am b9e46b9d: am 0bb0e226: am 4603bd34: Merge "FloatingToolbar: Offset visible rect by the rootview\'s offset" into mnc-dev 
* commit '10daed5ebf3e176a4486721017055c0598740fdf':
  FloatingToolbar: Offset visible rect by the rootview's offset
 2015-07-07 17:33:52 +00:00
Neil Fuller
e24e59c15f am b66e7485: am 23325440: am 50d11ded: Merge "Reimplement LocalSocket methods using android.system.Os" 
* commit 'b66e74857703ca88ba32ec1cefae292a5444d654':
  Reimplement LocalSocket methods using android.system.Os
 2015-07-07 17:00:31 +00:00
Neil Fuller
b66e748577 am 23325440: am 50d11ded: Merge "Reimplement LocalSocket methods using android.system.Os" 
* commit '2332544040d294ee81f64aabebe49c4f548c1337':
  Reimplement LocalSocket methods using android.system.Os
 2015-07-07 16:46:44 +00:00
Neil Fuller
50d11ded0d Merge "Reimplement LocalSocket methods using android.system.Os" 2015-07-07 16:11:48 +00:00
Ian Pedowitz
937edac8e8 Revert "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" 
This reverts commit d6b404c72d.

This CL seems to have broken the build, causing GMSCore to continuously
crash.

Bug: 22313634
Bug: 22312938
Bug: 22314605
Bug: 22308392
Bug: 22307889
 2015-07-07 08:32:44 -07:00
Zoltan Szatmary-Ban
41df5bfc0d Merge "Update javadoc on DPM.setGlobalSetting" into mnc-dev 2015-07-07 10:17:07 +00:00