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
Narayan Kamath
76a748e62f
Tell installd when boot completes.
...
installd can then clear the ".booting" marker from the dalvik-cache
(owned by root). This marker is used to detect boot loops.
bug: 18280671
Change-Id: I878f1463c7f523892605c17b980a51ac3b6645e2
2014-11-11 10:50:46 +00: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
Wale Ogunwale
98e70d0908
Fixed index out of bounds issue when removing windows.
...
Child windows are also removed when WMS.removeWindowInnerLocked()
is called to removed a window. This causes the number of windows
to decrement by more than 1 which causes an out of bounds exception
in AppWindowToken.removeAllWindows() which was expecting a decrement
of 1. Changed code to only continue looping if the size of the
Windows array is still greater than 0.
Bug: 18202119
Change-Id: I6124717272c552ec98e89cbacaadcd964fdba02e
2014-11-10 15:32:59 -08:00
Eric Laurent
df878bd3fc
am ced2f74a: am e8c1a97f: am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant
...
* commit 'ced2f74ac170439231f189e31538b9f403909966':
AudioEffect JNI: use new max preprocessing constant
2014-11-10 23:29:07 +00:00
Eric Laurent
ced2f74ac1
am e8c1a97f: am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant
...
* commit 'e8c1a97fa33797df528265b6f0b0c2c39ac2c589':
AudioEffect JNI: use new max preprocessing constant
2014-11-10 23:24:02 +00:00
Eric Laurent
e8c1a97fa3
am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant
...
* commit '3b92fc04700a68dab3c3c4a873535837c4e51e8b':
AudioEffect JNI: use new max preprocessing constant
2014-11-10 23:20:06 +00:00
Eric Laurent
3b92fc0470
am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant
...
* commit '1c2b0d52144dc94a7d1dcefb7e4fbd7fb29f5202':
AudioEffect JNI: use new max preprocessing constant
2014-11-10 23:11:00 +00:00
Joe Fernandez
465e053249
am 2b0b7a6c: am 3bd60359: am c2f2a725: Merge "docs:builds tools 21.1.1 update" into lmp-docs
...
* commit '2b0b7a6c2f4ec75ddb90b92e7af8362c26607495':
docs:builds tools 21.1.1 update
2014-11-10 23:06:46 +00:00
ztenghui
1a40facbfd
AVD: Requires all animator has stopped before start again.
...
We should treat all the animator as a group, we should not start again unless
all the previous animations have stopped.
b/18320770
Change-Id: I5b0c2c165cd314745ee6c7152aea3c666e9dff10
2014-11-10 15:03:59 -08:00
Joe Fernandez
2b0b7a6c2f
am 3bd60359: am c2f2a725: Merge "docs:builds tools 21.1.1 update" into lmp-docs
...
* commit '3bd60359e2db6cbd4437179225fe4f9dd4f682e4':
docs:builds tools 21.1.1 update
2014-11-10 23:02:56 +00:00
Joe Fernandez
3bd60359e2
am c2f2a725: Merge "docs:builds tools 21.1.1 update" into lmp-docs
...
* commit 'c2f2a72571a485671f36e9d5b5c1fd9e788c11cd':
docs:builds tools 21.1.1 update
2014-11-10 22:55:20 +00:00
Joe Fernandez
c2f2a72571
Merge "docs:builds tools 21.1.1 update" into lmp-docs
2014-11-10 22:50:17 +00:00
Jorim Jaggi
12174a7d29
Merge "Cancel lockscreen/shade gestures when orientation changes" into lmp-mr1-dev
2014-11-10 22:49:39 +00:00
Adrian Roos
f2bd3cc9df
Merge "Add LockSettingsStorage tests" into lmp-mr1-dev
2014-11-10 22:37:36 +00:00
vandwalle
ec3e9805dd
dont blacklist wifi config that have had validated internet status in the past
...
Change-Id: Iadb4e0e1beeb9e582b944e003470815a5a865652
2014-11-10 14:27:20 -08:00
Dirk Dougherty
4254ac0172
am 56d190c4: am f253fe3e: am 602c63f8: Merge "Add Nexus 6 and Nexus 9 to the device framer." into lmp-docs
...
* commit '56d190c4a58cc8e04d8c8a7380a0801117abcb64':
Add Nexus 6 and Nexus 9 to the device framer.
2014-11-10 22:25:29 +00:00
Justin Harrison
bd0eb36b2b
Merge "Use fonts for smaller languages of South and Southeast Asia." into lmp-mr1-dev
2014-11-10 22:24:38 +00:00
Dirk Dougherty
56d190c4a5
am f253fe3e: am 602c63f8: Merge "Add Nexus 6 and Nexus 9 to the device framer." into lmp-docs
...
* commit 'f253fe3e67345325b84fe0b13e38b8f2ec636b98':
Add Nexus 6 and Nexus 9 to the device framer.
2014-11-10 22:18:10 +00:00
Dirk Dougherty
f253fe3e67
am 602c63f8: Merge "Add Nexus 6 and Nexus 9 to the device framer." into lmp-docs
...
* commit '602c63f8405466dab18b6bbd93eb682900cf459f':
Add Nexus 6 and Nexus 9 to the device framer.
2014-11-10 22:11:54 +00:00
Deepanshu Gupta
7d3d5feb31
am 4c0f0e6c: Merge "Fix setting styles in custom views." into lmp-dev automerge: 5c22a79
...
* commit '4c0f0e6c852dd933bcfaf95380cca49a46fa3912':
Fix setting styles in custom views.
2014-11-10 22:05:27 +00:00
Deepanshu Gupta
828db35568
am 3cf0640d: Merge "Add primitive shadows support to LayoutLib" into lmp-dev automerge: 97c04ac
...
* commit '3cf0640d944a0718b9e29a2134a577e72a9432b4':
Add primitive shadows support to LayoutLib
2014-11-10 22:05:23 +00:00
Deepanshu Gupta
a09dda8162
am 0e3925df: Merge "Remove needlessly thrown IOException." into lmp-dev automerge: f305d2c
...
* commit '0e3925dfb3ea4e9185202dd963f03f5ca1df17d0':
Remove needlessly thrown IOException.
2014-11-10 22:05:16 +00:00
Jorim Jaggi
aea80f40d8
Cancel lockscreen/shade gestures when orientation changes
...
Bug: 18293929
Change-Id: Ifbf91c42fa9e68aa688ca4c390fcc24a358212a9
2014-11-10 22:42:30 +01:00
Bryce Lee
812d7025d2
Wake up device in the case a touch is encountered in theater mode when the screen is off and no dream is running.
...
Bug: 18297399
Change-Id: I5a520e8bf861e46d61e54d7d0849e55b2e5d9239
2014-11-10 13:33:28 -08:00
Adrian Roos
e542499a30
Add LockSettingsStorage tests
...
Bug: 18163444
Change-Id: I563276e6d445d43d05bf0d3c633440a8e0109b69
2014-11-10 21:03:12 +00:00
Deepanshu Gupta
4c0f0e6c85
Merge "Fix setting styles in custom views." into lmp-dev
...
automerge: 5c22a79
* commit '5c22a79baf81727b56a85a194d678c18449b5150':
Fix setting styles in custom views.
2014-11-10 21:00:43 +00:00
Deepanshu Gupta
3cf0640d94
Merge "Add primitive shadows support to LayoutLib" into lmp-dev
...
automerge: 97c04ac
* commit '97c04ac7ed4f34ca0cfb75646cc00687fb0954d4':
Add primitive shadows support to LayoutLib
2014-11-10 20:58:58 +00:00
Deepanshu Gupta
0e3925dfb3
Merge "Remove needlessly thrown IOException." into lmp-dev
...
automerge: f305d2c
* commit 'f305d2c4a80af9e2011824349adc6f133cd8822c':
Remove needlessly thrown IOException.
2014-11-10 20:56:36 +00:00
Roozbeh Pournader
2ff3ba5bfa
Use fonts for smaller languages of South and Southeast Asia.
...
Fonts for Balinese, Batak, Buginese, Buhid, Hanunnoo, Javanese,
Lepcha, Limbu, Meetei Mayek, Ol Chiki, Rejang, Saurashtra, Sundanese,
Syloti Nagri, Tagbanwa, and Thaana scripts are added.
Bug: 17686019
Change-Id: I3fb783874920909e8725097481c9e7d8e35f42f8
2014-11-10 12:49:20 -08:00
Adrian Roos
e6ef98cf05
Merge "Add caching to LockSettingsStorage" into lmp-mr1-dev
2014-11-10 20:33:10 +00:00
Deepanshu Gupta
5c22a79baf
Merge "Fix setting styles in custom views." into lmp-dev
2014-11-10 20:28:43 +00:00