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
Jorim Jaggi
3e54ce273a
Merge "Adjust owner info to spec" into lmp-mr1-dev
2014-11-10 15:39:22 +00:00
George Mount
8f7d3715c5
Merge "Allow PathMotion to affect translations in ChangeTransform." into lmp-mr1-dev
2014-11-10 15:25:10 +00:00
Geoff Mendal
9cb3c0004d
am 547b9ba1: (-s ours) Import translations. DO NOT MERGE
...
* commit '547b9ba1ec11d364d92e4dfea0f29aa24488ef7c':
Import translations. DO NOT MERGE
2014-11-10 15:10:05 +00:00
Geoff Mendal
547b9ba1ec
Import translations. DO NOT MERGE
...
Change-Id: I5f5fab81cb5dc43388dba446d704c6f50e0415d9
Auto-generated-cl: translation import
2014-11-10 07:03:14 -08:00
John Spurlock
982e3be280
Merge "Doze: Fix trigger sensor re-registration." into lmp-mr1-dev
2014-11-10 14:52:37 +00:00
Paul Jensen
532b6143f6
Fix NetworkMonitor logging to include NetID.
...
This was broken when NetID selection was moved to after
NetworkAgentInfo construction time. NetworkMonitor inherits
from StateMachine whose log tag is immutable after construction
making it impossible to include the NetID. Instead define a
simple log function in NetworkMonitor that includes correct
NetID. This makes debugging via logs much easier and avoids
ambiguities that can make logs useless.
Change-Id: Ie72fc210b92bd425184d288b35ed476669e2e073
2014-11-10 09:50:02 -05:00
Geoff Mendal
70eb9f64a6
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
2014-11-10 14:49:42 +00:00
Geoff Mendal
d453184829
Import translations. DO NOT MERGE
...
Change-Id: Ic5d0f862954931ce2134834256fcddda9d033ebc
Auto-generated-cl: translation import
2014-11-10 06:48:15 -08:00
John Spurlock
7850373483
Doze: Fix trigger sensor re-registration.
...
Bug: 17541271
Change-Id: I3f19f86165dd4e3677af5ed354e4fc120f9bb407
2014-11-10 09:46:14 -05:00
Alexandra Gherghina
72e32fd555
Merge "Clarify documentation for DevicePolicyManager" into lmp-mr1-dev
2014-11-10 14:19:33 +00:00
John Spurlock
bc8365148f
Merge "QS: Icon animation update for existing animations." into lmp-mr1-dev
2014-11-10 14:09:24 +00:00
John Spurlock
b836befec1
Merge "QS: Animated hotspot tile icon." into lmp-mr1-dev
2014-11-10 14:09:03 +00:00
John Spurlock
bc1e39af50
Merge "Volume dialog: Add zen mode icons and notification access." into lmp-mr1-dev
2014-11-10 14:08:53 +00:00
John Spurlock
bb4a702e6f
Volume dialog: Add zen mode icons and notification access.
...
- Add icon above text to all three zen mode states, update text style.
- Remove zentoast.
- Update shared borderless rect background, masks now support shapes.
- Update size of volume stream icons.
- Ensure all volume icons are expressions of white.
- Make volume icons testable via new demo mode command.
- Add a divider + secondary icon to access the notification slider.
- Animate the transition when accessing notification slider.
Bug: 18206097
Bug: 16303068
Bug: 18102850
Change-Id: I5eb6f820dc317e89be272cc78f6c80ed969ad5e9
2014-11-10 08:32:23 -05:00
Alexandra Gherghina
541afcd0b7
Clarify documentation for DevicePolicyManager
...
Bug: 17634106
Change-Id: I93e4c10cb942bc8452043f81f460a5db6c3bd0a4
2014-11-10 10:22:47 +00:00
Jungshik Jang
324b1f8a47
Merge "CEC: Send <Give System Audio Mode> regardless of TV's setting." into lmp-mr1-dev
2014-11-10 00:54:33 +00:00