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
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
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
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
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
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
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
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
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