157081 Commits

Author SHA1 Message Date
vandwalle
3f558e7285 Merge "dont blacklist wifi config that have had validated internet status in the past" into lmp-mr1-dev 2014-11-12 01:18:10 +00:00
Wink Saville
43bbf30a06 Merge "Update SubscriptionManager API as per API council." into lmp-mr1-dev 2014-11-12 01:13:04 +00:00
Bryce Lee
5c14bc213b Merge "Wake up device in the case a touch is encountered in theater mode when the screen is off and no dream is running." into lmp-sprout-dev
automerge: 68f9773

* commit '68f97736e65f1be4664fd3c3765fc621f3b76c3a':
  Wake up device in the case a touch is encountered in theater mode when the screen is off and no dream is running.
2014-11-12 01:02:49 +00:00
Winson Chung
4ff2526ef8 Merge "Adding null checks for unset stack. (Bug 18329447)" into lmp-mr1-dev 2014-11-12 00:35:37 +00:00
Craig Mautner
c08eab81f3 Show error dialogs over apps that dismiss keyguard
Error dialogs absorb all input to ensure that they are not missed.
This can cause the screen to lock up if they are not displayed but
are still absorbing touches. This was what was happening when there
was an error dialog up at the same time as a phone call came in as
in b/17648830.

This fix recognizes when an app is dismissing the keyguard and
forces any error dialogs to be shown over such an app.

This also removes the private flags from the input system as they
are no longer needed.

Fixes bug 17648830.

Change-Id: I5c98b8265a1448b445fdb2f745fc78892f8656a4
2014-11-11 16:22:56 -08:00
Winson Chung
4ee0eb3c46 Adding null checks for unset stack. (Bug 18329447) 2014-11-11 16:11:52 -08:00
Winson Chung
147de3a976 Merge "Preload only visible thumbnails and task icons. (Bug 17672056, Bug 18291345)" into lmp-mr1-dev 2014-11-12 00:10:55 +00:00
Winson Chung
a91c293be2 Preload only visible thumbnails and task icons. (Bug 17672056, Bug 18291345)
This change ensures that only the number of visible thumbnails and task icons are
loaded to minimize the delay required when initializing the stack without the 
cache.  In addition, this change reduces the number of times that the task stack
is recomposed when launching recents (in addition to the number of calls to 
getRecentTasks()).

There is also a fix to a regression where the exit trigger is not run when the
task stack view is empty.

Change-Id: I75834ff3c57c0e5dad6252b982f71c6e740071f2
2014-11-11 16:10:05 -08:00
Amith Yamasani
93ffd5dc0a Merge "Allow profile owners to set the unknown source setting" into lmp-mr1-dev 2014-11-12 00:07:59 +00:00
Junda Liu
2eb5a5f727 Merge "Add HIDE_CARRIER_NETWORK_SETTINGS global setting." into lmp-mr1-dev 2014-11-12 00:05:20 +00:00
Bryce Lee
68f97736e6 Merge "Wake up device in the case a touch is encountered in theater mode when the screen is off and no dream is running." into lmp-sprout-dev 2014-11-11 23:59:34 +00:00
Amith Yamasani
52c39a16db Allow profile owners to set the unknown source setting
This allows work profile MDM to enable unknown sources
even if the user doesn't have UI for it. Installing an
app from an unknown source will still prompt the user
with the package installer dialog, so it's not like the
MDM can now quietly install apps from non-market sources.

Bug: 18316350

Change-Id: Ia8f4fe36f12a258aa888e085acc0b358925f4817
2014-11-11 23:38:24 +00:00
Ihab Awad
9114a845d9 Merge "Update PhoneAccount icon API (1/6)" into lmp-mr1-dev 2014-11-11 22:56:08 +00:00
Jeff Brown
32f7a6d813 Merge "Move device admin max screen off timeout to internal interface." into lmp-mr1-dev 2014-11-11 22:27:45 +00:00
Ihab Awad
476cc83558 Update PhoneAccount icon API (1/6)
Responding to comments by jeffbrown@ in http://ag/574833

Bug: 18291787

Change-Id: I011aa59642f1ca6998bce76a59850909d2daa987
2014-11-11 13:18:49 -08:00
Adam Lesinski
da772234f6 Merge "AAPT: Ignore densities specified in -c flag" into lmp-mr1-dev 2014-11-11 20:23:59 +00:00
Chris Wren
aeca1baf65 Merge "Add event logs when we launch fullscreen notications." into lmp-mr1-dev 2014-11-11 20:21:59 +00:00
Prabhakar Thirumoorthy
2cc8043cad Merge "If task isn't found in recents, look in the stacks." into lmp-mr1-dev 2014-11-11 20:01:10 +00:00
Wink Saville
a374c3d03b Update SubscriptionManager API as per API council.
bug: 17575308
Change-Id: Ib39a60e4f75981a466e9d606ec627756efad018d
2014-11-11 11:48:04 -08:00
Craig Mautner
e042bf2b22 If task isn't found in recents, look in the stacks.
It may take an attach to move a task into the recents list. If the
timing is right a task may not be in recents by the time we are
removing it from the stacks due to a finish. In that case we should
look in the stacks for the task as well as looking in recents.

Fixes bug 18017409.

Change-Id: Idcfe2e263c9d0fe9a063fdf22515ac4e7fe89ecb
2014-11-11 11:28:43 -08:00
Chong Zhang
00795e9edd Merge "return error MEDIA_ERROR_UNSUPPORTED when Range request fail" into lmp-mr1-dev 2014-11-11 18:33:21 +00:00
Chris Wren
223c66b681 Add event logs when we launch fullscreen notications.
When the heads up does not trigger on enqueue, and also when a heads up
is escalated to a fullscreen on a screen event.

Bug: 16644299
Change-Id: Iec7f7ddb966b46171d0e7d1ee52daf5847a7c9da
2014-11-11 18:11:25 +00:00
Pavel Zhamaitsiak
7635aab10b Merge "IMS: Peer capabilities support" into lmp-mr1-dev 2014-11-11 18:07:06 +00:00
Wale Ogunwale
285970cfea Merge "Fixed index out of bounds issue when removing windows." into lmp-mr1-dev 2014-11-11 18:00:06 +00:00
Alan Viverette
a9b503aec2 Merge "Fix Material styling in remaining dialogs and layouts" into lmp-mr1-dev 2014-11-11 17:34:36 +00:00
Deepanshu Gupta
7ed525bf92 am 5ad9b395: am a44fdb9e: Merge "Don\'t skip loading object animator." into lmp-dev
* commit '5ad9b395db341b3360d481039f152f8ce1d8360c':
  Don't skip loading object animator.
2014-11-11 17:22:00 +00:00
Deepanshu Gupta
5ad9b395db am a44fdb9e: Merge "Don\'t skip loading object animator." into lmp-dev
* commit 'a44fdb9e216810ba62f20c1b4571ebc240931efa':
  Don't skip loading object animator.
2014-11-11 17:17:02 +00:00
Deepanshu Gupta
a44fdb9e21 Merge "Don't skip loading object animator." into lmp-dev 2014-11-11 17:11:24 +00:00
John Spurlock
73546e5359 Merge "Zen: Exit downtime on next alarm (if mode=none)." into lmp-mr1-dev 2014-11-11 16:50:15 +00:00
Shriram Ganesh
482e6da972 IMS: Peer capabilities support
Add support for querying peer capabilities

IMS: Add support for HD icon display related information

Added support to pass the restrict cause associated with the peer
in order to enable display of the HD icon when necessary.Added
support to pass local audio codec information and defined values
for new codecs not defined.

Change-Id: If05d46bdb3907a0ec7efdde48337a7932a7a5c21
2014-11-11 16:36:15 +00:00
George Mount
12403b242f Merge "Make setOutlineProvider change transitionGroup." into lmp-mr1-dev 2014-11-11 15:41:33 +00:00
Deepanshu Gupta
2c5cddbd07 Don't skip loading object animator.
This is used by Buttons as part of StateListAnimator.

Change-Id: Id370869e71898d46e11bbd17ad31169c9f9f5274
2014-11-11 15:21:19 +00:00
John Spurlock
3c984d67eb Zen: Exit downtime on next alarm (if mode=none).
Bug: 16373455
Change-Id: Ie5d878ea4f930556ed84225c21d7c6df61024fbc
2014-11-11 10:03:24 -05:00
Tim Kilbourn
54a5ca1aad Merge "Add tv product variants to strings." into lmp-mr1-dev 2014-11-11 06:32:33 +00:00
Chong Zhang
8976a0954c return error MEDIA_ERROR_UNSUPPORTED when Range request fail
Bug: 18235751
Change-Id: I4631daf50bb76b70dd740c45b628294ad1aa45e1
2014-11-10 19:32:28 -08:00
Adam Lesinski
be593a7778 Merge "split-select: fix OSX build" into lmp-mr1-dev 2014-11-11 02:29:58 +00:00
Eric Laurent
4b7b557055 am 75c306dd: am df878bd3: am ced2f74a: am e8c1a97f: am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant automerge: 8db769d automerge: 9e0ed1c
automerge: ad64557

* commit 'ad6455721e1257054f2ca4334d2578129429e3b6':
2014-11-11 02:10:37 +00:00
Adam Lesinski
a2bb565db5 AAPT: Ignore densities specified in -c flag
The --preferred-density flag knows how to handle missing resources of
specific densities. Using -c with a density leads to missing resources.

Change-Id: I2251d842f48c08ed083663bb7ed608e14c4983c8
2014-11-10 17:56:11 -08:00
Eric Laurent
ad6455721e am 75c306dd: am df878bd3: am ced2f74a: am e8c1a97f: am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant automerge: 8db769d automerge: 9e0ed1c
* commit '75c306ddc716b36bdc54aaf75dd7eacbd008ab98':
2014-11-11 01:43:21 +00:00
Adam Lesinski
c3344e8a6d split-select: fix OSX build
Clang is a bit stricter about what template definition it chooses
for mixed types that are normally possible to cast between.
Operations like std::find(int iterator, int iterator, enum) will fail,
as Clang won't implicitly cast an enum to an int here.

Change-Id: Ib2276c382ebf2b877e1045d32b1a9d0a1fa4d4a4
2014-11-10 17:39:47 -08:00
Eric Laurent
75c306ddc7 am df878bd3: am ced2f74a: am e8c1a97f: am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant automerge: 8db769d
automerge: 9e0ed1c

* commit '9e0ed1c2d67bc2ec74e24782f3738889fa0d79d2':
2014-11-11 01:34:45 +00:00
Dianne Hackborn
85d558cd48 Add Activity API to get referrer information.
This expands the use of EXTRA_REFERRER to be relevant anywhere,
allowing apps to supply referrer information if they want.  However,
if they don't explicitly supply it, then the platform now keeps
track of package names that go with Intents when delivering them
to apps, which it can be returned as the default value.

The new method Activity.getReferrer() is used to retrieve this
referrer information.  It knows about EXTRA_REFERRER, it can return
the default package name tracked internally, and it also can return
a new EXTRA_REFERRER_NAME if that exists.  The latter is needed
because we can't use EXTRA_REFERRER in some cases since it is a Uri,
and things like #Intent; URI extras can only generate primitive type
extras.  We really need to support this syntax for referrers, so we
need to have this additional extra field as an option.

When a referrer is to a native app, we are adopting the android-app
scheme.  Since we are doing this, Intent's URI creation and parsing
now supports this scheme, and we improve its syntax to be able to build
intents with custom actions and stuff, instead of being all hung up
on custom schemes.

While doing this, fixed a problem when parsing both intent: and new
android-app: schemes with a selector portion, where we were not
respecting any scheme that was specified.

Change-Id: I06e55221e21a8156c1d6ac755a254fea386917a2
2014-11-11 00:42:18 +00:00
Eric Laurent
9e0ed1c2d6 am df878bd3: am ced2f74a: am e8c1a97f: am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant
automerge: 8db769d

* commit '8db769dd56822a59f1997a9cb53ed02d3d1cb8dd':
  AudioEffect JNI: use new max preprocessing constant
2014-11-11 00:22:33 +00:00
Alan Viverette
f89b58ca83 Fix Material styling in remaining dialogs and layouts
Also updates existing row and dialog layouts to use preferred list item
or dialog padding as appropriate, fixes incorrect activity themes, and
updates ChooseAccountActivity variants for Material.

BUG: 18314215
BUG: 18292562
Change-Id: I2fde4ba6db80d839104abdaa334a46ad1861600f
2014-11-10 16:14:27 -08:00
Alan Viverette
993e3d2d40 Merge "Call OnTimeChangedListener when new TimePicker values are selected" into lmp-mr1-dev 2014-11-10 23:54:47 +00:00
Eric Laurent
85a5f23b7f am ca7c01cb: am 3011e1be: am 8db769dd: am df878bd3: am ced2f74a: am e8c1a97f: am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant
* commit 'ca7c01cb5c0d458ba8614e9294cc91167a102216':
  AudioEffect JNI: use new max preprocessing constant
2014-11-10 23:52:27 +00:00
George Mount
19c1cbda5a Merge "Only modify add Transition targets when they aren't targeted." into lmp-mr1-dev 2014-11-10 23:48:34 +00:00
Eric Laurent
ca7c01cb5c am 3011e1be: am 8db769dd: am df878bd3: am ced2f74a: am e8c1a97f: am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant
* commit '3011e1be2c14f99b1fd72b7e17207ad067668f1b':
  AudioEffect JNI: use new max preprocessing constant
2014-11-10 23:44:16 +00:00
Eric Laurent
3011e1be2c am 8db769dd: am df878bd3: am ced2f74a: am e8c1a97f: am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant
* commit '8db769dd56822a59f1997a9cb53ed02d3d1cb8dd':
  AudioEffect JNI: use new max preprocessing constant
2014-11-10 23:38:23 +00:00
Eric Laurent
8db769dd56 am df878bd3: am ced2f74a: am e8c1a97f: am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant
* commit 'df878bd3fc63f26e91b055e39ba63c53c14b31a0':
  AudioEffect JNI: use new max preprocessing constant
2014-11-10 23:33:52 +00:00