191359 Commits

Author SHA1 Message Date
Deepanshu Gupta
2ab7b46056 resolved conflicts for merge of a663e012 to mnc-dev
Change-Id: I279cad7db6e9b5e97da3ea3c3bb91e09cabc7076
2015-05-06 17:45:29 -07:00
Diego Perez
d7a53dab44 am 9efcb308: am 21246bd9: am 8e75e307: am 1bc7fb2d: Merge "Fix isThemeAppCompat NPE when using an invalid theme" into lmp-mr1-dev
* commit '9efcb308615c0adaf418d430adabea3d271bcbb4':
  Fix isThemeAppCompat NPE when using an invalid theme
2015-05-07 00:34:32 +00:00
Deepanshu Gupta
15432daa6e am 9c9bcd34: am cae76a70: am 46241071: am 4f8a9996: Merge "Nullity annotations to some tests." into lmp-mr1-dev
* commit '9c9bcd3486d9f7557329dea90b3c5fa1bdace91c':
  Nullity annotations to some tests.
2015-05-07 00:34:26 +00:00
Deepanshu Gupta
dbcedeea20 am b2951490: am b19325be: am 2e3c41a4: am 92e79868: Merge "Fix title bar showing when not required." into lmp-mr1-dev
* commit 'b2951490eabf71e14c8fc5d50397adf869a2a291':
  Fix title bar showing when not required.
2015-05-07 00:34:21 +00:00
Deepanshu Gupta
c49b8f9d1b am 88b193d7: am 047a28ec: am 96437fb4: am 9aa600e7: Merge "LayoutLib: fix crash when shadow size <=0." into lmp-mr1-dev
* commit '88b193d717bb73cbe555e4e621f7b6efdf49cdaa':
  LayoutLib: fix crash when shadow size <=0.
2015-05-07 00:34:14 +00:00
Deepanshu Gupta
a663e01204 am 9abe4232: am 7e4c1a92: am b4ca896f: Merge "RecyclerView in LayoutLib: better XML attrs." into lmp-mr1-dev
* commit '9abe42324f2252460b003e6fcdb097910e16178a':
  RecyclerView in LayoutLib: better XML attrs.
2015-05-07 00:21:14 +00:00
Diego Perez
9efcb30861 am 21246bd9: am 8e75e307: am 1bc7fb2d: Merge "Fix isThemeAppCompat NPE when using an invalid theme" into lmp-mr1-dev
* commit '21246bd92f54be468496848b659bf47f2522430a':
  Fix isThemeAppCompat NPE when using an invalid theme
2015-05-07 00:21:09 +00:00
Deepanshu Gupta
9c9bcd3486 am cae76a70: am 46241071: am 4f8a9996: Merge "Nullity annotations to some tests." into lmp-mr1-dev
* commit 'cae76a70bfca9f37a10f34582cddbe0792625f26':
  Nullity annotations to some tests.
2015-05-07 00:21:03 +00:00
Deepanshu Gupta
b2951490ea am b19325be: am 2e3c41a4: am 92e79868: Merge "Fix title bar showing when not required." into lmp-mr1-dev
* commit 'b19325be074e466c39e86fd4418726a7c305546c':
  Fix title bar showing when not required.
2015-05-07 00:20:59 +00:00
Deepanshu Gupta
88b193d717 am 047a28ec: am 96437fb4: am 9aa600e7: Merge "LayoutLib: fix crash when shadow size <=0." into lmp-mr1-dev
* commit '047a28ec506bb40081eef6eaf8434884157709ce':
  LayoutLib: fix crash when shadow size <=0.
2015-05-07 00:20:53 +00:00
Deepanshu Gupta
9abe42324f am 7e4c1a92: am b4ca896f: Merge "RecyclerView in LayoutLib: better XML attrs." into lmp-mr1-dev
* commit '7e4c1a92b8f3ce02df0a1502be45c450308d81b7':
  RecyclerView in LayoutLib: better XML attrs.
2015-05-07 00:08:36 +00:00
Diego Perez
21246bd92f am 8e75e307: am 1bc7fb2d: Merge "Fix isThemeAppCompat NPE when using an invalid theme" into lmp-mr1-dev
* commit '8e75e307373a03dcbc55ce71be5b50f80e0474db':
  Fix isThemeAppCompat NPE when using an invalid theme
2015-05-07 00:08:29 +00:00
Deepanshu Gupta
cae76a70bf am 46241071: am 4f8a9996: Merge "Nullity annotations to some tests." into lmp-mr1-dev
* commit '4624107185135db9db6bfbfb3d0c3a0951c19ee1':
  Nullity annotations to some tests.
2015-05-07 00:08:22 +00:00
Deepanshu Gupta
b19325be07 am 2e3c41a4: am 92e79868: Merge "Fix title bar showing when not required." into lmp-mr1-dev
* commit '2e3c41a4e4fbb811cdafc754708d62cba7c6c1b6':
  Fix title bar showing when not required.
2015-05-07 00:08:01 +00:00
Deepanshu Gupta
047a28ec50 am 96437fb4: am 9aa600e7: Merge "LayoutLib: fix crash when shadow size <=0." into lmp-mr1-dev
* commit '96437fb4b05be2602bb0fa215988be646aec28fc':
  LayoutLib: fix crash when shadow size <=0.
2015-05-07 00:07:54 +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
Deepanshu Gupta
7e4c1a92b8 am b4ca896f: Merge "RecyclerView in LayoutLib: better XML attrs." into lmp-mr1-dev
* commit 'b4ca896f05eed9d36ac9971810d102a9139502f9':
  RecyclerView in LayoutLib: better XML attrs.
2015-05-06 23:53:32 +00:00
Diego Perez
8e75e30737 am 1bc7fb2d: Merge "Fix isThemeAppCompat NPE when using an invalid theme" into lmp-mr1-dev
* commit '1bc7fb2dcc954caac78d3fc02eb98ec30658d4d0':
  Fix isThemeAppCompat NPE when using an invalid theme
2015-05-06 23:53:27 +00:00
Deepanshu Gupta
4624107185 am 4f8a9996: Merge "Nullity annotations to some tests." into lmp-mr1-dev
* commit '4f8a999682fdb8b38ee5671b8a8f527569ebb5ff':
  Nullity annotations to some tests.
2015-05-06 23:53:23 +00:00
Deepanshu Gupta
2e3c41a4e4 am 92e79868: Merge "Fix title bar showing when not required." into lmp-mr1-dev
* commit '92e798682b5e45a05bffecb40a9b9f473420ea79':
  Fix title bar showing when not required.
2015-05-06 23:53:18 +00:00
Deepanshu Gupta
96437fb4b0 am 9aa600e7: Merge "LayoutLib: fix crash when shadow size <=0." into lmp-mr1-dev
* commit '9aa600e79f8f68115e8e95f02933376e3da7d194':
  LayoutLib: fix crash when shadow size <=0.
2015-05-06 23:53:14 +00:00
Deepanshu Gupta
b4ca896f05 Merge "RecyclerView in LayoutLib: better XML attrs." into lmp-mr1-dev 2015-05-06 23:42:56 +00:00
Diego Perez
1bc7fb2dcc Merge "Fix isThemeAppCompat NPE when using an invalid theme" into lmp-mr1-dev 2015-05-06 23:42:35 +00:00
Deepanshu Gupta
4f8a999682 Merge "Nullity annotations to some tests." into lmp-mr1-dev 2015-05-06 23:42:20 +00:00
Deepanshu Gupta
92e798682b Merge "Fix title bar showing when not required." into lmp-mr1-dev 2015-05-06 23:42:01 +00:00
Deepanshu Gupta
9aa600e79f Merge "LayoutLib: fix crash when shadow size <=0." into lmp-mr1-dev 2015-05-06 23:41:36 +00:00
Seigo Nonaka
7afd01e2f1 Merge "Do nothing if hideSoftInput is called from not focused client." into mnc-dev 2015-05-06 23:08:05 +00:00
Seigo Nonaka
ccee75966a Do nothing if hideSoftInput is called from not focused client.
IMMS#hideSoftInput calls IMMS#setImeWindowVisibilityStatusHiddenLocked
if it is called from not focused client.  However this function changes
IMS visibility state and also changes the back key indicator wrongly.
IMMS should just ignore IMMS#hideSoftInput from not-focused client.

As a preparation to fix b/20764441, this CL partially reverts
Ife3a8733b1a1bf43b195ecf4b8c5082b6538d0a0 but shouldn't have any
user-visible UX regressions.

Bug: 20764441

Change-Id: I60963f1474457ff37cca85e262460dca8105acff
2015-05-06 22:58:28 +00: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
Yorke Lee
9a7db1a6f5 Merge "Fix potential NPE in TelecomManager.placeCall" into mnc-dev 2015-05-06 22:29:25 +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
Nicolas Prevot
2665fdfd61 Merge "Fetch DISALLOW_CONFIG_VPN for the current user." into mnc-dev 2015-05-06 22:18:36 +00:00
John Reck
4862e973a6 Merge "Annotate Application with @CallSuper" into mnc-dev 2015-05-06 22:09:59 +00:00
Jinsuk Kim
e184a6b9ac Merge "CEC: Reset active source/path before going into standby" into mnc-dev 2015-05-06 22:07:23 +00:00
Matthew Williams
41fe5292fd Merge "Delay all syncing until the device is provisioned" into mnc-dev 2015-05-06 21:46:22 +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
John Spurlock
03dbaf15ee Merge "Volume a11y: Resize zen footer text when changed." into mnc-dev 2015-05-06 21:20:31 +00:00
John Spurlock
0c467064e2 Merge "Volume a11y: Rename introduction 'confirm' button to 'close'." into mnc-dev 2015-05-06 21:20:13 +00:00
Tim Murray
54e685c4bc Merge "Add frame count option to hwuitest. Also add shadowgrid2 to hwuitest" into mnc-dev 2015-05-06 21:19:44 +00:00
John Spurlock
9ea3a1e19f Volume a11y: Resize zen footer text when changed.
Bug: 20346315
Change-Id: Ia6af36d856a17639bf27c9a7b4941655d38d2a99
2015-05-06 17:12:18 -04: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
Sanket Padawe
60137fdcb3 Merge "Saved network summary string fixes in Wifi Settings" into mnc-dev 2015-05-06 20:59:16 +00:00
John Spurlock
401943053f Volume a11y: Rename introduction 'confirm' button to 'close'.
For the benefit of screen readers.

Bug: 20813824
Change-Id: I776cf75d3c0f2e2d5b67bcbad476a28f9ef37c5f
2015-05-06 16:53:21 -04:00
Tim Murray
bfbcd88aee Add frame count option to hwuitest. Also add shadowgrid2 to hwuitest
Change-Id: I069a2836cf1405adfd018ba0a058bf8f4a1cd39c
2015-05-06 13:52:06 -07: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