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
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
Adrian Roos
3dcae68501
Add caching to LockSettingsStorage
...
Bug: 18163444
Change-Id: I4caa80ca55efec761e965807ae793db41864321f
2014-11-10 21:27:49 +01:00
Deepanshu Gupta
8657baa06d
Fix setting styles in custom views.
...
Bug: http://b.android.com/78842
Change-Id: I5d4571d94d96b00419acc258c9e2b519367b689d
2014-11-10 20:10:55 +00:00
Evan Charlton
e2e649f537
Merge "Apply @hide / @SystemApi to android.telecom.*" into lmp-mr1-dev
2014-11-10 19:54:36 +00:00
Evan Charlton
0e094d926c
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
2014-11-10 11:52:31 -08:00
Adam Lesinski
a674a1ee79
Merge "split-select: Fix rules generated for anydpi density" into lmp-mr1-dev
2014-11-10 19:45:28 +00:00
Dirk Dougherty
602c63f840
Merge "Add Nexus 6 and Nexus 9 to the device framer." into lmp-docs
2014-11-10 19:45:18 +00:00
Eric Laurent
1c2b0d5214
AudioEffect JNI: use new max preprocessing constant
...
Bug: 18226810.
Change-Id: Ica5677da247268306b34dfce38f25394586817fd
(cherry picked from commit b27a8a5bcc40054f6d775d070bc2de6eb996d1c2)
2014-11-10 19:44:15 +00:00
John Spurlock
7936ca36d9
Merge "Zen: Pull next-alarm tracking out into separate helper." into lmp-mr1-dev
2014-11-10 19:24:16 +00:00
Santos Cordon
6c912b7d05
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
2014-11-10 19:19:35 +00:00
John Spurlock
6b0623a112
Zen: Pull next-alarm tracking out into separate helper.
...
In preparation for sharing with DowntimeConditionProvider.
Bug: 16373455
Change-Id: If8d90187fa399935137c7ba6152925a9106a4596
2014-11-10 14:05:13 -05:00
Deepanshu Gupta
97c04ac7ed
Merge "Add primitive shadows support to LayoutLib" into lmp-dev
2014-11-10 18:58:30 +00:00
Deepanshu Gupta
f305d2c4a8
Merge "Remove needlessly thrown IOException." into lmp-dev
2014-11-10 18:54:21 +00:00
Tim Kilbourn
8299d02927
Add tv product variants to strings.
...
Bug: 18053999
Change-Id: I7d1a21600d7b0e4dea16b8cf7a2fc1ba552de930
2014-11-10 10:45:13 -08:00
Adrian Roos
a0ecc714c3
Merge "Disable LockPatternUtilsCache" into lmp-mr1-dev
2014-11-10 18:35:59 +00:00
Jorim Jaggi
f4a15d438a
Merge "Fix Keyguard affordances for RTL" into lmp-mr1-dev
2014-11-10 18:31:55 +00:00
Jorim Jaggi
0a81822272
Fix Keyguard affordances for RTL
...
Bug: 17328362
Change-Id: Ic7d7a5a0d721390064493cf753348b89b7bac7e1
2014-11-10 19:31:22 +01:00
Alan Viverette
c0bf068bbf
Merge "Clean up encapsulation in date picker classes" into lmp-mr1-dev
2014-11-10 18:29:29 +00:00
Adrian Roos
450ce9fc8a
Disable LockPatternUtilsCache
...
Also fix a bug where hasPattern and hasPassword were
not invalidated properly.
Bug: 18163444
Change-Id: I5bd8cc4e7c0d00497ee7a42f3c34449aa3f95a6c
2014-11-10 19:16:41 +01:00
Dan Sandler
04a1557c49
Merge "Fix inset hinting when adding window" into lmp-mr1-dev
2014-11-10 18:10:36 +00:00
Rich Slogar
2d8cd7cbb2
docs:builds tools 21.1.1 update
...
Change-Id: I96fd6ad0926414664b192ca41d13f49f25365e4a
2014-11-10 09:59:15 -08:00
Andres Morales
2885c6ba63
Merge "Fix build" into lmp-mr1-dev
2014-11-10 17:31:27 +00:00
Geoff Mendal
8f02ec4fce
am d53436a9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
...
* commit 'd53436a9d96100883e55e09ca3e0d5b6eae4fc35':
Import translations. DO NOT MERGE
2014-11-10 17:27:42 +00:00
Paul Jensen
cb32559a1e
Merge "Fix NetworkMonitor logging to include NetID." into lmp-mr1-dev
2014-11-10 17:27:12 +00:00
Andres Morales
0d8537ae7f
Fix build
...
Forgot to run make update-api in
https://googleplex-android-review.git.corp.google.com/#/c/582630/
Change-Id: I3c4dd253d0f1ffea8ae1b72835aee91541ed7d6f
2014-11-10 09:26:18 -08:00
Geoff Mendal
d53436a9d9
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
2014-11-10 17:23:38 +00:00
Alan Viverette
82aaf332b6
Merge "Update above/below backgrounds in PopupWindow.setBackground()" into lmp-mr1-dev
2014-11-10 17:18:49 +00:00
Geoff Mendal
fa62b15266
Import translations. DO NOT MERGE
...
Change-Id: I9f1f78c7b1589471c3a4f315d53923db92378b37
Auto-generated-cl: translation import
2014-11-10 09:13:39 -08:00
Geoff Mendal
7d447f734d
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
2014-11-10 17:12:22 +00:00
Geoff Mendal
1532657866
Import translations. DO NOT MERGE
...
Change-Id: I25189cd7ce81d2f1039f0121c6deaa0947bf6ec8
Auto-generated-cl: translation import
2014-11-10 09:07:55 -08:00
Ricardo Cervera
1e01a9f787
am abf58f98: am 43f46ab9: am e627b94c: Merge "docs: Material design shadow fixes." into lmp-docs
...
* commit 'abf58f9865e21f95356f2c32c4e2029d38a3a6a4':
docs: Material design shadow fixes.
2014-11-10 16:51:51 +00:00
Andres Morales
cc8d56f66c
Merge "Unhide DISALLOW_OUTGOING_BEAM" into lmp-mr1-dev
2014-11-10 16:48:45 +00:00
Adrian Roos
37d7a68de7
Fix inset hinting when adding window
...
Windows with FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS were
getting an incorrect content inset hint, because the
hinting didn't see the adjusted systemUiVisibility.
Also adds hinting for the stable insets.
Bug: 17508238
Change-Id: If9647277feb6811b15665b801accd896c51dbd12
2014-11-10 17:46:57 +01:00
Ricardo Cervera
abf58f9865
am 43f46ab9: am e627b94c: Merge "docs: Material design shadow fixes." into lmp-docs
...
* commit '43f46ab99de710f9b39106e1ac4733f06188e74c':
docs: Material design shadow fixes.
2014-11-10 16:46:47 +00:00
Ricardo Cervera
43f46ab99d
am e627b94c: Merge "docs: Material design shadow fixes." into lmp-docs
...
* commit 'e627b94c76ad144abb0207efcdc6b1cb3855bc14':
docs: Material design shadow fixes.
2014-11-10 16:42:20 +00:00
Ricardo Cervera
e627b94c76
Merge "docs: Material design shadow fixes." into lmp-docs
2014-11-10 16:36:21 +00:00
Pete Gast
705c9c131a
Merge "Expand WearableExtender to customize labels." into lmp-mr1-dev
2014-11-10 16:35:57 +00:00