Commit Graph

51805 Commits

Author SHA1 Message Date
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
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
Clara Bayarri
801386147f am 385d59e4: am c3a0d0b0: am fbb34dd8: Merge "Allow Floating ActionModes in SearchDialog." into mnc-dev
* commit '385d59e43c42d3ba54115af8f8ea29bcb1d83e45':
  Allow Floating ActionModes in SearchDialog.
2015-05-06 17:42:27 +00:00
Adam Lesinski
89b4c11fac am 05da4d1a: am fc29dd14: am c9399a80: Merge "Fix overcounting of mobile radio" into mnc-dev
* commit '05da4d1acd2db2fb282fa70a002cd6843f232a1c':
  Fix overcounting of mobile radio
2015-05-06 17:41:47 +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
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
John Reck
add70268b1 Annotate Application with @CallSuper
Bug: 19844784
Change-Id: I12431ed65edd0076e1231ba6ebcff479580370c4
2015-05-06 09:44:53 -07:00
Benjamin Franz
94fb2024b0 Merge "Rename functions that disable status bar and keyguard" into mnc-dev 2015-05-06 15:16:20 +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
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
Prerepa Viswanadham
5af99614f2 Merge "Make onlost/onfound APIs public" 2015-05-06 01:15:00 +00:00
John Spurlock
f733ac5bf0 am 08e1fc30: am aca04f6a: am bc1a2ad8: Merge "Zen: Maintain source filters for both calls and messages." into mnc-dev
* commit '08e1fc30cb0d9c37a9b1bae70a8b051ae9ac2948':
  Zen: Maintain source filters for both calls and messages.
2015-05-06 01:05:44 +00:00
Prerepa Viswanadham
d3df86e5f0 Make onlost/onfound APIs public
Change-Id: I455124478d953d652f216f71d5813782fc9633ab
2015-05-05 17:56:38 -07:00
Selim Cinek
b9040caa63 am 1762af03: am e948bfeb: am 6329bbce: Merge "The voice assist may now be launched above the lockscreen" into mnc-dev
* commit '1762af0307930942cfec3b2ad6dd7f6a8663b2b6':
  The voice assist may now be launched above the lockscreen
2015-05-06 00:45:09 +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
Selim Cinek
6329bbceeb Merge "The voice assist may now be launched above the lockscreen" into mnc-dev 2015-05-05 23:52:35 +00:00
John Spurlock
a492d1d88c Zen: Maintain source filters for both calls and messages.
Bug: 18635172
Change-Id: Ifeb56f1c8d8a30c4966c628edf7512199f3edb22
2015-05-05 18:45:42 -04:00
Cheuksan Wang
f657b9969d add a parameter to carrier messaging calls to request delivery status
In the carrier messaging API, I forgot to add the parameter to request
delivery status. We need to add one more parameter (to indicate
requesting delivery status) to these calls:

onSendMultipartTextSms
onSendTextSms
onSendDataSms

Backward compatibility is maintained in
CarrierMessagingService.java. Third-party carrier apps implementing
the old API will continue to work.

BUG: 20224743
Change-Id: I09901558e7cb75a9ec6a5bd5ba2c8117ac471932
2015-05-05 15:24:18 -07:00
Chris Craik
629f9c715c am 8fffd604: am 217ade77: am 356b1777: Merge "Cleanup properties" into mnc-dev
* commit '8fffd6045d0eb27fbd6e894f6eee9818cda973bc':
  Cleanup properties
2015-05-05 22:03:13 +00:00
Selim Cinek
e70d653523 The voice assist may now be launched above the lockscreen
A possibility was introduced to launch voice assist over
the lockscreen using the left keyguard affordance.

Change-Id: Ic4618d24256b65441a50d77d0ef59b0ec99b6ead
2015-05-05 14:52:52 -07:00
Chris Craik
356b177709 Merge "Cleanup properties" into mnc-dev 2015-05-05 21:30:08 +00:00
Jorim Jaggi
9a284f53f7 am 4eca7067: am 3bf26f1d: am 5be4d295: Merge "Only enable fingerprint auth after first regular auth" into mnc-dev
* commit '4eca70673174c684de4a337d738660b6c1988dfc':
  Only enable fingerprint auth after first regular auth
2015-05-05 21:11:57 +00:00
Hiroshi Yamauchi
7cd8fae4e2 am 8dafa569: am 09aea299: am 95e6c78f: Merge "Fix binder force gc will block binder thread" into mnc-dev
* commit '8dafa569113847f0497386206d5f8e4b5a45408a':
  Fix binder force gc will block binder thread
2015-05-05 21:03:04 +00:00
Jorim Jaggi
5be4d295c0 Merge "Only enable fingerprint auth after first regular auth" into mnc-dev 2015-05-05 20:51:18 +00:00
Hiroshi Yamauchi
95e6c78f3f Merge "Fix binder force gc will block binder thread" into mnc-dev 2015-05-05 20:31:42 +00:00
Raph Levien
9985ca8788 am 37360dd4: am 8d736c1c: am be8db119: Merge "Fix NPE in Html.inParagraph()" into mnc-dev
* commit '37360dd4c770c5c0bfa61a5992c98d7461402fc6':
  Fix NPE in Html.inParagraph()
2015-05-05 19:24:09 +00:00
Julia Reynolds
af491c6b24 am ac032058: am 16d4d46a: am 9e540a51: Merge "Fixing docs." into mnc-dev
* commit 'ac032058c54d456011c154df4e465b955c7f7706':
  Fixing docs.
2015-05-05 19:24:04 +00:00
Alan Viverette
aacb91d57d am 0de8c44a: am 4a207c4f: am 261208e0: Merge "Add API for obtaining changing configurations bitmask from Theme" into mnc-dev
* commit '0de8c44a7497d79f9e21a4713061c0e74bd5ccae':
  Add API for obtaining changing configurations bitmask from Theme
2015-05-05 19:23:43 +00:00
Todd Kennedy
19cc03a178 am 170f0406: am 2e22cec8: am 3266f60b: Merge "Call Activity#onAttachFragment()" into mnc-dev
* commit '170f0406021e7ef2d9a9735506171e2dc6e4720d':
  Call Activity#onAttachFragment()
2015-05-05 19:23:31 +00:00
Svet Ganov
b0a09de819 am 4e2029c0: am 2514a265: am 4a64b19f: Merge "Permission UI - legacy apps support" into mnc-dev
* commit '4e2029c058966f30a71b1bcea16aa65a5d7f85c4':
  Permission UI - legacy apps support
2015-05-05 19:23:20 +00:00
John Spurlock
fba7c4eadc am aac2806e: am 0c9c89a1: am 0bc8afff: Merge "Zen: Remove calendar rule attendance attribute." into mnc-dev
* commit 'aac2806e085eda5e91c0c5d1ea67de889314f2f0':
  Zen: Remove calendar rule attendance attribute.
2015-05-05 19:23:09 +00:00