191472 Commits

Author SHA1 Message Date
George Mount
b4035fd886 Merge "Properly cancel animators when View doesn't exist in starting state." into mnc-dev 2015-05-07 20:23:00 +00:00
Svet Ganov
2d9ef99a4e Merge "Fix broke NDK sensor manager API" into mnc-dev 2015-05-07 20:19:27 +00:00
Alan Viverette
34dd5824f5 Merge "Only resize list popup if it's still attached to a window" into mnc-dev 2015-05-07 20:07:48 +00:00
Alan Viverette
c8bfc68cdd Only resize list popup if it's still attached to a window
We can't rely on ListPopupWindow.dismiss() to get called before the popup
is removed, for example when the activity hosting the popup is finished,
but we can easily ensure that the popup is still attached to a window.

Bug: 20831507
Change-Id: I9dcaa46e68df3f2b301cf299fa64d460c7e177fd
2015-05-07 13:00:25 -07:00
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
Svet Ganov
cbb56a8f4e Fix broke NDK sensor manager API
Change-Id: I0f4e2a3ce20ce20e0aa5a7d38d1f988497c033c0
2015-05-07 12:56:48 -07:00
Christopher Ferris
411feedf68 am a7f27a76: (-s ours) am 504bb9e7: Merge "Temporarily increase saved tombstone size. DO NOT MERGE" into lmp-mr1-modular-dev
* commit 'a7f27a767347af8383c78be656fb5d809ee60951':
  Temporarily increase saved tombstone size. DO NOT MERGE
2015-05-07 19:42:02 +00:00
Christopher Ferris
a7f27a7673 am 504bb9e7: Merge "Temporarily increase saved tombstone size. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '504bb9e7709cd51500b68f4220fffb61e11a5e1b':
  Temporarily increase saved tombstone size. DO NOT MERGE
2015-05-07 19:29:02 +00:00
Derek Sollenberger
7b753cf12e Merge "Update the rowBytes when reconfiguring to match the new imageInfo." into mnc-dev 2015-05-07 19:28:31 +00:00
Chris Wren
d11ad51d11 Merge "add logging to quick settings tiles" into mnc-dev 2015-05-07 19:23:34 +00:00
Christopher Ferris
504bb9e770 Merge "Temporarily increase saved tombstone size. DO NOT MERGE" into lmp-mr1-modular-dev 2015-05-07 19:19:33 +00:00
Chris Wren
457a21cdea add logging to quick settings tiles
QS Grid visibility
  Tiles that are visibile in the grid
  Taps on tiles
  Detail visibility for DND, Users, and Data

Bug: 20264417
Change-Id: I95e65484a9be0a53a071bc12ce8195120582621e
2015-05-07 15:14:28 -04:00
Guang Zhu
39fce1d226 Merge "improve app crash detection in compatibility test" into mnc-dev 2015-05-07 19:05:50 +00:00
Guang Zhu
34092cf80a improve app crash detection in compatibility test
In addition to ensuring that process exists, we also need to
check that it's the right state. Because crashed foreground
activity can still get started as background service.

Bug: 20899208
Change-Id: I101e556ce757af1afb66686827c5851dd6fda620
2015-05-07 11:48:33 -07:00
Derek Sollenberger
2a94a10bec Update the rowBytes when reconfiguring to match the new imageInfo.
bug: 20872840
Change-Id: Ic98a9d16e095c27ddcc193a18641732c1ee4bad0
2015-05-07 14:26:01 -04:00
John Reck
dc9b2dfae2 Merge "Delete a bunch of dead code" into mnc-dev 2015-05-07 18:11:05 +00:00
John Reck
a039182d61 Delete a bunch of dead code
Rotation wasn't supported, so just nuke all the code
around it. Fixes some unused field warnings

Change-Id: Ic33d56ed3b42e3261bddc5007c5a029831254f83
2015-05-07 11:06:46 -07:00
Doris Liu
c7e56e9df1 Merge "Take into account scroll offset for transition animation" into mnc-dev 2015-05-07 17:56:46 +00:00
Alex Klyubin
a4ead5b0d5 Merge "Document that new APIs for asymmetric crypto have no effect." into mnc-dev 2015-05-07 17:54:53 +00:00
Alex Klyubin
e91768d4b5 Merge "Check parameters in KeyGenerator.init." into mnc-dev 2015-05-07 17:54:28 +00:00
Alan Viverette
43ea92b8ef Merge "Remove dead code from EpicenterTranslateClipReveal" into mnc-dev 2015-05-07 17:52:53 +00:00
Alex Klyubin
a6e551c68c Check parameters in KeyGenerator.init.
KeyGenerator.init is supposed to check whether all provided parameters
are OK. This is because KeyGenerator.generateKey cannot throw checked
exceptions. This CL makes AndroidKeyStore KeyGenerator implementation
do just that. Unfortunately, keymaster/kestore doesn't provide a way
to check whether all the parameters are OK without actually generating
a key. Thus, this KeyGenerator does its best inside init method
(before Keymaster is called), and then surfaces any remaining issues
(flagged by Keymaster/keystore) as unchecked IllegalStateException.

Bug: 18088752
Change-Id: I9a04da880dcbe26c37f41d1477e41bdc74db04c9
2015-05-07 10:50:10 -07:00
Alex Klyubin
14bc1c58d4 Merge "Use ProviderException in AndroidKeyStore." into mnc-dev 2015-05-07 17:43:30 +00:00
Alex Klyubin
ca84b19f10 Document that new APIs for asymmetric crypto have no effect.
Bug: 18088752
Change-Id: Idfcf57251e76185425b9271d6a2001c5556f9f59
2015-05-07 10:41:54 -07:00
Alex Klyubin
38dc15421e Merge "Always mix in additional entropy into keymaster." into mnc-dev 2015-05-07 17:38:40 +00:00
Alan Viverette
6689a013b3 Remove dead code from EpicenterTranslateClipReveal
Change-Id: Id2ba801b61cf419b43188514b36cf869b4f836a6
2015-05-07 10:38:26 -07:00
Yorke Lee
e0895660da Merge "Filter list of possible default dialers" into mnc-dev 2015-05-07 17:34:54 +00:00
Alex Klyubin
f555887237 Merge "Adjust the Javadoc for user authentication timeout." into mnc-dev 2015-05-07 17:34:25 +00:00
Alex Klyubin
8d7455fbe4 Merge "Define String constants for AndroidKeyStore crypto." into mnc-dev 2015-05-07 17:34:01 +00:00
Christopher Ferris
808a8d9c30 Temporarily increase saved tombstone size. DO NOT MERGE
Bug: 20829534
Change-Id: I2af16d342196da1acda43b0f6d7341413ef51820
2015-05-07 10:31:17 -07:00
Alan Viverette
83ce3b26b6 Merge "Make popup window enter animation more like app transition enter" into mnc-dev 2015-05-07 17:25:37 +00:00
Chris Elliott
80f232deae am b65b66cc: am 2224eac3: Merge "bootanimation: fix garbage line issue when screen height is odd." into lmp-mr1-modular-dev
* commit 'b65b66ccc251371c817abe75176a73f84565410e':
  bootanimation: fix garbage line issue when screen height is odd.
2015-05-07 17:17:03 +00:00
Alan Viverette
b4b4437801 Merge "Remove tools attributes from framework XML" into mnc-dev 2015-05-07 17:13:09 +00:00
Alan Viverette
4ea5ee2330 Make popup window enter animation more like app transition enter
Merges the translate and clip reveal so that we can adjust the clip
position based on the current translate position. This ensures the
clip appears to expand from the center of the translated popup and
never extends outside the window bounds.

Change-Id: I8bbb9c0e2293a25f7807d71d9b8779bb782d4784
2015-05-07 10:07:42 -07:00
Chris Elliott
b65b66ccc2 am 2224eac3: Merge "bootanimation: fix garbage line issue when screen height is odd." into lmp-mr1-modular-dev
* commit '2224eac30375a731f4ad38d6930dbc37b0855a0d':
  bootanimation: fix garbage line issue when screen height is odd.
2015-05-07 17:06:47 +00:00
Alan Viverette
31ee4f7d44 Remove tools attributes from framework XML
Bug: 20494934
Change-Id: Iaf43abddf6b533c107350254e467e7a029ccc88d
2015-05-07 10:01:01 -07:00
Doris Liu
18c2b0ef36 Take into account scroll offset for transition animation
This CL fixed the issue where scroll offset was ignored when shared
elements are added to the ghost view and when they are laid out.

Bug: 20349408
Change-Id: Ifaeb821bffe6fcfe303221a1732125bf1c4a91b7
2015-05-07 09:58:02 -07:00
Chet Haase
1bc3c849ba Merge "Fix leak in LayoutTransition" into mnc-dev 2015-05-07 16:56:43 +00:00
Alex Klyubin
27dd1a2227 Adjust the Javadoc for user authentication timeout.
The Javadoc incorrectly stated that:
* 0 means authentication required for every use.
* -1 means that timeout is not specified and the key can be any time.

Bug: 18088752
Change-Id: Ie5f37e74dc207f23443527ac1725ae8a37213d75
2015-05-07 09:51:21 -07:00
Chris Elliott
2224eac303 Merge "bootanimation: fix garbage line issue when screen height is odd." into lmp-mr1-modular-dev 2015-05-07 16:51:09 +00:00
Niels Egberts
dd44179540 Merge "Don't strip country and variant from locale." into mnc-dev 2015-05-07 16:22:52 +00:00
John Reck
b59642bf49 Merge "Add warning if an in-use Bitmap is reconfigured" into mnc-dev 2015-05-07 16:16:16 +00:00
Paul Jensen
ffe2dda135 Merge "Avoid NPE when sendMessage is called after disconnect." into mnc-dev 2015-05-07 15:30:47 +00:00
Niels Egberts
837fba984e Don't strip country and variant from locale.
When the synthesizer returns LANG_AVAILABLE or LANG_COUNTRY_AVAILABLE
for a certain locale, we strip the country and variant from the locale
before asking the synthesizer for the default voice name for this
locale.

This can prevent the synthesizer from picking the right locale. For
instance it prevents the synthesizer from picking en-gb if en-au is
requested, now it can only have a single preferred voice for all English
countries.

The solution is not to strip the country and variant from the locale.
This is not likely to break anything, because the input to
onGetDefaultVoiceNameFor was never expected to be a subset of all
supported language-country-variant combinations. The default
implementation handles this correctly.

Change-Id: I017f69d321039c7aa7a3ef5a09ba138e35b66670
(cherry picked from commit 4758e99783493fc546e6819b5fe9d44e1ef8c318)
2015-05-07 15:02:46 +00:00
Paul Jensen
d0d420587a Avoid NPE when sendMessage is called after disconnect.
This avoids an NPE that could occur when:
1. disconnect() is called
2. sendMessage() is called but encounters a RemoteException
3. replyDisconnected() will attempt to dereference mSrcHandler
There does not appear to be any callers that rely on the NPE.
All callers erase their reference to the AsyncChannel after
calling disconnect(), except for NetworkAgentInfo which can
cause ConnectivityService to crash.  This fix addresses that.

bug:20647016
Change-Id: I89864885dc3371941407a036b7b7647e0ec037b8
2015-05-07 10:44:32 -04:00
George Mount
fa21641122 Merge "Add CallbackRegistry." into mnc-dev 2015-05-07 14:34:58 +00:00
George Mount
b3ba213895 Merge "Fix crash during Activity Transition with TextureView." into mnc-dev 2015-05-07 14:34:02 +00:00
Neil Fuller
d6a2135262 Remove FloatMath methods from the API
Also removing FloatMathTest. The tests are being
moved into a legacy CTS suite.

Bug: https://code.google.com/p/android/issues/detail?id=36199
Change-Id: I397fd6bcc4d988db6301245f9d47460bd6c28821
2015-05-07 13:16:18 +00:00
Jeff Brown
dbf62ace0d Merge "Remove incomplete media router API." into mnc-dev 2015-05-07 08:00:03 +00:00
Jinsuk Kim
dd0f3964ef Merge "CEC: Make wakeup on hotplug optional" into mnc-dev 2015-05-07 07:12:20 +00:00