Commit Graph

44965 Commits

Author SHA1 Message Date
Adam Powell
bbceeffebe am 7c673645: am 76cedc5b: am 0bff30ba: am c8d72a97: Merge "Track persistent nested Y offset for fling velocity" into lmp-dev
* commit '7c673645310530dc22ee99719f3538dabbd69a02':
  Track persistent nested Y offset for fling velocity
2014-09-23 21:30:55 +00:00
Adam Powell
6c0b8b794a am c8d72a97: Merge "Track persistent nested Y offset for fling velocity" into lmp-dev
* commit 'c8d72a97c53da122d41b8238f23609f99aca2e02':
  Track persistent nested Y offset for fling velocity
2014-09-23 20:55:35 +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
53f6963d73 am fba543e3: am b38a6f80: am 56bd6a6b: am 30306d89: Merge "camera2: Update EACCES to throw correct exception in LEGACY." into lmp-dev
* commit 'fba543e3d7afce12bc656d53e836fd61d520f05e':
  camera2: Update EACCES to throw correct exception in LEGACY.
2014-09-23 18:51:19 +00:00
Ruben Brunk
6a90fa0c20 am 30306d89: Merge "camera2: Update EACCES to throw correct exception in LEGACY." into lmp-dev
* commit '30306d89bd83fe884b11816f5cfc33d5ab3048cb':
  camera2: Update EACCES to throw correct exception in LEGACY.
2014-09-23 18:16:39 +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
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
578628741b am 87c18cc6: am 2d8fd798: am c91bd121: am 3f51958b: Merge "Fix window manager policy state when waking from doze." into lmp-dev
* commit '87c18cc6d01fa553bc72e7d2b66f15f58863113a':
  Fix window manager policy state when waking from doze.
2014-09-23 17:23:04 +00:00
Jeff Brown
651def483c am 3f51958b: Merge "Fix window manager policy state when waking from doze." into lmp-dev
* commit '3f51958b1911ffa49ca3d7eb2a9304348ccbf04e':
  Fix window manager policy state when waking from doze.
2014-09-23 16:48:43 +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
9296bcc75f am 27b46d35: am a17365ef: am d0f0f86b: am cced7645: Merge "Force transitioning views to be visible when transition interrupted." into lmp-dev
* commit '27b46d350dcd89efde25dc1e0bae35156a6c1346':
  Force transitioning views to be visible when transition interrupted.
2014-09-23 15:53:42 +00:00
Lorenzo Colitti
11ebb69d50 am d0d59156: am ce24ce4e: am 5570a0d0: am bb17a717: Merge changes I3ebf0cec,I8635472c into lmp-dev
* commit 'd0d59156e69d9f33eea68e783b2835867bdaa67f':
  Add a throw route to the VPN endpoint.
  Support non-unicast route types: unreachable and throw.
2014-09-23 15:51:32 +00:00
Ruben Brunk
0498c04857 am 04ddd954: am c947ff9e: am a34b25cc: am 12f73fcf: Merge "camera2: Docs update for available AF modes." into lmp-dev
* commit '04ddd954e3ccad653441762d1f289b2945dc061e':
  camera2: Docs update for available AF modes.
2014-09-23 15:50:33 +00:00
Ruben Brunk
79a7e78c0d am b95f6de6: am 6b68644e: am e134e81a: am 4b3c7f85: Merge "camera2: Add missing whitebalance mapping." into lmp-dev
* commit 'b95f6de6a4b23b7e95c61446f4879dbedf444156':
  camera2: Add missing whitebalance mapping.
2014-09-23 15:50:27 +00:00
Alan Viverette
a83de9cf9d am 17cdbe10: am 8f7812bc: am 20b9a6c4: am 9e84a6a0: Merge "Fix inaccurate TypedArray.getDrawable() documentation" into lmp-dev
* commit '17cdbe10616e38450064d758232f78c7cacc83f4':
  Fix inaccurate TypedArray.getDrawable() documentation
2014-09-23 15:50:22 +00:00
Ruben Brunk
e2120388c8 am 969be13e: am abe74255: am d782ce53: am 979c03a2: Merge "camera2: Avoid spurious IDLE transitions." into lmp-dev
* commit '969be13ecc9ec7d9e35575d46f22fdd2da5866af':
  camera2: Avoid spurious IDLE transitions.
2014-09-23 15:49:58 +00:00
John Reck
5315ce4bf1 am fa19b7aa: am 8434cfaf: am ae26f177: am 668e566e: Merge "Aggressively trim memory for system_process" into lmp-dev
* commit 'fa19b7aa01e26d5a24e05b1bb963f9bd8d079bf7':
  Aggressively trim memory for system_process
2014-09-23 15:49:41 +00:00
Wink Saville
2ed12a198f am d428d7bf: am 7491d876: am 7f969e42: Merge "Cleanup NetworkCapabilities." into lmp-sprout-dev
* commit 'd428d7bf62be4dbe39489947eaea98f6fc933e08':
  Cleanup NetworkCapabilities.
2014-09-23 15:49:08 +00:00
George Mount
004b7a3f19 am cced7645: Merge "Force transitioning views to be visible when transition interrupted." into lmp-dev
* commit 'cced7645aae3e2fd65297ac75cecfde31dc1c636':
  Force transitioning views to be visible when transition interrupted.
2014-09-23 14:33:08 +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
633b7bb8ed am bb17a717: Merge changes I3ebf0cec,I8635472c into lmp-dev
* commit 'bb17a717750c558ece69344ecd93d96d4fbc4aca':
  Add a throw route to the VPN endpoint.
  Support non-unicast route types: unreachable and throw.
2014-09-23 03:21:21 +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
Ruben Brunk
e48fcfb38f am 12f73fcf: Merge "camera2: Docs update for available AF modes." into lmp-dev
* commit '12f73fcf874eccaea8e56a4ac547dc86ae9259a6':
  camera2: Docs update for available AF modes.
2014-09-23 00:16:01 +00: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
75192fb790 am 4b3c7f85: Merge "camera2: Add missing whitebalance mapping." into lmp-dev
* commit '4b3c7f852a22c27bc31c3710c631ef5fae10788f':
  camera2: Add missing whitebalance mapping.
2014-09-23 00:03:49 +00:00
Alan Viverette
60004caeba am 9e84a6a0: Merge "Fix inaccurate TypedArray.getDrawable() documentation" into lmp-dev
* commit '9e84a6a08b4ff50b745a6eaf35e52b9c7aef4c39':
  Fix inaccurate TypedArray.getDrawable() documentation
2014-09-22 23:58:31 +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
Ruben Brunk
524d16f7eb am 979c03a2: Merge "camera2: Avoid spurious IDLE transitions." into lmp-dev
* commit '979c03a21bc346ddbfbfcf5d1d4239e5cdf30302':
  camera2: Avoid spurious IDLE transitions.
2014-09-22 23:29:55 +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
6ed5ffebce am 668e566e: Merge "Aggressively trim memory for system_process" into lmp-dev
* commit '668e566ec250a9548d6201c6190f80306e91dcce':
  Aggressively trim memory for system_process
2014-09-22 23:10:37 +00: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
Wink Saville
4e2dea77dc Cleanup NetworkCapabilities.
Remove unused imports and variables.
Fix misspellings.
Added @Overrides.

Change-Id: I81f4adb0504e92d01c5465a0e14bc46d5ec3987e
2014-09-22 21:51:47 +00:00
John Spurlock
04b64cd0a4 am 91c77f04: am fbe1df94: am f8580a4c: am c018af27: Merge "Zen: Add events as a new config attribute." into lmp-dev
* commit '91c77f044b07df9c84529296c9bd01b374e894f9':
  Zen: Add events as a new config attribute.
2014-09-22 21:51:13 +00:00
John Spurlock
37486e54d7 am c018af27: Merge "Zen: Add events as a new config attribute." into lmp-dev
* commit 'c018af27d9da4ee3d7dc79103ff35eb54f80a8de':
  Zen: Add events as a new config attribute.
2014-09-22 21:15:32 +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
e69028b5de am be2fb16c: am 8ae47443: am 8183ba88: am 0dfa4738: Merge "Pass explicit null theme when preloading drawables" into lmp-dev
* commit 'be2fb16c0c96cea50a83560ffb198e281095842d':
  Pass explicit null theme when preloading drawables
2014-09-22 20:02:12 +00:00
Yohei Yukawa
8712675cac am fb8bdc11: am 79a12ba6: am 8fe1ca2c: am b5d063dc: Merge "Work on issue #17506095: Plumb a new configuration to IMMS" into lmp-dev
* commit 'fb8bdc1183e304e62c089353cc8765aa7783f8ab':
  Work on issue #17506095: Plumb a new configuration to IMMS
2014-09-22 19:45:32 +00:00
Przemyslaw Szczepaniak
c2ece0002b am 949ea9f0: am 32190676: am 90ae2778: am 299bb1fb: Fix issues with new TTS API
* commit '949ea9f011ee3577a6a73c6181185bd01f041597':
  Fix issues with new TTS API
2014-09-22 19:45:23 +00:00
Ruben Brunk
436257113b am 3d608a42: am d314f286: am ee38cd33: am 3b57d98a: Merge changes Iccd4d53d,Id449bc7a into lmp-dev
* commit '3d608a420b65a9ba068d11b146ac7fc6a7464092':
  camera2: Avoid setting null metering regions in LEGACY.
  camera2: Fix JPEG orientation set by LEGACY request.
2014-09-22 19:45:08 +00:00
Yigit Boyar
2e65058de9 am e17fd940: am 0b380581: am a9faefb3: am a0716928: Merge "Allow fallback to Toolbar\'s default Navigation Icon" into lmp-dev
* commit 'e17fd9404ca07458b333ee0e827e269cbf82570d':
  Allow fallback to Toolbar's default Navigation Icon
2014-09-22 19:44:59 +00:00
Ruben Brunk
55dbaf72fe am f1a9ccb5: am 6e13d7fd: am 252bfab5: am 6a80927a: Merge "camera2: refactor LEGACY mode error handling." into lmp-dev
* commit 'f1a9ccb55ea9ecc4de90766c77bb81c5cfd0af12':
  camera2: refactor LEGACY mode error handling.
2014-09-22 19:44:49 +00:00