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
Svetoslav
41f5dbe776
am 20178a82: am 35c764cf: am 562f38ee: am 23e6a244: Merge "Fix memory leak in accessibility cache." into lmp-dev
...
* commit '20178a82310253e12555c783e0e3efde8b0500ac':
Fix memory leak in accessibility cache.
2014-09-22 19:44:35 +00:00
Alan Viverette
d14f290d40
am 0dfa4738: Merge "Pass explicit null theme when preloading drawables" into lmp-dev
...
* commit '0dfa4738018b93f576a3fceee2d351505983961f':
Pass explicit null theme when preloading drawables
2014-09-22 19:25:06 +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
5c3d18d1f7
am b5d063dc: Merge "Work on issue #17506095 : Plumb a new configuration to IMMS" into lmp-dev
...
* commit 'b5d063dc8126d9cddf5dd5172f32213469b2c11b':
Work on issue #17506095 : Plumb a new configuration to IMMS
2014-09-22 18:12:02 +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
8977eae6db
am 299bb1fb: Fix issues with new TTS API
...
* commit '299bb1fbc62ab8d6e1389cb2959e093e217f8c79':
Fix issues with new TTS API
2014-09-22 17:55:56 +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
Ruben Brunk
8aa88195fe
am 3b57d98a: Merge changes Iccd4d53d,Id449bc7a into lmp-dev
...
* commit '3b57d98a1a84ce063cb3681cae10795216300035':
camera2: Avoid setting null metering regions in LEGACY.
camera2: Fix JPEG orientation set by LEGACY request.
2014-09-22 03:43:23 +00:00
Yigit Boyar
27dd47f81a
am a0716928: Merge "Allow fallback to Toolbar\'s default Navigation Icon" into lmp-dev
...
* commit 'a07169280401c84ac914b98028d7e991cee5a85d':
Allow fallback to Toolbar's default Navigation Icon
2014-09-22 03:17:19 +00: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
5507b223dd
Merge "Allow fallback to Toolbar's default Navigation Icon" into lmp-dev
2014-09-22 01:14:40 +00:00
Ruben Brunk
97b5301b09
camera2: Avoid setting null metering regions in LEGACY.
...
Bug: 17587491
- If a single region with zero weight is set, revert to default
metering region rather than attempting to set a null to
avoid setParameters failure.
Change-Id: Iccd4d53d5a2134a9d744eafb731f464b653a154d
2014-09-21 16:09:34 -07:00
Ruben Brunk
09a6bed6c6
camera2: Fix JPEG orientation set by LEGACY request.
...
Bug: 17589231
Change-Id: Id449bc7a39a6550413e6c441b6dc204e11eacda9
2014-09-21 16:09:34 -07:00
Ruben Brunk
5426bc2351
am 6a80927a: Merge "camera2: refactor LEGACY mode error handling." into lmp-dev
...
* commit '6a80927aef62f74a4801180adf68fe8781181060':
camera2: refactor LEGACY mode error handling.
2014-09-21 19:25:56 +00:00
Ruben Brunk
2610a1ba5d
Merge "camera2: refactor LEGACY mode error handling." into lmp-dev
2014-09-21 19:16:57 +00:00
Ruben Brunk
e663cb7728
camera2: refactor LEGACY mode error handling.
...
Bug: 17431462
Bug: 17407537
- Add Surface format/size validation during configure.
- Update exception error codes used in binder calls.
- Report dropped requests, frames, captures, and device
errors in binder callback properly.
- Fixes CameraDeviceTest errors for incorrect metering
rectangle weight in template tests.
- Fixes CameraDeviceTest errors for missing
noiseReductionMode field in template tests.
- Implement flush call.
Change-Id: I0da803bccf2bfb9b4c0cf61208e160a86c577497
2014-09-21 12:09:23 -07:00
Svetoslav
e5b726efca
am 23e6a244: Merge "Fix memory leak in accessibility cache." into lmp-dev
...
* commit '23e6a2440435d417791e99b95402721b535f73e4':
Fix memory leak in accessibility cache.
2014-09-21 18:02:20 +00:00
Svetoslav
650d7d9dd2
Merge "Fix memory leak in accessibility cache." into lmp-dev
2014-09-21 17:53:45 +00:00
Yohei Yukawa
e63b5fae8d
Work on issue #17506095 : Plumb a new configuration to IMMS
...
This CL makes a plumbing from SystemConfig to IMMS.
Change-Id: Ia70b870723acf647e0c27f24aff91b40d6f85543
2014-09-21 10:34:35 +09:00
Yigit Boyar
cb0721ff8f
am 1ea86977: am 6477ca14: am 397c6004: am 646e0428: Merge "Find activity from context in menu inflator for click events" into lmp-dev
...
* commit '1ea86977bf9d9106728c5344ee1e5f054b8973e5':
Find activity from context in menu inflator for click events
2014-09-20 02:44:20 +00:00
Jeff Brown
4df057c98b
am 77e786ab: am 978272f4: am a94c9ccb: am 09395677: Merge "Decouple turning screen on from waking up in policy." into lmp-dev
...
* commit '77e786abd5f2dcb74de3cc083c1cc64c884fac9d':
Decouple turning screen on from waking up in policy.
2014-09-20 02:44:14 +00:00
Svetoslav
13bd771c99
Fix memory leak in accessibility cache.
...
We were not clearing the cache if window state change event
is fired which was the behavior before adding the window
inspection APIs. As a result if no accessibility service
cares about windows we get a leek. Also when the accessibiilty
service cares about windows we were not clearing all windows
nodes from the cache. Now if a windows change or a window
state change event is recived we clear the cache.
bug:17589257
Change-Id: I8c416fbcab623160c6f505128b9fca713fcc6623
2014-09-19 19:21:55 -07:00
Yigit Boyar
0f46dd0de9
am 646e0428: Merge "Find activity from context in menu inflator for click events" into lmp-dev
...
* commit '646e0428a489d786c29a9ad48c1f21f3d644af42':
Find activity from context in menu inflator for click events
2014-09-20 01:36:12 +00:00
Yigit Boyar
1a74dc4547
Merge "Find activity from context in menu inflator for click events" into lmp-dev
2014-09-20 01:30:00 +00:00
Jeff Brown
e8e3125eeb
am 09395677: Merge "Decouple turning screen on from waking up in policy." into lmp-dev
...
* commit '09395677f7ef5119556e8ba100c0bd27480c9797':
Decouple turning screen on from waking up in policy.
2014-09-20 01:27:03 +00:00
Yigit Boyar
30f5dc935b
Allow fallback to Toolbar's default Navigation Icon
...
Bug: 17554486
Change-Id: Id9f2197820df42d81351540be5baa852f49bdf0a
2014-09-19 18:26:07 -07:00
Jeff Brown
6e53b7476e
Merge "Decouple turning screen on from waking up in policy." into lmp-dev
2014-09-20 01:09:40 +00:00
Elliott Hughes
69eb21074f
am 4fec1b48: am 600ca140: Merge "Use constants instead of resources for ellipsis."
...
* commit '4fec1b488759a89732af151e21a89aa6693ba9bf':
Use constants instead of resources for ellipsis.
2014-09-19 23:16:52 +00:00
Alan Viverette
0e3b5a7986
am 4ecec44c: am b55ced84: am 13527b41: am 14932619: Merge "Correctly apply max width/height to preference icons" into lmp-dev
...
* commit '4ecec44cf37c7df41295eb5897d04c32f7806b73':
Correctly apply max width/height to preference icons
2014-09-19 23:03:56 +00:00
Ian Rogers
e9b6cb8058
am ad64befd: am 296a712e: Merge "Make a field final."
...
* commit 'ad64befd25befae3d71c53be6d6a31d1f8d12464':
Make a field final.
2014-09-19 22:27:36 +00:00
Alan Viverette
2300412761
am 14932619: Merge "Correctly apply max width/height to preference icons" into lmp-dev
...
* commit '14932619ea17d7b224902c50db4d59f15eed7b1c':
Correctly apply max width/height to preference icons
2014-09-19 22:27:16 +00:00
Svetoslav
86d07089e6
am b38e8d02: am f2345ebc: am 61052dec: am 35abe50d: Merge "Keep existing API behavior that regressed." into lmp-dev
...
* commit 'b38e8d02bc75eb13f9cb78bea6ae6102f594b587':
Keep existing API behavior that regressed.
2014-09-19 22:26:25 +00:00
Alan Viverette
daf8588275
Merge "Correctly apply max width/height to preference icons" into lmp-dev
2014-09-19 22:19:02 +00:00
Elliott Hughes
4fec1b4887
am 600ca140: Merge "Use constants instead of resources for ellipsis."
...
* commit '600ca140e2e31e76f9bef7d484387ea366812cb3':
Use constants instead of resources for ellipsis.
2014-09-19 22:14:48 +00:00
Ian Rogers
ad64befd25
am 296a712e: Merge "Make a field final."
...
* commit '296a712e6b3fd48b5ace1128fa68547fdb8de84d':
Make a field final.
2014-09-19 22:14:33 +00:00
Elliott Hughes
600ca140e2
Merge "Use constants instead of resources for ellipsis."
2014-09-19 22:02:45 +00:00
Igor Viarheichyk
ed0daa93e4
Use constants instead of resources for ellipsis.
...
All supported locales use only U+2025 and U+2026 to represent
ellipses, and it will unlikely change in future. Given translated
resources are inconsistent and often use three dots it is safer
to use constants instead of resources.
Change-Id: I51a6cb903f62f739fbadd6b78e5765c0028d641a
2014-09-19 22:02:08 +00:00
Svetoslav
129ffeb37c
am 35abe50d: Merge "Keep existing API behavior that regressed." into lmp-dev
...
* commit '35abe50d89e8dedecf6a3c66c3b6bfe9f904528d':
Keep existing API behavior that regressed.
2014-09-19 21:49:31 +00:00
George Mount
02c377e139
am 6ba1531e: am 42ea88bb: am 0e24bcbb: am a86f1015: Merge "Target only shared elements with shared element Transition" into lmp-dev
...
* commit '6ba1531e66ca6c483ef762339513e1086cbdf76d':
Target only shared elements with shared element Transition
2014-09-19 21:47:50 +00:00