Commit Graph

49748 Commits

Author SHA1 Message Date
Eino-Ville Talvala
6dbdb75314 am 384a04d9: Merge "Camera: Add ZERO_SHUTTER_LAG modes to noise reduction and edge enhancement" into mnc-dev
* commit '384a04d93622c764bf1e8a69c288957d78b6a4e4':
  Camera: Add ZERO_SHUTTER_LAG modes to noise reduction and edge enhancement
2015-07-07 21:53:12 +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
79dcffbcfd am 8830db0a: Merge "Never fully detach header or footer views in AbsListView" into mnc-dev
* commit '8830db0a6a595f1690cb6f0b76863c3759a8ccbd':
  Never fully detach header or footer views in AbsListView
2015-07-07 21:16:20 +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
8e2a15a31e am c5889757: Merge "Clean up get sensorList." into mnc-dev
* commit 'c5889757cb7474b613db22cc7a0af44fe50661fd':
  Clean up get sensorList.
2015-07-07 20:02:25 +00:00
Aravind Akella
c5889757cb Merge "Clean up get sensorList." into mnc-dev 2015-07-07 19:53:46 +00:00
Chris Craik
2dbd5c0a88 am 6ef57e97: Merge "Don\'t update DisplayLists when dumping" into mnc-dev
* commit '6ef57e974144e05e83ee1bd00f705f0f409f48b3':
  Don't update DisplayLists when dumping
2015-07-07 18:55:57 +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
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
Neil Fuller
1108c06aca 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:45:44 +00:00
Ian Pedowitz
df60365eb3 am 937edac8: Revert "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission"
* commit '937edac8e8583023019b625dd426ebf65169e30d':
  Revert "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission"
2015-07-07 16:18:47 +00:00
Zoltan Szatmary-Ban
2b713c2fd3 am 41df5bfc: Merge "Update javadoc on DPM.setGlobalSetting" into mnc-dev
* commit '41df5bfc0d50d36cb2c46d539043813bebbb1289':
  Update javadoc on DPM.setGlobalSetting
2015-07-07 16:18:12 +00:00
Richard Coles
8befd8be37 am fad2e49c: Merge "Add WebView permission MIDI sysex" into mnc-dev
* commit 'fad2e49c425e2cae88c297cb6cf2ac42e5f6fdd8':
  Add WebView permission MIDI sysex
2015-07-07 16:18:05 +00:00
Andrei Stingaceanu
47859abdb5 am bc687f96: Merge "Drag handles persist after lost focus in extracted mode" into mnc-dev
* commit 'bc687f96c74bd164f5d030cebe80d38274ca336c':
  Drag handles persist after lost focus in extracted mode
2015-07-07 16:17:52 +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
Billy Lau
762bdd3cc9 am c81ecb6d: Merge "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" into mnc-dev
* commit 'c81ecb6d2c6badb5ddbf19f7c90e350cf24322ee':
  Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission
2015-07-07 00:32:26 +00:00
Aravind Akella
e2ab149a2e am adaa79d7: Merge "Remove flag mDataInjectionMode." into mnc-dev
* commit 'adaa79d722dc1b410a3a8b083be5268cbb817ce4':
  Remove flag mDataInjectionMode.
2015-07-07 00:32:19 +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
Jorim Jaggi
716928465b am 28b4fc76: Merge "Don\'t prevent windows from drawing when they are just moving" into mnc-dev
* commit '28b4fc76e2da7b93d9ba7ba75a7d0a512d9ff140':
  Don't prevent windows from drawing when they are just moving
2015-07-06 22:31:55 +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
acb1582040 am 74fed612: Merge "Clearer message when failing to draw a SW layer" into mnc-dev
* commit '74fed612336fad30c8a93a346160ee36c87bd843':
  Clearer message when failing to draw a SW layer
2015-07-06 20:39:55 +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
d226d0af42 am 441fc0fc: Merge "Fix problems with StaticLayout indentation" into mnc-dev
* commit '441fc0fc68140368d5438a6eb5b896b4a9d6ad4e':
  Fix problems with StaticLayout indentation
2015-07-06 18:20:54 +00:00
Jeff Sharkey
69bebf13bd am 246d6984: Merge "Handle missing migration source volume." into mnc-dev
* commit '246d69849951e4dbc0726a7faa58ecb71f7cf460':
  Handle missing migration source volume.
2015-07-06 18:12:11 +00:00
Jeff Sharkey
56aabbea00 am 38cae6c8: Merge "Reconcile private volumes when mounted." into mnc-dev
* commit '38cae6c8bcb86236b21d69f852473351c0c1d82a':
  Reconcile private volumes when mounted.
2015-07-06 18:12:04 +00:00
Raph Levien
441fc0fc68 Merge "Fix problems with StaticLayout indentation" into mnc-dev 2015-07-06 18:08:41 +00:00
Eino-Ville Talvala
59fc17d9b3 am 539d18c5: Merge "Camera2: Remove FREEFORM cropping requirement from FULL" into mnc-dev
* commit '539d18c5a9eac6b2cf23b3af38e2635279a106dd':
  Camera2: Remove FREEFORM cropping requirement from FULL
2015-07-06 17:59:22 +00: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
George Mount
b0df3b27de am 20f71891: Merge "Fix Fade out during Activity Transition." into mnc-dev
* commit '20f71891c4ae420398b96cc6a77f0c43316e6717':
  Fix Fade out during Activity Transition.
2015-07-06 17:34:47 +00:00
George Mount
20f71891c4 Merge "Fix Fade out during Activity Transition." into mnc-dev 2015-07-06 17:25:46 +00:00
George Mount
a7478ab9a7 Fix Fade out during Activity Transition.
Bug 22181705

The Fade Transition sets the transitionAlpha in onTransitionEnd.
I previously changed Visibility to only do it in onAnimationEnd,
so the onTransitionEnd overrides the Visibility's version. This
fixes that change.

Change-Id: I7df478897b6fcfec20999965e297925b65a1448b
2015-07-06 10:23:13 -07:00
Barnaby James
205379adb2 am c1e3ac32: Merge "Minor doc fixes for VoiceInteractor." into mnc-dev
* commit 'c1e3ac321faea5717e1767bf2091334dde310eb7':
  Minor doc fixes for VoiceInteractor.
2015-07-06 17:18:29 +00:00
Barnaby James
c1e3ac321f Merge "Minor doc fixes for VoiceInteractor." into mnc-dev 2015-07-06 17:08:15 +00:00
Raph Levien
28fe20bc82 am 401aa9d8: Merge "Clean up Hyphenator file reading" into mnc-dev
* commit '401aa9d807bdc568f26cd40bfc96d26449267678':
  Clean up Hyphenator file reading
2015-07-06 16:20:12 +00:00
Raph Levien
401aa9d807 Merge "Clean up Hyphenator file reading" into mnc-dev 2015-07-06 16:07:37 +00:00
Raph Levien
c3f2f7b93b Clean up Hyphenator file reading
The old code made invalid assumptions about read() behavior and
failed to clean up properly in case of error. This patch changes the
file reading to use IoUtils.readFileAsString, which handles that.

Bug: 21020457
Change-Id: If9b54955c20a20a4ed5e8381d0c7e9c920d0639a
2015-07-06 09:01:36 -07:00
Svet Ganov
2f27b12bfe am 10c111ed: Merge "Show basic feature warning for default granted permissions" into mnc-dev
* commit '10c111ed35a0282ddf5dda540c53e3831bc9b0ec':
  Show basic feature warning for default granted permissions
2015-07-06 15:56:25 +00:00
Svet Ganov
a91acc9d02 am cb8d2e21: Merge "Improve request permission docs" into mnc-dev
* commit 'cb8d2e21564ec749696dc3095524dafffa915c38':
  Improve request permission docs
2015-07-06 15:56:18 +00:00
Svet Ganov
10c111ed35 Merge "Show basic feature warning for default granted permissions" into mnc-dev 2015-07-06 15:52:01 +00:00
Svet Ganov
cb8d2e2156 Merge "Improve request permission docs" into mnc-dev 2015-07-06 15:48:47 +00:00