Commit Graph

44633 Commits

Author SHA1 Message Date
Igor Murashkin
669c2e2233 am 568d18e1: am c79b145f: Merge "camera2-legacy: Workaround max jpeg/preview size AR mismatch" into lmp-dev
* commit '568d18e1adbd944c6c361c3a80352923f60fccf9':
  camera2-legacy: Workaround max jpeg/preview size AR mismatch
2014-09-23 23:11:58 +00:00
Igor Murashkin
4f17981fdc Merge "camera2-legacy: Workaround max jpeg/preview size AR mismatch" into lmp-dev 2014-09-23 22:50:30 +00:00
Igor Murashkin
a0496d34ff camera2-legacy: Workaround max jpeg/preview size AR mismatch
Filter out the largest preview sizes (from the stream configuration map)
until we find one whose aspect ratio matches the max jpeg aspect ratio.
Keep all other (smaller) preview sizes.

Bug: 17589233
Change-Id: I8ebcaef6439691eff3312da2c37b9abe08a067ad
2014-09-23 15:11:36 -07:00
Dianne Hackborn
c21c6ab3a7 am 076741d5: am 5a9cfe3e: Merge "Maybe fix issue #17614177 APR: system process restarting due to infinite loop" into lmp-dev
* commit '076741d5776be95a19259827d1e1b2b196eb4ba3':
  Maybe fix issue #17614177 APR: system process restarting due to infinite loop
2014-09-23 21:14:20 +00:00
Adam Powell
006dd76bd2 am abadb107: am c8d72a97: Merge "Track persistent nested Y offset for fling velocity" into lmp-dev
* commit 'abadb107b8d1bb55feb2217c7fa4417257d4e369':
  Track persistent nested Y offset for fling velocity
2014-09-23 21:06:26 +00:00
Dianne Hackborn
d0e0154c1f Merge "Maybe fix issue #17614177 APR: system process restarting due to infinite loop" into lmp-dev 2014-09-23 20:55:05 +00:00
Adam Powell
01db31f899 Merge "Track persistent nested Y offset for fling velocity" into lmp-dev 2014-09-23 20:46:47 +00:00
Ruben Brunk
bdb14e9383 am 13993e03: am 30306d89: Merge "camera2: Update EACCES to throw correct exception in LEGACY." into lmp-dev
* commit '13993e03f7173c0b1ee66790b5a04119d3e64c69':
  camera2: Update EACCES to throw correct exception in LEGACY.
2014-09-23 18:29:00 +00:00
Ruben Brunk
b0ddd2e0d6 Merge "camera2: Update EACCES to throw correct exception in LEGACY." into lmp-dev 2014-09-23 18:08:42 +00:00
Dianne Hackborn
25e1ecaabb Maybe fix issue #17614177 APR: system process restarting due to infinite loop
Also try to get rid of a huge wtf we are seeing across a lot of devices
where we incorrectly change real states on a service that is restarting,
and get rid of one of the noisier boot logs in the package manager.

Change-Id: I2510b6fb082eac3f6168cbd57bc3b70ad006114d
2014-09-23 10:33:30 -07:00
Ruben Brunk
3084c2f519 camera2: Update EACCES to throw correct exception in LEGACY.
Bug: 17595068
Change-Id: I1a88568822237d3609c3342a21e2ca81ca935408
2014-09-23 10:32:18 -07:00
Jeff Brown
b0697d1e8c am a9b97c68: am 3f51958b: Merge "Fix window manager policy state when waking from doze." into lmp-dev
* commit 'a9b97c6839ebf7364552c3c7b1e8eed2c2e56e1a':
  Fix window manager policy state when waking from doze.
2014-09-23 17:00:11 +00:00
Jeff Brown
55fa020713 Merge "Fix window manager policy state when waking from doze." into lmp-dev 2014-09-23 16:42:52 +00:00
Jeff Brown
3ee549ca24 Fix window manager policy state when waking from doze.
Once upon a time when the world was fresh and new, the heavens
had an easy rhythm.  Day and night.  Night and day.  In the day,
the pixel fairies would cavort and play in the bright gardens
with narry a mark of shadow or gloom.  In the night, they would
rest peacefully, dreaming no dreams and knowing no fear.

Then one night a fairy dreamed the first dream.  At first
the dream was peaceful, full of colors and delight, hopes and
memories.  Then all at once, jarringly, it awoke in bright
daylight.  The pixel fairy knew fear, for the world had changed
and it was unprepared.

Time passed and the pixel fairies grew accustomed to their
fate, day and night, night and day, sometimes dreaming, until
there came a night when a fairy did not sleep.  It roamed
the land in a dreamless doze, lost and afraid amid a grim haze
of grey and darkness.  The fairy despaired.  It wanted no
part of this place.  It pretended for a time to be awake but
the bright daylight would not come.  It pretended for a time to
be dreaming but the colors and memories would not come.
That is when the fairy wished for oblivion.  Then just as
suddenly, it awoke in the daylight.  It fell to the ground,
stunned as if it had forgotten how to walk in the too bright
daylight.

Though the world again grew softer and kinder in time, the pixel
fairies were never the same.  For the night is dark and full
of terrors.

---

It used to be easy.  Screen on and screen off could explain almost
everything about the state of the device but it's different now with
ambient display.  We need to be able to wait for all windows to be
drawn even in the case where the device is still nominally asleep.
In truth, the window manager policy which drives a lot of these
interactions is a thicket of outdated assumptions.

Added a new method to tell the window manager policy when the screen
is being turned off so that it can correctly account for changes
to the interactive state (wakeUp and goingToSleep) and screen state
(screenTurningOn and screenTurnedOff).  Now we can independently
poke keyguard during interactive state changes and we can apply
screen on blocking during screen state changes.

Moved the code which manages screen on blocking (which is what
ensures the UI has fully drawn before revealing screen contents)
from the power manager to the display manager since the display
manager is in a better position to accurately track the state of
the screen, particularly when the screen is being turned off.

Fixed a bunch of synchronization issues.  Previously some work
had been moved to a handler without considering what might
happen if it became reordered relative to other work happening
elsewhere.  Documented the desired behavior in the code to
prevent this from happening again.

There's still a bunch of stuff in here that isn't quite right,
particularly the assumption that there's only one screen, but
it's good enough for now.  Hopefully there aren't too many bugs.

Bug: 17605802
Change-Id: Ic7319e09948c8a3cda014d7e169c964a3ad86f14
2014-09-23 09:38:05 -07:00
George Mount
18166210eb am 50c7bf74: am cced7645: Merge "Force transitioning views to be visible when transition interrupted." into lmp-dev
* commit '50c7bf74025fcf3727488e739eeec0ec1092c89b':
  Force transitioning views to be visible when transition interrupted.
2014-09-23 14:44:59 +00:00
George Mount
cbd333b256 Merge "Force transitioning views to be visible when transition interrupted." into lmp-dev 2014-09-23 14:27:36 +00:00
Lorenzo Colitti
e99be2ead8 am a4695b30: am bb17a717: Merge changes I3ebf0cec,I8635472c into lmp-dev
* commit 'a4695b308223cd57cc99ec86d69c95b866504e78':
  Add a throw route to the VPN endpoint.
  Support non-unicast route types: unreachable and throw.
2014-09-23 03:06:49 +00:00
Ruben Brunk
e3d89f1a87 am 7facb2a6: am 12f73fcf: Merge "camera2: Docs update for available AF modes." into lmp-dev
* commit '7facb2a66781fcad0f1bcd9dc519d49786fd95c9':
  camera2: Docs update for available AF modes.
2014-09-23 02:53:09 +00:00
Ruben Brunk
bd2a4887f4 am 2a59f748: am 4b3c7f85: Merge "camera2: Add missing whitebalance mapping." into lmp-dev
* commit '2a59f7488e7ad070b9c7553b22b5d0c28ea99f1c':
  camera2: Add missing whitebalance mapping.
2014-09-23 02:53:02 +00:00
Alan Viverette
3343c4dcee am 7b686bd8: am 9e84a6a0: Merge "Fix inaccurate TypedArray.getDrawable() documentation" into lmp-dev
* commit '7b686bd8c6a1c06d262c4fa44c122a6e8f3d68b8':
  Fix inaccurate TypedArray.getDrawable() documentation
2014-09-23 02:52:57 +00:00
Ruben Brunk
36dd2f3c91 am 2ccdbbe2: am 979c03a2: Merge "camera2: Avoid spurious IDLE transitions." into lmp-dev
* commit '2ccdbbe29f5a58c32375633f3f3c218ecf45b24d':
  camera2: Avoid spurious IDLE transitions.
2014-09-23 02:52:35 +00:00
John Reck
7a5b01bc0e am 01b5cfaa: am 668e566e: Merge "Aggressively trim memory for system_process" into lmp-dev
* commit '01b5cfaac7e72526d145b4c5ea706993321abaa9':
  Aggressively trim memory for system_process
2014-09-23 02:52:16 +00:00
Lorenzo Colitti
1e2b63d91d Merge changes I3ebf0cec,I8635472c into lmp-dev
* changes:
  Add a throw route to the VPN endpoint.
  Support non-unicast route types: unreachable and throw.
2014-09-23 01:46:48 +00:00
Adam Powell
744beffb6a Track persistent nested Y offset for fling velocity
Track the nested offsets applied persistently in AbsListView and
ScrollView. This allows accurate velocity to be reported to nested
fling/pre-fling.

Bug 17548219

Change-Id: I66199c534aca7fb81746eff6d04c931e4c4e48da
2014-09-22 17:18:42 -07:00
George Mount
f1abef6fc2 Force transitioning views to be visible when transition interrupted.
Bug 17553034

When an Activity Transition was interrupted prior to starting the
enter transition, the views were not being made visible.

Override the return ActivityOptions if interrupted so that the
entering activity doesn't launch with a transition when coming
back from recents.

Change-Id: Id4e00c7bb138babfee4de71247a9df4431376e21
2014-09-22 17:06:24 -07:00
Ruben Brunk
fcb086c8e7 Merge "camera2: Docs update for available AF modes." into lmp-dev 2014-09-23 00:06:15 +00:00
Ruben Brunk
9343c3cb7f Merge "camera2: Add missing whitebalance mapping." into lmp-dev 2014-09-22 23:57:20 +00:00
Alan Viverette
53b5cc8773 Merge "Fix inaccurate TypedArray.getDrawable() documentation" into lmp-dev 2014-09-22 23:48:46 +00:00
Alan Viverette
fde4e3b17a Fix inaccurate TypedArray.getDrawable() documentation
The documentation implied that you could override
Resources.getDrawable(int) to load custom drawables, which is
not the case.

BUG: 16635905
Change-Id: I06c0febe2d6d4194ef5a31f167b378fe311b7a2d
2014-09-22 16:19:51 -07:00
Ruben Brunk
c90b5ebbbf Merge "camera2: Avoid spurious IDLE transitions." into lmp-dev 2014-09-22 23:19:46 +00:00
Ruben Brunk
6f387098c2 camera2: Docs update for available AF modes.
Bug: 17588783
Change-Id: If4010517e79b3a51bd6231424a10be672ff5a252
2014-09-22 16:13:54 -07:00
John Reck
c1dab7a201 Merge "Aggressively trim memory for system_process" into lmp-dev 2014-09-22 23:05:02 +00:00
John Reck
73840ea367 Aggressively trim memory for system_process
Bug: 16978006

Don't HWUI-accelerate KeyguardScrim
Aggressively trim memory as soon as a ViewRootImpl
dies or has its visibility changed.

Change-Id: Ie1b7c9d30653456bd2e9f309128174f972999368
2014-09-22 16:01:56 -07:00
Ruben Brunk
72a23d7b50 camera2: Add missing whitebalance mapping.
Bug: 17588192
Change-Id: I5d161dd22f2057a33a461157d678d4217a5f88f8
2014-09-22 15:59:50 -07:00
John Spurlock
4b6a38e92c am bb2437ab: am c018af27: Merge "Zen: Add events as a new config attribute." into lmp-dev
* commit 'bb2437abc8705a3fbd8d06593a5b8ae3b591bc72':
  Zen: Add events as a new config attribute.
2014-09-22 21:26:29 +00:00
John Spurlock
e35c9bf9ba Merge "Zen: Add events as a new config attribute." into lmp-dev 2014-09-22 21:09:39 +00:00
John Spurlock
2dac62c2e9 Zen: Add events as a new config attribute.
Decouple events from alarms in the zen interception function,
and default the new allowEvents to true.

Bug:17580878
Change-Id: Iff10df385206ad73c3423ff118c79e94a10918d9
2014-09-22 16:44:37 -04:00
Alan Viverette
05f74b9a6b am 2c65386d: am 0dfa4738: Merge "Pass explicit null theme when preloading drawables" into lmp-dev
* commit '2c65386d9bb3d93f39767a284eb3dcc27dd0a2f3':
  Pass explicit null theme when preloading drawables
2014-09-22 19:37:19 +00:00
Alan Viverette
e786895918 Merge "Pass explicit null theme when preloading drawables" into lmp-dev 2014-09-22 19:18:03 +00:00
Yohei Yukawa
a8f3d15be2 am dc5fad8e: am b5d063dc: Merge "Work on issue #17506095: Plumb a new configuration to IMMS" into lmp-dev
* commit 'dc5fad8e086a50f5e438ea8fc5bfd692e4bd76f9':
  Work on issue #17506095: Plumb a new configuration to IMMS
2014-09-22 18:23:26 +00:00
Przemyslaw Szczepaniak
4dc8d46cd0 am 19f1c973: am 299bb1fb: Fix issues with new TTS API
* commit '19f1c97320ffe45cac6ce70bd2281f7228ca4694':
  Fix issues with new TTS API
2014-09-22 18:05:20 +00:00
Yohei Yukawa
ca5e72c5ae Merge "Work on issue #17506095: Plumb a new configuration to IMMS" into lmp-dev 2014-09-22 18:02:12 +00:00
Przemyslaw Szczepaniak
f9ba548f21 Fix issues with new TTS API
Bug: 17389935
Change-Id: I59234b3222f59dc89be7e40f7d4706b1f8c610ce
2014-09-22 17:39:16 +01:00
Alan Viverette
84e001a9f5 Pass explicit null theme when preloading drawables
Prevents "unresolved theme attributes" warning.

BUG: 17589490
Change-Id: I5217d85b1d5ce8b551315ee8b1ca79eccfac3f10
2014-09-22 07:05:33 +00:00
Lorenzo Colitti
4b0f8e6fb7 Support non-unicast route types: unreachable and throw.
Bug: 17462989
Change-Id: I8635472ca3e96ec2866af2de48e6260ab2da13fb
2014-09-22 13:10:15 +09:00
Ruben Brunk
d93fb94eec am 39db0506: am 3b57d98a: Merge changes Iccd4d53d,Id449bc7a into lmp-dev
* commit '39db05065cd619fef0aa26051f2b8fc4bf72d1eb':
  camera2: Avoid setting null metering regions in LEGACY.
  camera2: Fix JPEG orientation set by LEGACY request.
2014-09-22 03:11:59 +00:00
Ruben Brunk
4aed87a9ed camera2: Avoid spurious IDLE transitions.
Bug: 17594247

- Avoid spurious IDLE transitions when waiting for
  prior requests to complete.
- Clean up error reporting for GL thread and CameraDeviceState.
- Add error handling for Camera1 ErrorCallback calls.

Change-Id: I72850251d8965139b6db2193e91483a3d3409b7c
2014-09-21 20:09:38 -07:00
Ruben Brunk
ee3ef2b8af Merge changes Iccd4d53d,Id449bc7a into lmp-dev
* changes:
  camera2: Avoid setting null metering regions in LEGACY.
  camera2: Fix JPEG orientation set by LEGACY request.
2014-09-22 02:54:22 +00:00
Yigit Boyar
2c029f3fe2 am 747a975b: am a0716928: Merge "Allow fallback to Toolbar\'s default Navigation Icon" into lmp-dev
* commit '747a975bef3589fb5407ad3f74cc67770e2d86fa':
  Allow fallback to Toolbar's default Navigation Icon
2014-09-22 02:07:54 +00:00
Yigit Boyar
5507b223dd Merge "Allow fallback to Toolbar's default Navigation Icon" into lmp-dev 2014-09-22 01:14:40 +00:00