Commit Graph

47739 Commits

Author SHA1 Message Date
Chien-Yu Chen
fcdc15972a am 9e1fa287: am 7a34ed6a: am 0dfb7ba4: Merge "camera2: allow mixing regular/reprocess requests" into mnc-dev
* commit '9e1fa287bcc58c8d7c12e6f47cee4adc43b661a5':
  camera2: allow mixing regular/reprocess requests
2015-05-07 20:54:10 +00:00
George Mount
a0a0234752 am 04c1770b: am 127fa3a4: am b4035fd8: Merge "Properly cancel animators when View doesn\'t exist in starting state." into mnc-dev
* commit '04c1770b5aa31a41f776439410a779742a83a075':
  Properly cancel animators when View doesn't exist in starting state.
2015-05-07 20:54:05 +00:00
Alan Viverette
b099dc5b7e am 6f5a2305: am 17c29a3b: am 34dd5824: Merge "Only resize list popup if it\'s still attached to a window" into mnc-dev
* commit '6f5a2305c0e8f5d8e2c1c8fca3f6d444e3ce9400':
  Only resize list popup if it's still attached to a window
2015-05-07 20:39:33 +00:00
Chien-Yu Chen
0dfb7ba4a8 Merge "camera2: allow mixing regular/reprocess requests" into mnc-dev 2015-05-07 20:24:52 +00:00
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
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
Doris Liu
244ef07b28 am cba64a9a: am cbb97b50: am c7e56e9d: Merge "Take into account scroll offset for transition animation" into mnc-dev
* commit 'cba64a9af6b9a08b445c8ba0ecd858e140477ffb':
  Take into account scroll offset for transition animation
2015-05-07 19:15:40 +00:00
Chet Haase
3f098d11c6 am 1261e766: am 4d2fa67a: am 1bc3c849: Merge "Fix leak in LayoutTransition" into mnc-dev
* commit '1261e7669202980e33104370d7abf917036de965':
  Fix leak in LayoutTransition
2015-05-07 18:29:46 +00:00
Doris Liu
c7e56e9df1 Merge "Take into account scroll offset for transition animation" into mnc-dev 2015-05-07 17:56:46 +00:00
George Mount
3f9a81757e am 7b44e5b5: am a31b76e4: am b3ba2138: Merge "Fix crash during Activity Transition with TextureView." into mnc-dev
* commit '7b44e5b5b96bc88b4f328dc1d1c2228e525e1bc8':
  Fix crash during Activity Transition with TextureView.
2015-05-07 17:17:04 +00:00
Neil Fuller
ee9623ff69 am 8106751d: am 192b52a4: am d6a21352: Remove FloatMath methods from the API
* commit '8106751ddc7bb7b34bd1179fe504c4c32c02abd2':
  Remove FloatMath methods from the API
2015-05-07 17:16:55 +00:00
Yohei Yukawa
c38088b4a4 am 9e391183: am c3d4c6a5: am f2cac4d4: Merge "Retry "Always show auxiliary subtypes from NavBar keyboard icon."" into mnc-dev
* commit '9e391183a59adddeb81537f0250b4434d1f71284':
  Retry "Always show auxiliary subtypes from NavBar keyboard icon."
2015-05-07 17:16:27 +00: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
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 4758e99783)
2015-05-07 15:02:46 +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
Bart Sears
f90d8fe435 am 4bbfd055: am d54276f6: am 1b0888fe: Merge "Revert "Always show auxiliary subtypes from NavBar keyboard icon."" into mnc-dev
* commit '4bbfd055111b6120dcf4a8fa971806c27b7dca65':
  Revert "Always show auxiliary subtypes from NavBar keyboard icon."
2015-05-07 05:42:12 +00:00
Jeff Brown
4cf355d209 am 37d66f3b: am 8d605030: am ee2e8fbe: Merge changes from topic \'mr\' into mnc-dev
* commit '37d66f3bccdde61517308b8d034484abbe82c36b':
  Replace WIFI_DISPLAY_SETTINGS with CAST_SETTINGS.
  Revert "Initial draft of new MediaRouter APIs."
2015-05-07 05:42:06 +00:00
Adam Powell
1ac256a1e7 am f1b3e224: am 7068697e: am 90ae4553: Merge "Move PhoneWindow and friends back into internal package" into mnc-dev
* commit 'f1b3e2243f93a626393602177162f0bebb8772ab':
  Move PhoneWindow and friends back into internal package
2015-05-07 05:41:04 +00:00
John Spurlock
486ebed8a4 am b5eeb1ce: am 3fa46d4e: am c2ec3340: Merge "Add setting to mute wireless charging sound." into mnc-dev
* commit 'b5eeb1cec3fee63c6720c9e0c839aae1693270cd':
  Add setting to mute wireless charging sound.
2015-05-07 05:40:54 +00:00
John Reck
e532a459ee am 105b152c: am a15ac2b0: am 4862e973: Merge "Annotate Application with @CallSuper" into mnc-dev
* commit '105b152c2758f5a0b1b1c9f008e53e8c3882de91':
  Annotate Application with @CallSuper
2015-05-07 05:40:37 +00:00
Raph Levien
2e9cef4cf0 am ff3780ee: am b4f90984: am 6402dc7e: Merge "Clear all StaticLayout.Builder fields on pool recycle" into mnc-dev
* commit 'ff3780ee918fccbc2876b7c0766e21f556c628f7':
  Clear all StaticLayout.Builder fields on pool recycle
2015-05-07 05:40:20 +00:00
Adam Powell
2c617df3b8 am 918cb6a6: am 462dc294: am cfd6e9df: Merge "Add alternate intents and refinement callbacks to ChooserActivity" into mnc-dev
* commit '918cb6a6210859573c476d7cc407f5107c2d3619':
  Add alternate intents and refinement callbacks to ChooserActivity
2015-05-07 05:39:57 +00:00
Ruben Brunk
af64c8708f am 5ca56590: am 8df59ed6: am 0a323036: Merge "Revert "camera: Start/stop preview before clearing surface."" into mnc-dev
* commit '5ca565904c4a1acccf308f1cbd3f3cbfaaea6256':
  Revert "camera: Start/stop preview before clearing surface."
2015-05-07 05:39:50 +00:00
Seigo Nonaka
2f786847a7 am 47d2753a: am 98b14c46: am 06bdf9c6: Merge "Always show auxiliary subtypes from NavBar keyboard icon." into mnc-dev
* commit '47d2753a3b629011e31f43f953290ecd0a6b8c6a':
  Always show auxiliary subtypes from NavBar keyboard icon.
2015-05-07 05:39:40 +00:00
Seigo Nonaka
14e139179b Retry "Always show auxiliary subtypes from NavBar keyboard icon."
This CL relands I1e50ee42838a1bf64a612da4904aa93458d44ea4, which was
reverted by I3decaf37198e5864a1763a059df4a36ebc70c5a7 due to the build
breakage in 'layoutlib' target, with a proper fix.

Hereafter the original CL description is repeated.

The auxiliary subtypes should be listed if the input method picker is
opened from NavBar keyboard icon.  However there is only
IMM#showInputMethodPicker() API to open input method picker and this is
also used from LockScreen or Settings UI.  Auxiliary subtypes should not
be listed there(Id7cf5d122).  Thus framework shows auxiliary subtypes
based on IMMS#mInputShown and LockScreen state, but it is not a perfect
solution.  If a physical keyboard is connected, the soft input may be
gone.  As the result, auxiliary subtypes won't be listed even if it is
opened from NavBar keyboard icon.

To fix this issue, this CL introduces IMM#showInputMethodPicker(boolean)
to be able to decide showing auxiliary subtypes by caller.
Note that IMM#showInputMethodPicker(boolean) is still hidden with @hide.
There is no public API change in this CL.

Bug: 20763994
Change-Id: Id156c85535a221235737ea6dcc15a67f1c4b9f71
2015-05-06 21:34:07 -07:00
Bart Sears
1b0888fe8e Merge "Revert "Always show auxiliary subtypes from NavBar keyboard icon."" into mnc-dev 2015-05-07 01:52:08 +00:00
Bart Sears
d130bdc462 Revert "Always show auxiliary subtypes from NavBar keyboard icon."
CL is breaking the build.  Discussed with Seigo and verting until he can take a look at it.

This reverts commit 80ff4ed6bb.

Change-Id: I3decaf37198e5864a1763a059df4a36ebc70c5a7
2015-05-07 01:51:28 +00:00
Jeff Brown
ee2e8fbe71 Merge changes from topic 'mr' into mnc-dev
* changes:
  Replace WIFI_DISPLAY_SETTINGS with CAST_SETTINGS.
  Revert "Initial draft of new MediaRouter APIs."
2015-05-07 01:31:28 +00:00
Adam Powell
90ae4553fe Merge "Move PhoneWindow and friends back into internal package" into mnc-dev 2015-05-06 23:55:56 +00:00
George Mount
8261a3f5ed Fix crash during Activity Transition with TextureView.
Bug 20675857

GhostView was synchronously forcing the View's parent to get
the display list when it was created. TextureView's cannot
create a display list until a surface is available and will
crash if it is attempted. This change moves the request to
an invalidate to get it to execute at a later time.

Change-Id: I12afebdfd57eb29c1a35b23a63d045e319547faf
2015-05-06 16:24:07 -07:00
Jeff Brown
4244ce6a17 Replace WIFI_DISPLAY_SETTINGS with CAST_SETTINGS.
Bug: 20641986
Change-Id: I137dfc7ef41bdda2ce3e81c164767319c88159f1
2015-05-06 16:02:22 -07:00
Jeff Brown
c05c1aeedf Revert "Initial draft of new MediaRouter APIs."
This reverts commit 1a937b04e6.

Bug: 20641986
Change-Id: I035d945d1561e5fc7c914aa9362635f763c83cfd
2015-05-06 16:02:21 -07:00
Adam Powell
6711f3b34c Move PhoneWindow and friends back into internal package
PhoneWindow, PhoneLayoutInflater and PhoneFallbackEventHandler decided
to @hide out over in the android.view package after the policy jar was
disbanded. Give them a more appropriate home over in framework that
doesn't imply that they should be accessed from other internal layers
of abstraction.

Bug 19606548

Change-Id: Id07b791d178fa447010b49b24726b52208838e88
2015-05-06 15:57:09 -07:00
John Spurlock
c2ec334079 Merge "Add setting to mute wireless charging sound." into mnc-dev 2015-05-06 22:49:05 +00:00
John Spurlock
51a871d48a Add setting to mute wireless charging sound.
Bug: 19538553
Change-Id: I1af971b35ae9eeb38d8ec38c57b22152095e2725
2015-05-06 18:22:40 -04:00
John Reck
4862e973a6 Merge "Annotate Application with @CallSuper" into mnc-dev 2015-05-06 22:09:59 +00:00
Raph Levien
6402dc7e4a Merge "Clear all StaticLayout.Builder fields on pool recycle" into mnc-dev 2015-05-06 21:35:13 +00:00
Raph Levien
3bd60c7b11 Clear all StaticLayout.Builder fields on pool recycle
When returning a StaticLayout.Builder object to the pool, it is
important to clear everything out. If not, then the object may have
stale state from a previous layout operation. This was causing CTS
test failures and probably other mischief.

Bug: 20636917
Change-Id: I76fb20076ee954fcb476131a8fbe8833d72fbc0d
2015-05-06 14:26:35 -07:00
Adam Powell
cfd6e9dfd0 Merge "Add alternate intents and refinement callbacks to ChooserActivity" into mnc-dev 2015-05-06 21:09:20 +00:00
Ruben Brunk
0a323036e2 Merge "Revert "camera: Start/stop preview before clearing surface."" into mnc-dev 2015-05-06 21:02:36 +00:00
Seigo Nonaka
06bdf9c6a6 Merge "Always show auxiliary subtypes from NavBar keyboard icon." into mnc-dev 2015-05-06 20:31:19 +00:00
Seigo Nonaka
80ff4ed6bb Always show auxiliary subtypes from NavBar keyboard icon.
The auxiliary subtypes should be listed if the input method picker is
opened from NavBar keyboard icon.  However there is only
IMM#showInputMethodPicker() API to open input method picker and this is
also used from LockScreen or Settings UI.  Auxiliary subtypes should not
be listed there(Id7cf5d122).  Thus framework shows auxiliary subtypes
based on IMMS#mInputShown and LockScreen state, but it is not a perfect
solution.  If a physical keyboard is connected, the soft input may be
gone.  As the result, auxiliary subtypes won't be listed even if it is
opened from NavBar keyboard icon.

To fix this issue, this CL introduces IMM#showInputMethodPicker(boolean)
to be able to decide showing auxiliary subtypes by caller.
Note that IMM#showInputMethodPicker(boolean) is still hidden with @hide.
There is no public API change in this CL.

Bug: 20763994

Change-Id: I1e50ee42838a1bf64a612da4904aa93458d44ea4
2015-05-06 20:29:05 +00:00
Adam Powell
2ed547e55f Add alternate intents and refinement callbacks to ChooserActivity
Allow a calling app to supply an array of additional Intents to the
system ChooserActivity.

The chooser will present a merged list of targets that can handle any
of the Intents supplied, including both the standard EXTRA_INTENT as
well as any of the intents supplied in EXTRA_ALTERNATE_INTENTS. These are
treated as ordered; EXTRA_INTENT is considered the first/primary
Intent and EXTRA_ALTERNATE_INTENTS are sorted most important first.

Targets are queried for all supplied Intents. If the same component is
returned for more than one Intent, the target is associated with the
most important Intent that matched.

This allows calling apps to supply several different payloads for an
action depending on what the intended targets are able to support. For
example, an app performing ACTION_SEND may supply image/jpeg data to
compatible targets or a hosted web link to targets that only support
text/plain. The user will have the opportunity to pick from a single
merged list of choices using the best available payload, and will not
be bothered with the implementation details of how the payload will be
delivered to the recipient.

If the calling app wishes to provide further disambiguation or
refinement after the user makes a choice, for example to let the user
choose which of the source intents to send from the primary or
alternates, show a progress dialog as a full-resolution version of a
photo is downloaded from the server before being sent along or while
reticulating splines, the caller can supply an IntentSender to
ACTION_CHOOSER including the extra EXTRA_REFINEMENT_INTENT_SENDER.
This should be the IntentSender obtained from a PendingIntent pointing
at an activity to launch to perform the refinement.

The refinement activity should report that it is finished by obtaining
the ResultReceiver from EXTRA_RESULT_RECEIVER. Available intents to
send to the selected target will be contained in EXTRA_INTENT and
EXTRA_ALTERNATE_INTENTS.

To complete the refinement and send the result along to the chosen
target, the refinement activity should select one of the supplied
intents and send it to the ResultReceiver in a Bundle with the key
EXTRA_INTENT and the result code RESULT_OK. To cancel the refinement,
and let the user select another choice, send RESULT_CANCEL.

While refinement activities cannot modify the filterEquals-affecting
fields of the Intent they return, they may modify extras to provide
additional or altered details to the final recipient. These extras
will be filled into the Intent sent to the final target.

Change-Id: I7ad4739eadd1a0e307675847ccf47ea948918a3a
2015-05-06 13:23:36 -07:00
Alan Viverette
6e4b9c29f8 am 5f3f0bc9: am 2ad4206e: am 4d5c20c6: Merge "ListPopupWindow should use window layout type SUB_PANEL" into mnc-dev
* commit '5f3f0bc9b445afd297fab015f18d976eff890eb0':
  ListPopupWindow should use window layout type SUB_PANEL
2015-05-06 17:55:55 +00:00
Alan Viverette
8876e44449 am 14823d60: am 72a04431: am 71b0cb04: Merge "Add scroll indicators on View, use in AlertDialog" into mnc-dev
* commit '14823d609aa66cf2980a7be0c613897752bd332a':
  Add scroll indicators on View, use in AlertDialog
2015-05-06 17:51:09 +00:00
Benjamin Franz
d4ea8f7924 am 9c400eb8: am 8fb2d472: am 94fb2024: Merge "Rename functions that disable status bar and keyguard" into mnc-dev
* commit '9c400eb8aca527c9d1fc698c8a740eafe4d58c3d':
  Rename functions that disable status bar and keyguard
2015-05-06 17:42:46 +00:00