191292 Commits

Author SHA1 Message Date
George Mount
1b4ae634f6 Properly cancel animators when View doesn't exist in starting state.
Bug 19290065

When a transition was interrupted, if a View was not in the start
state, but in the end state, then any animator on that View was
not canceled. This detects that situation and allows canceling
the animator on that View.

Change-Id: Ib1d0579bb6b211782c40c6327be59b0c59682731
2015-05-07 13:00:12 -07:00
Chris Wren
9260cb7ffe Merge "count panel open method" into mnc-dev 2015-05-06 18:34:47 +00:00
Eric Laurent
b65cd17b05 Merge "Implement audio routing callbacks" into mnc-dev 2015-05-06 17:51:53 +00:00
Alex Klyubin
6223ec129b Merge "Keystore uses 0 for invalid operation handles." into mnc-dev 2015-05-06 17:26:11 +00:00
Alan Viverette
809d5d7fbe Merge "DayNight theme for framework packages" into mnc-dev 2015-05-06 17:25:26 +00:00
Alan Viverette
4d5c20c613 Merge "ListPopupWindow should use window layout type SUB_PANEL" into mnc-dev 2015-05-06 17:24:31 +00:00
Jeff Tinker
26d955fd02 Merge "Clarify wording of MediaCrypto exception "ERROR_NO_KEY"" into mnc-dev 2015-05-06 17:22:35 +00:00
Alex Klyubin
9cfc428a24 Keystore uses 0 for invalid operation handles.
This propagates the concept that 0 is an invalid crypto operation
handle to the outside of AndroidKeyStore abstraction.

Bug: 20864436
Change-Id: I1e5abb66c5d41d8fc32aac44372495a708c2b6e2
2015-05-06 10:16:57 -07:00
Alan Viverette
71b0cb043f Merge "Add scroll indicators on View, use in AlertDialog" into mnc-dev 2015-05-06 17:11:24 +00:00
Alan Viverette
922e1c6ed2 Add scroll indicators on View, use in AlertDialog
Also updates default fade duration for scrollbars to match Material
spec and moves around some padding in AlertDialog so that scrolling
text and list items aren't so close to the title.

Bug: 19098033
Change-Id: I40dca6a931480c4c48463e3ea5b8361534cbd8d7
2015-05-06 10:09:35 -07:00
Eric Laurent
4bcdba8484 Implement audio routing callbacks
Implement JNI for AudioTrack and AudioRecord routing
callbacks:
- Added files core/jni/android_media_DeviceCallback.cpp/.h
for JNI callback implementation used by both AudioTrack
and AudioRecord.
- Made AudioManager AudioPort and AudioPatch methods static
in order to call them without context.

Also added IO handle information to AudioMixPort.

Change-Id: Icee182aa68310d4b12fd1469f48e78110889acf1
2015-05-06 17:03:50 +00:00
Alan Viverette
c97b922aba Merge "Fix setting hotspot bounds in a drawable container" into mnc-dev 2015-05-06 16:58:09 +00:00
Chris Wren
49f06f5f0d count panel open method
open panel
  open with two fingers
  open via peek
  pull down to open QS
  tap to open QS

Bug: 20262922
Change-Id: I7eaa8a6de75867035c64a3ac939cec86daaab913
2015-05-06 12:57:55 -04:00
Alexander Martinz
27cf86939d Fix setting hotspot bounds in a drawable container
We are passing the wrong parameters for setting hotspot bounds.
Bottom and right are in the wrong order, correct it.

Change-Id: I2762fc3a4c29f05ba8b7e71a5c6cad0be16c2ae0
2015-05-06 09:55:49 -07:00
John Spurlock
444eda0836 Merge "Zen: Calendar tracker should use event availability." into mnc-dev 2015-05-06 16:21:59 +00:00
Tyler Gunn
ed7cbf111f Merge "Change sendSessionModifyRequest VideoProvider API signature." into mnc-dev 2015-05-06 16:01:36 +00:00
Tyler Gunn
4538216a31 Change sendSessionModifyRequest VideoProvider API signature.
Including a fromProfile in addition to the requestedProfile.

- Changed VideoCallImpl to generate the fromVideoProfile based on the
call's current videoState.  This ensures the InCall UI only needs to
pass in the new video profile; the VideoCall Impl already has enough
knowledge to generate the fromProfile.
  - Changed VideoCallImpl to track the current videoQuality, which forms
a part of the fromVideoProfile.

Bug: 20704229
Change-Id: I89f293f03a2b13fc8c1dcfd8a07ab8640d3950e0
2015-05-06 08:52:27 -07:00
John Spurlock
028a53977c Zen: Calendar tracker should use event availability.
- Ignore events that are marked as availability=free for consideration
   as DND trigger events.  All-day events are conventionally marked
   as free by default.

Bug: 20064962
Change-Id: Ie26c81a6b79bdd86444092886f9bc123470575a7
2015-05-06 11:36:19 -04:00
Benjamin Franz
94fb2024b0 Merge "Rename functions that disable status bar and keyguard" into mnc-dev 2015-05-06 15:16:20 +00:00
Brian Colonna
0fb5aa656e Merge "Removed unused Face Unlock string" into mnc-dev 2015-05-06 14:37:23 +00:00
Benjamin Franz
bece80645e Rename functions that disable status bar and keyguard
Rename the DevicePolicyManager functions setKeyguardEnabledState and
setStatusBarEnabledState to setKeyguardDisabled and
setStatusBarDisabled respectively.

Bug: 20820039
Change-Id: I06f6a19ac55b24e66e9f2cb340ead5d940cb2235
2015-05-06 13:19:22 +01:00
Clara Bayarri
fbb34dd8df Merge "Allow Floating ActionModes in SearchDialog." into mnc-dev 2015-05-06 09:10:27 +00:00
Alan Viverette
7f76ff39b7 Merge "Fix checkbox animation end colors" into mnc-dev 2015-05-06 03:55:38 +00:00
Adam Lesinski
c9399a8044 Merge "Fix overcounting of mobile radio" into mnc-dev 2015-05-06 02:21:16 +00:00
Adam Lesinski
d9b48d5735 Fix overcounting of mobile radio
Bug:20438089
Change-Id: Ie8987cf61ef7a0cecab6d730eed7bc47eabb9eec
2015-05-05 19:19:19 -07:00
Rich Slogar
f1ca577728 am 34e0f640: am 84a67c7d: am 1b5f692d: am 9b4d57e1: Merge "docs: gradle multidex update" into lmp-docs
* commit '34e0f6401e66df33ec71df7f76196bbe0eca3183':
  docs: gradle multidex update
2015-05-06 01:24:46 +00:00
Rich Slogar
8bbbbd2afd am b462da9e: am f0ea8f9f: am f77d64dc: am 2f14c38f: Merge "docs: overview link to release notes" into lmp-docs
* commit 'b462da9e3d554deb9ba5b8ca58d5d66797fb54d5':
  docs: overview link to release notes
2015-05-06 01:24:41 +00:00
Rich Slogar
c98d6ae334 am 48ea7762: am 7e33aa48: am 96d00bb6: am 37ca7773: Merge "docs: translation editor update" into lmp-docs
* commit '48ea7762295cdf3e2bd61dafd55422a0d6bee5e6':
  docs: translation editor update
2015-05-06 01:24:33 +00:00
Rich Slogar
5464b5ca62 am cc4a2980: am ffef3b76: am 39b51b49: am 2febf6e0: Merge "docs: memory monitor duplicate paragraph" into lmp-docs
* commit 'cc4a29807e679a1691a949c117f540867304acc7':
  docs: memory monitor duplicate paragraph
2015-05-06 01:24:27 +00:00
Rich Slogar
34e0f6401e am 84a67c7d: am 1b5f692d: am 9b4d57e1: Merge "docs: gradle multidex update" into lmp-docs
* commit '84a67c7db75edc192a8975637c99c9a917796ff1':
  docs: gradle multidex update
2015-05-06 01:14:31 +00:00
Rich Slogar
b462da9e3d am f0ea8f9f: am f77d64dc: am 2f14c38f: Merge "docs: overview link to release notes" into lmp-docs
* commit 'f0ea8f9f1e1ede23f954cade5ee4a84e92d28943':
  docs: overview link to release notes
2015-05-06 01:14:26 +00:00
Rich Slogar
48ea776229 am 7e33aa48: am 96d00bb6: am 37ca7773: Merge "docs: translation editor update" into lmp-docs
* commit '7e33aa4843edbc037659023cff98dd44ac90d44c':
  docs: translation editor update
2015-05-06 01:14:21 +00:00
Rich Slogar
cc4a29807e am ffef3b76: am 39b51b49: am 2febf6e0: Merge "docs: memory monitor duplicate paragraph" into lmp-docs
* commit 'ffef3b76762ae32c3a6fca00fa9cbdd1230f6f83':
  docs: memory monitor duplicate paragraph
2015-05-06 01:14:08 +00:00
Rich Slogar
138ab38141 am e12c404a: am 35d7cd40: am d0551fee: Merge "docs: providing resources link" into lmp-mr1-ub-docs
* commit 'e12c404a07037d214c7f1f83d993ce9dba95e47b':
  docs: providing resources link
2015-05-06 01:13:28 +00:00
Rich Slogar
84a67c7db7 am 1b5f692d: am 9b4d57e1: Merge "docs: gradle multidex update" into lmp-docs
* commit '1b5f692d853cf5e873dbe4eb93c34e3fcdbb02ed':
  docs: gradle multidex update
2015-05-06 01:00:16 +00:00
Rich Slogar
f0ea8f9f1e am f77d64dc: am 2f14c38f: Merge "docs: overview link to release notes" into lmp-docs
* commit 'f77d64dca71e9a11de3f234ce686692dae9d92ed':
  docs: overview link to release notes
2015-05-06 01:00:12 +00:00
Rich Slogar
7e33aa4843 am 96d00bb6: am 37ca7773: Merge "docs: translation editor update" into lmp-docs
* commit '96d00bb64c8dc9fb85f1f2ecb894930d3eacd0d5':
  docs: translation editor update
2015-05-06 01:00:08 +00:00
Rich Slogar
ffef3b7676 am 39b51b49: am 2febf6e0: Merge "docs: memory monitor duplicate paragraph" into lmp-docs
* commit '39b51b4968c0aeeef84d5d75ef683516e658a30d':
  docs: memory monitor duplicate paragraph
2015-05-06 01:00:04 +00:00
Rich Slogar
e12c404a07 am 35d7cd40: am d0551fee: Merge "docs: providing resources link" into lmp-mr1-ub-docs
* commit '35d7cd40bb167ee08bbb855195eb395e77a05b7a':
  docs: providing resources link
2015-05-06 00:58:49 +00:00
Rich Slogar
35d7cd40bb am d0551fee: Merge "docs: providing resources link" into lmp-mr1-ub-docs
* commit 'd0551feed28614dad957a09998522b25392ce621':
  docs: providing resources link
2015-05-06 00:50:57 +00:00
Rich Slogar
1b5f692d85 am 9b4d57e1: Merge "docs: gradle multidex update" into lmp-docs
* commit '9b4d57e1dc480f375dc26a77333ff4705f760bb8':
  docs: gradle multidex update
2015-05-06 00:44:58 +00:00
Rich Slogar
f77d64dca7 am 2f14c38f: Merge "docs: overview link to release notes" into lmp-docs
* commit '2f14c38ffb5da66ab58551a1ccd273dfb602babf':
  docs: overview link to release notes
2015-05-06 00:44:53 +00:00
Rich Slogar
96d00bb64c am 37ca7773: Merge "docs: translation editor update" into lmp-docs
* commit '37ca7773a59cb4a7de4406378f5b1c8d4c5fefd2':
  docs: translation editor update
2015-05-06 00:44:48 +00:00
Rich Slogar
39b51b4968 am 2febf6e0: Merge "docs: memory monitor duplicate paragraph" into lmp-docs
* commit '2febf6e0a5bd9f716005c256f7357c6f44b52c2b':
  docs: memory monitor duplicate paragraph
2015-05-06 00:44:42 +00:00
John Spurlock
bc1a2ad878 Merge "Zen: Maintain source filters for both calls and messages." into mnc-dev 2015-05-06 00:30:26 +00:00
Chih-Hung Hsieh
57bbb8d681 Merge "Remove unused aapt target." into mnc-dev 2015-05-06 00:29:24 +00:00
Amith Yamasani
19343927c2 Merge "Permission policies are for profile and device owners" into mnc-dev 2015-05-06 00:18:19 +00:00
Amith Yamasani
6f36d42dcc Permission policies are for profile and device owners
Not just device owners

Change-Id: I78ad815651e9bdc4bd78e61d634a5067935fa33f
2015-05-05 17:16:18 -07:00
Chih-Hung Hsieh
9a59a991dd Remove unused aapt target.
BUG: 20765163
Change-Id: I13f36f76541216c5c1c20ae8866e09038e08e6f8
(cherry picked from AOSP commit 97627314a4d3e114afe3dbd764a51523e9f0b787)
2015-05-06 00:13:37 +00:00
Jean-Luc Brouillet
afa81ed0b1 am 79f12bb6: am d967fcbe: am e9f17cda: docs: Overhaul of the RenderScript reference documentation.
* commit '79f12bb648aa8a4f71e2c64c5c6354e2261e3257':
  docs: Overhaul of the RenderScript reference documentation.
2015-05-05 23:58:55 +00:00