Commit Graph

49757 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
Richard Coles
fad2e49c42 Merge "Add WebView permission MIDI sysex" into mnc-dev 2015-07-07 10:15:17 +00:00
Andrei Stingaceanu
bc687f96c7 Merge "Drag handles persist after lost focus in extracted mode" into mnc-dev 2015-07-07 09:14:37 +00:00
Chien-Yu Chen
e0ee63046a ImageWriter: Exception when Surface is abandoned
Throw IllegalStateException when queueing or dequeueing an
image if the input surface is already abandoned by the consumer.

Also fix a crash when planes are not initialized when closing
ImageWriter.

Bug: 22279111
Change-Id: I8301920d64a53c45b29e947e52ff323733abbf16
2015-07-06 18:26:28 -07:00
Billy Lau
4ce9ebea91 am bb1a1e5f: am e2835f9f: am 212c006e: am c81ecb6d: Merge "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" into mnc-dev
* commit 'bb1a1e5ffdbf3749f3208d570945c4bcb5ecba3f':
  Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission
2015-07-07 01:17:56 +00:00
Aravind Akella
b566d2090d am 948d4e13: am 61f398fc: am 8cc759a5: am adaa79d7: Merge "Remove flag mDataInjectionMode." into mnc-dev
* commit '948d4e1307dc467c634114e677842be8c89822f1':
  Remove flag mDataInjectionMode.
2015-07-07 01:17:51 +00:00
Billy Lau
c81ecb6d2c Merge "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" into mnc-dev 2015-07-07 00:27:33 +00:00
Aravind Akella
adaa79d722 Merge "Remove flag mDataInjectionMode." into mnc-dev 2015-07-07 00:24:04 +00:00
Billy Lau
d6b404c72d Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission
Raised the protection level of WRITE_SETTINGS permission to appop and also
allowed backwards compatibility with pre23 flag.

Introduced new action to manage write system settings as a new API and
renamed the string that describes the managing of overlay permission.

Change-Id: I939a95b9a8b1ae75bf67aa6d8190c92a8d2001d3
2015-07-07 00:27:53 +01:00
Dianne Hackborn
7a90c53631 am bcbf4641: am 569984f2: am d178b2da: am 5c8498db: Merge "Add easy way to get device idle whitelist." into mnc-dev
* commit 'bcbf46419075a1bd132839a0e4d559de31a61f92':
  Add easy way to get device idle whitelist.
  Don't prevent windows from drawing when they are just moving
  Added support for mid-call enabled SRVCC conference call
  MWI,phantom call,Suppl services, error codes
  Rename VoLTE/WFC enable API to available - add VT available API.
  Avoid IllegalStateException when generating/importing keys.
  docs: Updated M Preview API Overview and Behavior Changes for Preview 2 release.
  Unhide signal strength constants used by getLevel.
2015-07-06 23:10:20 +00:00
Aravind Akella
d4cc5ec230 Remove flag mDataInjectionMode.
Change-Id: Ia7cbe8942168ac57abbb92c1a1ed51c568be94fe
2015-07-06 14:57:23 -07:00
Jorim Jaggi
c5af4f8421 Don't prevent windows from drawing when they are just moving
Bug: 21292010
Change-Id: I0cf459d75e9749afa58a4b8649457b3908c8adeb
2015-07-06 21:12:49 +00:00
Chris Craik
5242e2c947 am 5b0fb51e: am e29b4b11: am e8dab95b: am 74fed612: Merge "Clearer message when failing to draw a SW layer" into mnc-dev
* commit '5b0fb51ef4254c8dd45a988a2772415e163f4f91':
  Clearer message when failing to draw a SW layer
2015-07-06 21:04:40 +00:00
Chris Craik
74fed61233 Merge "Clearer message when failing to draw a SW layer" into mnc-dev 2015-07-06 20:29:57 +00:00
Raph Levien
5a6559ad55 am a8a5706c: am dbc5dbbf: am abbe3136: am 441fc0fc: Merge "Fix problems with StaticLayout indentation" into mnc-dev
* commit 'a8a5706ca1b08dcf1e67c4def9a39dfeee8f9425':
  Fix problems with StaticLayout indentation
2015-07-06 19:18:19 +00:00
Jeff Sharkey
6480393a0d am c2e16e9b: am 63ba1d9e: am d58ddd82: am 246d6984: Merge "Handle missing migration source volume." into mnc-dev
* commit 'c2e16e9b923eaa17e6e0c7a96fe350b5cb7ad6d2':
  Handle missing migration source volume.
2015-07-06 19:17:58 +00:00
Jeff Sharkey
1db64c1938 am ce0965e2: am 262c89dc: am d19555d9: am 38cae6c8: Merge "Reconcile private volumes when mounted." into mnc-dev
* commit 'ce0965e2fa97e8a6c0ce493276ec265ffac8c072':
  Reconcile private volumes when mounted.
2015-07-06 19:17:53 +00:00
Eino-Ville Talvala
01235be610 am 5ee1eb82: am c883d823: am 3fc066f5: am 539d18c5: Merge "Camera2: Remove FREEFORM cropping requirement from FULL" into mnc-dev
* commit '5ee1eb82926381e40d7e239a743e6ac1f65b3577':
  Camera2: Remove FREEFORM cropping requirement from FULL
2015-07-06 19:17:47 +00:00
George Mount
45f21c036c am e9bedb50: am e64f2011: am b3199092: am 20f71891: Merge "Fix Fade out during Activity Transition." into mnc-dev
* commit 'e9bedb508a136609d63ecaa4cce6bb4a1b9fb212':
  Fix Fade out during Activity Transition.
2015-07-06 19:17:31 +00:00
Barnaby James
fa75f27ddf am b908616f: am 413adbe2: am 2691d08c: am c1e3ac32: Merge "Minor doc fixes for VoiceInteractor." into mnc-dev
* commit 'b908616f8d48ea9de92020f89ec4bfeb6b89582e':
  Minor doc fixes for VoiceInteractor.
2015-07-06 19:17:15 +00:00
Raph Levien
12380d04e5 am 87798a13: am 4da2f05b: am 3be9eb46: am 401aa9d8: Merge "Clean up Hyphenator file reading" into mnc-dev
* commit '87798a137ad221c4c900d0f0946559371ce00140':
  Clean up Hyphenator file reading
2015-07-06 19:17:05 +00:00
Raph Levien
441fc0fc68 Merge "Fix problems with StaticLayout indentation" into mnc-dev 2015-07-06 18:08:41 +00:00
Alan Viverette
2b460d08dc Remember focused child during layout when adapter has stable IDs
Ensures behavior is consistent between accessibility focus retention and
keyboard focus retention. Attempts to retain focus when possible.

Bug: 22207825
Change-Id: I62360892f52d456e2128f93a2dbf18f2bc934ef3
2015-07-06 11:01:50 -07:00
Jeff Sharkey
246d698499 Merge "Handle missing migration source volume." into mnc-dev 2015-07-06 17:57:52 +00:00
Jeff Sharkey
38cae6c8bc Merge "Reconcile private volumes when mounted." into mnc-dev 2015-07-06 17:57:46 +00:00
Eino-Ville Talvala
539d18c5a9 Merge "Camera2: Remove FREEFORM cropping requirement from FULL" into mnc-dev 2015-07-06 17:51:48 +00:00