George Mount
a5757799f2
am 8f833d94: am 9032c757: Merge "Fixed: getDecor() NullPointeExceptions." into lmp-dev
...
* commit '8f833d941746993b0c1524fcc83e60084d9e81ae':
Fixed: getDecor() NullPointeExceptions.
2014-09-12 23:21:38 +00:00
Yin-Chia Yeh
c01898c073
am 3661aa85: am e3505a3d: Merge "Camera2: add toString for TonemapCurve" into lmp-dev
...
* commit '3661aa8594e17d4d1401a86993d19e436f3ae525':
Camera2: add toString for TonemapCurve
2014-09-12 23:21:28 +00:00
George Mount
bc3e75a5c1
am 1390a1a2: am cc8973e4: Merge "Reset the alpha for offscreen views." into lmp-dev
...
* commit '1390a1a2c6eca730b7606cc700aa1b42fc71b6ab':
Reset the alpha for offscreen views.
2014-09-12 23:21:23 +00:00
Adam Powell
214860b030
am 7362db5d: am 91089aa5: Merge "Make Toolbars eat touch events" into lmp-dev
...
* commit '7362db5d1c24ccc9e0c641d8d3f5ff0eefb1bc37':
Make Toolbars eat touch events
2014-09-12 23:21:18 +00:00
George Mount
cb9ebc088a
am 47dece77: am f607a73b: Merge "Changed method name to match Activity\'s method name." into lmp-dev
...
* commit '47dece7797c4fc6e19b42b605a5b9d45023a0bc9':
Changed method name to match Activity's method name.
2014-09-12 23:21:01 +00:00
George Mount
4d527888ac
Merge "Made Transitions act only the views that they target." into lmp-dev
2014-09-12 23:19:15 +00:00
George Mount
5030c7f6f1
Made Transitions act only the views that they target.
...
Bug 17465989
Bug 17452585
Change-Id: I2f921e98f68df3d549a370179c0a4488d56923ad
2014-09-12 16:15:44 -07:00
George Mount
f0a68a241e
am 17506bdb: Merge "Allow Path Animations to support overshooting." into lmp-dev
...
* commit '17506bdb89a323a31e27cbff24fec4c819a71582':
Allow Path Animations to support overshooting.
2014-09-12 22:58:53 +00:00
Dianne Hackborn
6126395bde
am a561b237: Merge "Allow throwing UnsupportedOperationException across Binder." into lmp-dev
...
* commit 'a561b2377fd1f8749a30fe19d6df5e3d8afc3292':
Allow throwing UnsupportedOperationException across Binder.
2014-09-12 22:50:08 +00:00
George Mount
64ec46dbb0
Merge "Allow Path Animations to support overshooting." into lmp-dev
2014-09-12 22:48:28 +00:00
George Mount
bc68f5adc2
Allow Path Animations to support overshooting.
...
Bug 17458698
Change-Id: I7a29fc8932a28121d7db8b3bf695d91a55ef059b
2014-09-12 15:46:02 -07:00
Eric Laurent
75b433f737
SoundTrigger: fix KeyphraseRecognitionEvent parceling
...
Always include the Audioformat in the parcel if not
null.
Bug: 17489186.
Change-Id: I8bea031942b55078e5637959d5bf70961d134733
2014-09-12 15:45:47 -07:00
Dianne Hackborn
8190b79d37
Merge "Allow throwing UnsupportedOperationException across Binder." into lmp-dev
2014-09-12 22:35:48 +00:00
George Mount
b694e08054
Fix exit transitions hiding views permanently.
...
Bug 17480692
When a view was hidden prior to the transition completion,
the hidden views were being removed from the list and thus
weren't being reset to visible properly.
Change-Id: If778540156432eb19039fcec18d023d06e9c1b2a
2014-09-12 15:13:14 -07:00
George Mount
0253d58b9f
am 9032c757: Merge "Fixed: getDecor() NullPointeExceptions." into lmp-dev
...
* commit '9032c75779ea43428b84cd959cc62a219f4d2612':
Fixed: getDecor() NullPointeExceptions.
2014-09-12 22:13:11 +00:00
George Mount
e0947064af
Merge "Fixed: getDecor() NullPointeExceptions." into lmp-dev
2014-09-12 22:02:37 +00:00
Yin-Chia Yeh
449121ec9e
am e3505a3d: Merge "Camera2: add toString for TonemapCurve" into lmp-dev
...
* commit 'e3505a3d5e8968eaad68fd12717696f17e9414f9':
Camera2: add toString for TonemapCurve
2014-09-12 22:00:48 +00:00
George Mount
b362755429
am cc8973e4: Merge "Reset the alpha for offscreen views." into lmp-dev
...
* commit 'cc8973e45b989fc2380acbc9773e4b1208692891':
Reset the alpha for offscreen views.
2014-09-12 22:00:44 +00:00
Adam Powell
5d1d163f9f
am 91089aa5: Merge "Make Toolbars eat touch events" into lmp-dev
...
* commit '91089aa5f78c8c6b90a3a519cd5512c458872969':
Make Toolbars eat touch events
2014-09-12 22:00:40 +00:00
Yin-Chia Yeh
8eec09a1fc
Merge "Camera2: add toString for TonemapCurve" into lmp-dev
2014-09-12 21:55:12 +00:00
George Mount
54f4ba8d7a
Merge "Reset the alpha for offscreen views." into lmp-dev
2014-09-12 21:52:28 +00:00
Adam Powell
f116056a80
Merge "Make Toolbars eat touch events" into lmp-dev
2014-09-12 21:49:25 +00:00
George Mount
a34e4c5e1f
am f607a73b: Merge "Changed method name to match Activity\'s method name." into lmp-dev
...
* commit 'f607a73b9cfe059739b245d8aff70ed2747334c6':
Changed method name to match Activity's method name.
2014-09-12 21:43:42 +00:00
George Mount
26f68a01b4
Merge "Changed method name to match Activity's method name." into lmp-dev
2014-09-12 21:28:45 +00:00
Dianne Hackborn
33d738a102
Allow throwing UnsupportedOperationException across Binder.
...
Change-Id: I3a9b81958886033d546c3a20331716dbb9492365
2014-09-12 14:23:58 -07:00
George Mount
85ea498d86
Changed method name to match Activity's method name.
...
Bug 17488968
Change-Id: I3f00561d96ff33e8eaf7234934c69e3b8e2681e8
2014-09-12 14:19:40 -07:00
Yin-Chia Yeh
b086421b41
Camera2: add toString for TonemapCurve
...
Bug: 16899576
Change-Id: Id7c08afed8606efc880cc75201287cd70a0e301c
2014-09-12 14:12:13 -07:00
Adam Powell
61d15b9856
Make Toolbars eat touch events
...
Just like action bars, toolbars shouldn't allow touches to fall
through to sibling views that they overlap.
Bug 17483356
Change-Id: I9068e1f9cf3c4226000e0058c371283a997b1bd0
2014-09-12 14:11:28 -07:00
George Mount
653ea66a9f
Reset the alpha for offscreen views.
...
Bug 17469303
When stripping the offscreen views from a transition, the alpha
wasn't reset, so they were made permanently invisible.
Change-Id: I2e87fff1d3b1e417997cabf9c703143355fe2c01
2014-09-12 13:58:12 -07:00
Alan Viverette
7d6fc23fe7
am 99c628c4: am 4e7d44a5: Merge "Fix toolbar height, list divider alpha, action item padding" into lmp-dev
...
* commit '99c628c49642ac29511f7ae642ebfd031091a026':
Fix toolbar height, list divider alpha, action item padding
2014-09-12 20:27:11 +00:00
Alan Viverette
44ee53c2fd
am 4e7d44a5: Merge "Fix toolbar height, list divider alpha, action item padding" into lmp-dev
...
* commit '4e7d44a599bcc3ebc2e2e8104ee6daee9dc8167b':
Fix toolbar height, list divider alpha, action item padding
2014-09-12 20:11:36 +00:00
Alan Viverette
c1cbe8cfb9
Merge "Fix toolbar height, list divider alpha, action item padding" into lmp-dev
2014-09-12 20:01:09 +00:00
Alan Viverette
9d9581f52e
Fix toolbar height, list divider alpha, action item padding
...
BUG: 17487305
BUG: 17470290
BUG: 17486967
Change-Id: Ib0cb4308f9d57e730504bdeb125662b648cad0f7
2014-09-12 12:54:02 -07:00
George Mount
48bd13c9cb
Fixed: getDecor() NullPointeExceptions.
...
Bug 17481173
Change-Id: Ie6e1710cadb7d1e52515c2927dce733b3ec3eabb
2014-09-12 12:46:09 -07:00
Jessica Hummel
f5f5ed7bc3
am 61896e3b: am 5a082a9e: Merge "Remove legacy version of ACTION_PROFILE_PROVISIONING_COMPLETE." into lmp-dev
...
* commit '61896e3ba7c75bd062f6fa3a3ba2c2bfd7a8826f':
Remove legacy version of ACTION_PROFILE_PROVISIONING_COMPLETE.
2014-09-12 19:19:46 +00:00
Marcin Kosiba
26dd49f4c1
am 6e6ae86a: am 46683a27: Remove an @removed member of andorid.webkit.WebResourceResponse.
...
* commit '6e6ae86a8659a02e30bdf1a9ec4ca910c4a78215':
Remove an @removed member of andorid.webkit.WebResourceResponse.
2014-09-12 19:19:04 +00:00
Sander Alewijnse
fc27bbc043
am a0b249b2: am 4d9fe6d1: Merge "Rename email extra." into lmp-dev
...
* commit 'a0b249b28ea08044287a4a3558e538ab766312b3':
Rename email extra.
2014-09-12 19:18:48 +00:00
Alexandra Gherghina
272d79c715
am 92f8d577: am 443a5766: Merge "Assign default icon to users at creation time and in SystemUI." into lmp-dev
...
* commit '92f8d577c50a54e8375435813096b997d58cd368':
Assign default icon to users at creation time and in SystemUI.
2014-09-12 19:18:43 +00:00
George Mount
a03396e080
am 42e7043d: am 44673720: Merge "Fixed NPE in EnterTransitionCoordinator" into lmp-dev
...
* commit '42e7043d4f5c0f8daa8139ebb154c80e82dd3f54':
Fixed NPE in EnterTransitionCoordinator
2014-09-12 19:18:33 +00:00
Chris Wren
2ec88183e8
am 04322209: am c88b35aa: Merge "remove unused matchesCallFilter(Bundle, int)" into lmp-dev
...
* commit '043222093990ee001561dc86b6850056d65dfe9b':
remove unused matchesCallFilter(Bundle, int)
2014-09-12 19:18:27 +00:00
Christoph Studer
9758f55262
am fa1033fc: am e31d13ea: Merge "Notification: Reset chronometer visibility" into lmp-dev
...
* commit 'fa1033fc2119942ca3f8578e257ed52fee227f37':
Notification: Reset chronometer visibility
2014-09-12 19:18:20 +00:00
Kenny Guy
bc1c747855
am 46247469: am b5153aba: Hide APIs renamed during API review of LauncherApps
...
* commit '4624746908b1792eee967305b6db368f0263ebae':
Hide APIs renamed during API review of LauncherApps
2014-09-12 19:17:54 +00:00
Jessica Hummel
d4463cd8bf
am 8dd58a3e: am a387dc16: Merge "Use correct string for provisioning complete action." into lmp-dev
...
* commit '8dd58a3e642c25cf7c2b9984fbb46c0961a0da45':
Use correct string for provisioning complete action.
2014-09-12 19:17:38 +00:00
Jinsuk Kim
ff0133a194
am 527346ab: am ead8ed86: CEC: Bug fixes for vendor-specific command handling
...
* commit '527346ab17d4090a15c3408db2047f5e6800c8f4':
CEC: Bug fixes for vendor-specific command handling
2014-09-12 19:17:22 +00:00
Jessica Hummel
3b9593d82d
am 5a082a9e: Merge "Remove legacy version of ACTION_PROFILE_PROVISIONING_COMPLETE." into lmp-dev
...
* commit '5a082a9e3a92e571d9b532d0aa994db1a9295cc4':
Remove legacy version of ACTION_PROFILE_PROVISIONING_COMPLETE.
2014-09-12 18:53:15 +00:00
Marcin Kosiba
e8add4dc6a
am 46683a27: Remove an @removed member of andorid.webkit.WebResourceResponse.
...
* commit '46683a272ea5283a43d89a84bdab048994ca6a14':
Remove an @removed member of andorid.webkit.WebResourceResponse.
2014-09-12 18:52:44 +00:00
Sander Alewijnse
680a5b99cd
am 4d9fe6d1: Merge "Rename email extra." into lmp-dev
...
* commit '4d9fe6d15a4aa661eaea5b34a1810b4986732c4f':
Rename email extra.
2014-09-12 18:52:31 +00:00
Alexandra Gherghina
64a0adc47e
am 443a5766: Merge "Assign default icon to users at creation time and in SystemUI." into lmp-dev
...
* commit '443a5766fa9b079c9612105cfe962d057fc98fe8':
Assign default icon to users at creation time and in SystemUI.
2014-09-12 18:52:27 +00:00
George Mount
fb2d6c4305
am 44673720: Merge "Fixed NPE in EnterTransitionCoordinator" into lmp-dev
...
* commit '44673720ac0c4eb37f56f16d262cf5da68064fe2':
Fixed NPE in EnterTransitionCoordinator
2014-09-12 18:52:19 +00:00
Chris Wren
43211f0c6a
am c88b35aa: Merge "remove unused matchesCallFilter(Bundle, int)" into lmp-dev
...
* commit 'c88b35aabaf2322721130e618667ba813c9b9fe4':
remove unused matchesCallFilter(Bundle, int)
2014-09-12 18:52:14 +00:00