OSDN Git Service
Geoff Mendal [Wed, 12 Nov 2014 14:44:26 +0000 (06:44 -0800)]
Import translations. DO NOT MERGE
Change-Id: I1d3ed380c4223bdb6bc2b3d4def0f270a8035b80
Auto-generated-cl: translation import
Narayan Kamath [Wed, 12 Nov 2014 13:30:15 +0000 (13:30 +0000)]
Merge "Remove unused local field." into lmp-mr1-dev
Narayan Kamath [Wed, 12 Nov 2014 12:48:20 +0000 (12:48 +0000)]
Merge "Tell installd when boot completes." into lmp-mr1-dev
Adrian Roos [Tue, 11 Nov 2014 12:51:07 +0000 (13:51 +0100)]
Obliterate LockPatternUtilsCache
It is disabled dead code already and not useful anymore
with the new caching in LockSettingsService.
Bug:
18163444
Change-Id: Icc184e923e0fbeab31ed128336c01f835b24c6f2
Adrian Roos [Tue, 11 Nov 2014 11:55:44 +0000 (12:55 +0100)]
Properly destroy TrustAgentWrapper when not bound
Also fixes a potential issue where refreshing agents
for a user that no longer exists would result in a crash.
Bug:
18318629
Change-Id: I3589ea7e0f2e63fca02daeecf3ca964a8a8e4b3b
Alan Viverette [Wed, 12 Nov 2014 02:04:20 +0000 (02:04 +0000)]
Merge "Reduce number of saveLayer calls in RippleDrawable" into lmp-mr1-dev
vandwalle [Wed, 12 Nov 2014 01:18:08 +0000 (01:18 +0000)]
Merge "dont blacklist wifi config that have had validated internet status in the past" into lmp-mr1-dev
Wink Saville [Wed, 12 Nov 2014 01:13:01 +0000 (01:13 +0000)]
Merge "Update SubscriptionManager API as per API council." into lmp-mr1-dev
Bryce Lee [Wed, 12 Nov 2014 01:02:49 +0000 (01:02 +0000)]
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.
Winson Chung [Wed, 12 Nov 2014 00:35:35 +0000 (00:35 +0000)]
Merge "Adding null checks for unset stack. (Bug
18329447)" into lmp-mr1-dev
Craig Mautner [Tue, 11 Nov 2014 17:03:59 +0000 (09:03 -0800)]
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
Winson Chung [Wed, 12 Nov 2014 00:11:52 +0000 (16:11 -0800)]
Adding null checks for unset stack. (Bug
18329447)
Winson Chung [Wed, 12 Nov 2014 00:10:53 +0000 (00:10 +0000)]
Merge "Preload only visible thumbnails and task icons. (Bug
17672056, Bug
18291345)" into lmp-mr1-dev
Winson Chung [Fri, 7 Nov 2014 23:02:38 +0000 (15:02 -0800)]
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
Amith Yamasani [Wed, 12 Nov 2014 00:07:57 +0000 (00:07 +0000)]
Merge "Allow profile owners to set the unknown source setting" into lmp-mr1-dev
Junda Liu [Wed, 12 Nov 2014 00:05:18 +0000 (00:05 +0000)]
Merge "Add HIDE_CARRIER_NETWORK_SETTINGS global setting." into lmp-mr1-dev
Bryce Lee [Tue, 11 Nov 2014 23:59:32 +0000 (23:59 +0000)]
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
Amith Yamasani [Tue, 21 Oct 2014 18:14:04 +0000 (11:14 -0700)]
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
Ihab Awad [Tue, 11 Nov 2014 22:56:07 +0000 (22:56 +0000)]
Merge "Update PhoneAccount icon API (1/6)" into lmp-mr1-dev
Jeff Brown [Tue, 11 Nov 2014 22:27:43 +0000 (22:27 +0000)]
Merge "Move device admin max screen off timeout to internal interface." into lmp-mr1-dev
Ihab Awad [Mon, 3 Nov 2014 17:47:51 +0000 (09:47 -0800)]
Update PhoneAccount icon API (1/6)
Responding to comments by jeffbrown@ in http://ag/574833
Bug:
18291787
Change-Id: I011aa59642f1ca6998bce76a59850909d2daa987
Adam Lesinski [Tue, 11 Nov 2014 20:23:57 +0000 (20:23 +0000)]
Merge "AAPT: Ignore densities specified in -c flag" into lmp-mr1-dev
Chris Wren [Tue, 11 Nov 2014 20:21:57 +0000 (20:21 +0000)]
Merge "Add event logs when we launch fullscreen notications." into lmp-mr1-dev
Prabhakar Thirumoorthy [Tue, 11 Nov 2014 20:01:08 +0000 (20:01 +0000)]
Merge "If task isn't found in recents, look in the stacks." into lmp-mr1-dev
Wink Saville [Tue, 11 Nov 2014 19:48:04 +0000 (11:48 -0800)]
Update SubscriptionManager API as per API council.
bug:
17575308
Change-Id: Ib39a60e4f75981a466e9d606ec627756efad018d
Craig Mautner [Tue, 11 Nov 2014 19:28:43 +0000 (11:28 -0800)]
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
Chong Zhang [Tue, 11 Nov 2014 18:33:20 +0000 (18:33 +0000)]
Merge "return error MEDIA_ERROR_UNSUPPORTED when Range request fail" into lmp-mr1-dev
Chris Wren [Mon, 10 Nov 2014 21:00:09 +0000 (16:00 -0500)]
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
Pavel Zhamaitsiak [Tue, 11 Nov 2014 18:07:05 +0000 (18:07 +0000)]
Merge "IMS: Peer capabilities support" into lmp-mr1-dev
Wale Ogunwale [Tue, 11 Nov 2014 18:00:04 +0000 (18:00 +0000)]
Merge "Fixed index out of bounds issue when removing windows." into lmp-mr1-dev
Alan Viverette [Tue, 11 Nov 2014 17:34:34 +0000 (17:34 +0000)]
Merge "Fix Material styling in remaining dialogs and layouts" into lmp-mr1-dev
Deepanshu Gupta [Tue, 11 Nov 2014 17:22:00 +0000 (17:22 +0000)]
am
5ad9b395: am
a44fdb9e: Merge "Don\'t skip loading object animator." into lmp-dev
* commit '
5ad9b395db341b3360d481039f152f8ce1d8360c':
Don't skip loading object animator.
Deepanshu Gupta [Tue, 11 Nov 2014 17:17:02 +0000 (17:17 +0000)]
am
a44fdb9e: Merge "Don\'t skip loading object animator." into lmp-dev
* commit '
a44fdb9e216810ba62f20c1b4571ebc240931efa':
Don't skip loading object animator.
Deepanshu Gupta [Tue, 11 Nov 2014 17:11:22 +0000 (17:11 +0000)]
Merge "Don't skip loading object animator." into lmp-dev
John Spurlock [Tue, 11 Nov 2014 16:50:12 +0000 (16:50 +0000)]
Merge "Zen: Exit downtime on next alarm (if mode=none)." into lmp-mr1-dev
Shriram Ganesh [Mon, 13 Oct 2014 18:31:50 +0000 (11:31 -0700)]
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
George Mount [Tue, 11 Nov 2014 15:41:32 +0000 (15:41 +0000)]
Merge "Make setOutlineProvider change transitionGroup." into lmp-mr1-dev
Deepanshu Gupta [Tue, 11 Nov 2014 15:21:19 +0000 (15:21 +0000)]
Don't skip loading object animator.
This is used by Buttons as part of StateListAnimator.
Change-Id: Id370869e71898d46e11bbd17ad31169c9f9f5274
John Spurlock [Tue, 11 Nov 2014 03:04:12 +0000 (22:04 -0500)]
Zen: Exit downtime on next alarm (if mode=none).
Bug:
16373455
Change-Id: Ie5d878ea4f930556ed84225c21d7c6df61024fbc
Narayan Kamath [Mon, 10 Nov 2014 14:23:41 +0000 (14:23 +0000)]
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
Tim Kilbourn [Tue, 11 Nov 2014 06:32:32 +0000 (06:32 +0000)]
Merge "Add tv product variants to strings." into lmp-mr1-dev
Chong Zhang [Tue, 11 Nov 2014 03:31:01 +0000 (19:31 -0800)]
return error MEDIA_ERROR_UNSUPPORTED when Range request fail
Bug:
18235751
Change-Id: I4631daf50bb76b70dd740c45b628294ad1aa45e1
Adam Lesinski [Tue, 11 Nov 2014 02:29:57 +0000 (02:29 +0000)]
Merge "split-select: fix OSX build" into lmp-mr1-dev
Eric Laurent [Tue, 11 Nov 2014 02:10:37 +0000 (02:10 +0000)]
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':
Adam Lesinski [Tue, 11 Nov 2014 01:56:11 +0000 (17:56 -0800)]
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
Eric Laurent [Tue, 11 Nov 2014 01:43:21 +0000 (01:43 +0000)]
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':
Adam Lesinski [Tue, 11 Nov 2014 01:32:27 +0000 (17:32 -0800)]
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
Eric Laurent [Tue, 11 Nov 2014 01:34:45 +0000 (01:34 +0000)]
am
df878bd3: am
ced2f74a: am
e8c1a97f: am
3b92fc04: am
1c2b0d52: AudioEffect JNI: use new max preprocessing constant automerge:
8db769d
automerge:
9e0ed1c
* commit '
9e0ed1c2d67bc2ec74e24782f3738889fa0d79d2':
Dianne Hackborn [Tue, 4 Nov 2014 18:31:54 +0000 (10:31 -0800)]
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
Eric Laurent [Tue, 11 Nov 2014 00:22:33 +0000 (00:22 +0000)]
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
Alan Viverette [Tue, 11 Nov 2014 00:14:27 +0000 (16:14 -0800)]
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
Alan Viverette [Mon, 10 Nov 2014 23:54:45 +0000 (23:54 +0000)]
Merge "Call OnTimeChangedListener when new TimePicker values are selected" into lmp-mr1-dev
Eric Laurent [Mon, 10 Nov 2014 23:52:27 +0000 (23:52 +0000)]
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
George Mount [Mon, 10 Nov 2014 23:48:32 +0000 (23:48 +0000)]
Merge "Only modify add Transition targets when they aren't targeted." into lmp-mr1-dev
Eric Laurent [Mon, 10 Nov 2014 23:44:16 +0000 (23:44 +0000)]
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
Eric Laurent [Mon, 10 Nov 2014 23:38:23 +0000 (23:38 +0000)]
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
Eric Laurent [Mon, 10 Nov 2014 23:33:52 +0000 (23:33 +0000)]
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
Wale Ogunwale [Mon, 10 Nov 2014 20:12:27 +0000 (12:12 -0800)]
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
Eric Laurent [Mon, 10 Nov 2014 23:29:07 +0000 (23:29 +0000)]
am
ced2f74a: am
e8c1a97f: am
3b92fc04: am
1c2b0d52: AudioEffect JNI: use new max preprocessing constant
* commit '
ced2f74ac170439231f189e31538b9f403909966':
AudioEffect JNI: use new max preprocessing constant
Eric Laurent [Mon, 10 Nov 2014 23:24:02 +0000 (23:24 +0000)]
am
e8c1a97f: am
3b92fc04: am
1c2b0d52: AudioEffect JNI: use new max preprocessing constant
* commit '
e8c1a97fa33797df528265b6f0b0c2c39ac2c589':
AudioEffect JNI: use new max preprocessing constant
Eric Laurent [Mon, 10 Nov 2014 23:20:06 +0000 (23:20 +0000)]
am
3b92fc04: am
1c2b0d52: AudioEffect JNI: use new max preprocessing constant
* commit '
3b92fc04700a68dab3c3c4a873535837c4e51e8b':
AudioEffect JNI: use new max preprocessing constant
Eric Laurent [Mon, 10 Nov 2014 23:11:00 +0000 (23:11 +0000)]
am
1c2b0d52: AudioEffect JNI: use new max preprocessing constant
* commit '
1c2b0d52144dc94a7d1dcefb7e4fbd7fb29f5202':
AudioEffect JNI: use new max preprocessing constant
Joe Fernandez [Mon, 10 Nov 2014 23:06:46 +0000 (23:06 +0000)]
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
Joe Fernandez [Mon, 10 Nov 2014 23:02:56 +0000 (23:02 +0000)]
am
3bd60359: am
c2f2a725: Merge "docs:builds tools 21.1.1 update" into lmp-docs
* commit '
3bd60359e2db6cbd4437179225fe4f9dd4f682e4':
docs:builds tools 21.1.1 update
Joe Fernandez [Mon, 10 Nov 2014 22:55:20 +0000 (22:55 +0000)]
am
c2f2a725: Merge "docs:builds tools 21.1.1 update" into lmp-docs
* commit '
c2f2a72571a485671f36e9d5b5c1fd9e788c11cd':
docs:builds tools 21.1.1 update
Joe Fernandez [Mon, 10 Nov 2014 22:50:16 +0000 (22:50 +0000)]
Merge "docs:builds tools 21.1.1 update" into lmp-docs
Jorim Jaggi [Mon, 10 Nov 2014 22:49:36 +0000 (22:49 +0000)]
Merge "Cancel lockscreen/shade gestures when orientation changes" into lmp-mr1-dev
Adrian Roos [Mon, 10 Nov 2014 22:37:33 +0000 (22:37 +0000)]
Merge "Add LockSettingsStorage tests" into lmp-mr1-dev
vandwalle [Sat, 8 Nov 2014 01:29:24 +0000 (17:29 -0800)]
dont blacklist wifi config that have had validated internet status in the past
Change-Id: Iadb4e0e1beeb9e582b944e003470815a5a865652
Dirk Dougherty [Mon, 10 Nov 2014 22:25:29 +0000 (22:25 +0000)]
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.
Justin Harrison [Mon, 10 Nov 2014 22:24:37 +0000 (22:24 +0000)]
Merge "Use fonts for smaller languages of South and Southeast Asia." into lmp-mr1-dev
Dirk Dougherty [Mon, 10 Nov 2014 22:18:10 +0000 (22:18 +0000)]
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.
Dirk Dougherty [Mon, 10 Nov 2014 22:11:54 +0000 (22:11 +0000)]
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.
Deepanshu Gupta [Mon, 10 Nov 2014 22:05:27 +0000 (22:05 +0000)]
am
4c0f0e6c: Merge "Fix setting styles in custom views." into lmp-dev automerge:
5c22a79
* commit '
4c0f0e6c852dd933bcfaf95380cca49a46fa3912':
Fix setting styles in custom views.
Deepanshu Gupta [Mon, 10 Nov 2014 22:05:23 +0000 (22:05 +0000)]
am
3cf0640d: Merge "Add primitive shadows support to LayoutLib" into lmp-dev automerge:
97c04ac
* commit '
3cf0640d944a0718b9e29a2134a577e72a9432b4':
Add primitive shadows support to LayoutLib
Deepanshu Gupta [Mon, 10 Nov 2014 22:05:16 +0000 (22:05 +0000)]
am
0e3925df: Merge "Remove needlessly thrown IOException." into lmp-dev automerge:
f305d2c
* commit '
0e3925dfb3ea4e9185202dd963f03f5ca1df17d0':
Remove needlessly thrown IOException.
Jorim Jaggi [Mon, 10 Nov 2014 21:41:54 +0000 (22:41 +0100)]
Cancel lockscreen/shade gestures when orientation changes
Bug:
18293929
Change-Id: Ifbf91c42fa9e68aa688ca4c390fcc24a358212a9
Bryce Lee [Mon, 10 Nov 2014 21:33:28 +0000 (13:33 -0800)]
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
Adrian Roos [Fri, 7 Nov 2014 20:47:17 +0000 (21:47 +0100)]
Add LockSettingsStorage tests
Bug:
18163444
Change-Id: I563276e6d445d43d05bf0d3c633440a8e0109b69
Deepanshu Gupta [Mon, 10 Nov 2014 21:00:43 +0000 (21:00 +0000)]
Merge "Fix setting styles in custom views." into lmp-dev
automerge:
5c22a79
* commit '
5c22a79baf81727b56a85a194d678c18449b5150':
Fix setting styles in custom views.
Deepanshu Gupta [Mon, 10 Nov 2014 20:58:58 +0000 (20:58 +0000)]
Merge "Add primitive shadows support to LayoutLib" into lmp-dev
automerge:
97c04ac
* commit '
97c04ac7ed4f34ca0cfb75646cc00687fb0954d4':
Add primitive shadows support to LayoutLib
Deepanshu Gupta [Mon, 10 Nov 2014 20:56:36 +0000 (20:56 +0000)]
Merge "Remove needlessly thrown IOException." into lmp-dev
automerge:
f305d2c
* commit '
f305d2c4a80af9e2011824349adc6f133cd8822c':
Remove needlessly thrown IOException.
Roozbeh Pournader [Thu, 2 Oct 2014 05:12:36 +0000 (22:12 -0700)]
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
Adrian Roos [Mon, 10 Nov 2014 20:33:08 +0000 (20:33 +0000)]
Merge "Add caching to LockSettingsStorage" into lmp-mr1-dev
Deepanshu Gupta [Mon, 10 Nov 2014 20:28:40 +0000 (20:28 +0000)]
Merge "Fix setting styles in custom views." into lmp-dev
Adrian Roos [Wed, 29 Oct 2014 13:43:56 +0000 (14:43 +0100)]
Add caching to LockSettingsStorage
Bug:
18163444
Change-Id: I4caa80ca55efec761e965807ae793db41864321f
Deepanshu Gupta [Mon, 10 Nov 2014 20:10:55 +0000 (20:10 +0000)]
Fix setting styles in custom views.
Bug: http://b.android.com/78842
Change-Id: I5d4571d94d96b00419acc258c9e2b519367b689d
Evan Charlton [Mon, 10 Nov 2014 19:54:34 +0000 (19:54 +0000)]
Merge "Apply @hide / @SystemApi to android.telecom.*" into lmp-mr1-dev
Evan Charlton [Sat, 8 Nov 2014 23:49:16 +0000 (15:49 -0800)]
Apply @hide / @SystemApi to android.telecom.*
Move the android.telecom.* namespace back to @hide, and also mark it
with @SystemApi so that system-privileged apps can use them.
Bug:
18302450
Change-Id: I33ae1b9b0dfdb1c5eff51ca3c829196bcfc9411c
Adam Lesinski [Mon, 10 Nov 2014 19:45:26 +0000 (19:45 +0000)]
Merge "split-select: Fix rules generated for anydpi density" into lmp-mr1-dev
Dirk Dougherty [Mon, 10 Nov 2014 19:45:16 +0000 (19:45 +0000)]
Merge "Add Nexus 6 and Nexus 9 to the device framer." into lmp-docs
Eric Laurent [Wed, 5 Nov 2014 20:18:05 +0000 (12:18 -0800)]
AudioEffect JNI: use new max preprocessing constant
Bug:
18226810.
Change-Id: Ica5677da247268306b34dfce38f25394586817fd
(cherry picked from commit
b27a8a5bcc40054f6d775d070bc2de6eb996d1c2)
John Spurlock [Mon, 10 Nov 2014 19:24:14 +0000 (19:24 +0000)]
Merge "Zen: Pull next-alarm tracking out into separate helper." into lmp-mr1-dev
Santos Cordon [Sat, 8 Nov 2014 00:05:09 +0000 (16:05 -0800)]
Make add-call a global property of telecom. (1/4)
ADD_CALL didn't make sense as a property of Connection or Call.
This changes it to be a global property instead.
Bug:
18285352
Change-Id: I658e7a6977a848600272cde2914612c8691bb801
John Spurlock [Mon, 10 Nov 2014 19:05:13 +0000 (14:05 -0500)]
Zen: Pull next-alarm tracking out into separate helper.
In preparation for sharing with DowntimeConditionProvider.
Bug:
16373455
Change-Id: If8d90187fa399935137c7ba6152925a9106a4596
Deepanshu Gupta [Mon, 10 Nov 2014 18:58:27 +0000 (18:58 +0000)]
Merge "Add primitive shadows support to LayoutLib" into lmp-dev
Deepanshu Gupta [Mon, 10 Nov 2014 18:54:19 +0000 (18:54 +0000)]
Merge "Remove needlessly thrown IOException." into lmp-dev
Tim Kilbourn [Fri, 7 Nov 2014 20:35:54 +0000 (12:35 -0800)]
Add tv product variants to strings.
Bug:
18053999
Change-Id: I7d1a21600d7b0e4dea16b8cf7a2fc1ba552de930
Adrian Roos [Mon, 10 Nov 2014 18:35:56 +0000 (18:35 +0000)]
Merge "Disable LockPatternUtilsCache" into lmp-mr1-dev
Jorim Jaggi [Mon, 10 Nov 2014 18:31:54 +0000 (18:31 +0000)]
Merge "Fix Keyguard affordances for RTL" into lmp-mr1-dev