Jon Larimer
0f2d0dbac6
am 3a6d8f54: am 90d5bd8d: am feb362a5: am a0d3bfbe: am 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation
...
automerge: ff526fa
* commit 'ff526fa7106fd45bfc4f1606fe051000c5201920':
Fix build breakage in older branches by avoiding <> notation
2015-01-30 22:41:30 +00:00
Jon Larimer
ff526fa710
am 3a6d8f54: am 90d5bd8d: am feb362a5: am a0d3bfbe: am 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation
...
* commit '3a6d8f5473f2451a0bdf13d4cc1d31e419d23f0c':
Fix build breakage in older branches by avoiding <> notation
2015-01-30 22:40:17 +00:00
Jon Larimer
3a6d8f5473
am 90d5bd8d: am feb362a5: am a0d3bfbe: am 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation
...
* commit '90d5bd8daab404afc50470f5c19ea725bd2466fe':
Fix build breakage in older branches by avoiding <> notation
2015-01-30 22:33:13 +00:00
Jon Larimer
90d5bd8daa
am feb362a5: am a0d3bfbe: am 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation
...
* commit 'feb362a5d194b30226caf2efbaae77991007c65c':
Fix build breakage in older branches by avoiding <> notation
2015-01-30 22:24:43 +00:00
Jon Larimer
feb362a5d1
am a0d3bfbe: am 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation
...
* commit 'a0d3bfbe8736fd638621ae48371b6e4e237ed4b1':
Fix build breakage in older branches by avoiding <> notation
2015-01-30 22:18:34 +00:00
Jon Larimer
a0d3bfbe87
am 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation
...
* commit '5c9d0de174caf151937f19aa6898f60bce3fb4f4':
Fix build breakage in older branches by avoiding <> notation
2015-01-30 22:11:56 +00:00
Jon Larimer
5c9d0de174
am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation
...
* commit '545dd853bffbf778a0a44816ac6ed381b13f2158':
Fix build breakage in older branches by avoiding <> notation
2015-01-30 22:01:50 +00:00
Jon Larimer
545dd853bf
am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation
...
* commit '9a425aa71c0ae6fb8c9c84d3e71321a44433d861':
Fix build breakage in older branches by avoiding <> notation
2015-01-30 21:54:31 +00:00
Jon Larimer
9a425aa71c
am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation
...
* commit '159aa73574804967aded45d06b70df5a8dd64a58':
Fix build breakage in older branches by avoiding <> notation
2015-01-30 21:44:17 +00:00
Jon Larimer
159aa73574
am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation
...
* commit 'd403180997898c98f0be15b810c4c9dd9002f92c':
Fix build breakage in older branches by avoiding <> notation
2015-01-30 21:28:59 +00:00
Zheng Fu
6e7c2c7ca5
Merge "Add backup_id column to raw_contacts, and hash_id column to data"
2015-01-30 21:16:52 +00:00
Jon Larimer
d403180997
am 48c95c43: Fix build breakage in older branches by avoiding <> notation
...
* commit '48c95c4370533bf27e537cbca1e64d060a016c5f':
Fix build breakage in older branches by avoiding <> notation
2015-01-30 19:30:57 +00:00
Fyodor Kupolov
babdb0dc36
Merge "Removed userHandle from setXXX methods"
2015-01-30 19:21:10 +00:00
RoboErik
ddce02f3b9
Merge "Move mute/unmute handling to adjust volume paths"
2015-01-30 18:55:10 +00:00
Alan Viverette
447590524a
Merge "Add accessors for switch thumb and track tinting"
2015-01-30 18:53:14 +00:00
Winson Chung
0e0b7310a8
Merge "Adding some debug controls to test multi-window."
2015-01-30 18:43:19 +00:00
Mike Lockwood
5569aa5011
Merge "MidiManager: minor Javadoc tweaks"
2015-01-30 18:33:02 +00:00
Mike Lockwood
c9adb14afd
Merge "MidiManager: fix output port close"
2015-01-30 18:19:49 +00:00
Mike Lockwood
a7e348eb4d
MidiManager: minor Javadoc tweaks
...
Change-Id: I8b8f93907b2f456267dee153122d46c6b6e25b80
2015-01-30 10:14:23 -08:00
Alan Viverette
e7eee640f8
Add accessors for switch thumb and track tinting
...
Bug: 19196145
Change-Id: I5c426bc8c624c75fd27faaf6e0cbef5a0594175a
2015-01-30 10:05:24 -08:00
Alan Viverette
b59041595b
Merge "Add transition support to PopupWindow"
2015-01-30 18:04:48 +00:00
Lorenzo Colitti
728dace14d
Merge "Also include the domain when parceling StaticIpConfiguration." automerge: c565a56 automerge: 5b392ee
...
automerge: a0057ad
* commit 'a0057ad69083dc09c0c853fd20119f5a9ea877d9':
Also include the domain when parceling StaticIpConfiguration.
2015-01-30 15:59:49 +00:00
Lorenzo Colitti
a0057ad690
Merge "Also include the domain when parceling StaticIpConfiguration." automerge: c565a56
...
automerge: 5b392ee
* commit '5b392ee7584688d6929ca40760d0df2a12bd0b16':
Also include the domain when parceling StaticIpConfiguration.
2015-01-30 15:56:00 +00:00
Baligh Uddin
50d23adfe2
Fix plurals variable to unblock Translations Pipeline.
...
Bug: 19067882
2015-01-30 07:09:16 -08:00
Derek Sollenberger
c4e4eef64a
Merge "Rename Canvas::getSkCanvas to Canvas::asSkCanvas"
2015-01-30 14:25:24 +00:00
Leon Scroggins III
9a1eefe174
Merge "AvoidXferMode -> AvoidXfermode."
2015-01-30 14:12:27 +00:00
Leon Scroggins III
ed1ce37759
AvoidXferMode -> AvoidXfermode.
...
When I moved this code here from external/skia, I accidentally changed
the lowercase 'm' to uppercase 'M'. Change back, to keep consistent
with SkXfermode and Xfermode.cpp.
Change-Id: I9694d29a22aaed7fcc8708f5962e3d2032297d08
2015-01-30 09:05:11 -05:00
Leon Scroggins III
9bf106f156
Merge "Move SkAvoidXferMode into frameworks/base."
2015-01-30 13:55:23 +00:00
Leon Scroggins III
626647c3f6
Move SkAvoidXferMode into frameworks/base.
...
We are removing it from Skia, so we need it here to support Android.
Add some small cleanups (remove comment that doesn't apply, convert
SK_OVERRIDE to override, remove 'virtual' keyword from methods with
'override' on them).
BUG:skbug.com/3329
Change-Id: I1f883082d6fb9d49b9c9ba9e1f50bd713eabf915
2015-01-30 08:32:49 -05:00
Lorenzo Colitti
c565a5675a
Merge "Also include the domain when parceling StaticIpConfiguration."
2015-01-30 07:07:49 +00:00
Lorenzo Colitti
fba459d345
Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()"
2015-01-30 07:00:38 +00:00
Alan Viverette
87d2169b74
am f607fa6b: am d38cc749: Merge "Avoid bug in LinearLayout measurement" into lmp-mr1-dev
...
automerge: c89cdf2
* commit 'c89cdf2ad435b3b5da16405a0eceb600e93b7a3e':
Avoid bug in LinearLayout measurement
2015-01-30 03:34:25 +00:00
Alan Viverette
c89cdf2ad4
am f607fa6b: am d38cc749: Merge "Avoid bug in LinearLayout measurement" into lmp-mr1-dev
...
* commit 'f607fa6b73019998588e613aa2ae8ee97958cee7':
Avoid bug in LinearLayout measurement
2015-01-30 03:32:33 +00:00
Alan Viverette
f607fa6b73
am d38cc749: Merge "Avoid bug in LinearLayout measurement" into lmp-mr1-dev
...
* commit 'd38cc749215c0e41bcb06703066c379de83d91e4':
Avoid bug in LinearLayout measurement
2015-01-30 03:20:44 +00:00
Alan Viverette
d38cc74921
Merge "Avoid bug in LinearLayout measurement" into lmp-mr1-dev
2015-01-30 03:15:07 +00:00
Christopher Ferris
5d0cf917c3
am fd41feee: Merge "Fix wrap property creation when truncating." into lmp-mr1-dev
...
* commit 'fd41feee6b909670010da79a0800c1aa2ce44255':
Fix wrap property creation when truncating.
2015-01-30 02:33:34 +00:00
Fyodor Kupolov
bdc58c66af
Removed userHandle from setXXX methods
...
User handle is now extracted from UID of the calling process.
Previously setXXX methods may not work properly, if userHandle parameter
was different from a user of the calling process. In practice, this wouldn't
have happened because setters were always called with a userHandle of the
caller process.
Bug:17202572
Change-Id: I1c08c54c975a04b8c54719a1e280ad3cfaff2e67
2015-01-29 17:54:06 -08:00
Alan Viverette
3e2ec1cc9c
Avoid bug in LinearLayout measurement
...
Reverts to Holo-style layout where the View divider masks the bug.
Uses a 0-height divider to avoid visual changes.
Bug: 19201079
Change-Id: Ib9e701815c57b23d5ba7173f8de553e90e27ed11
2015-01-30 01:30:23 +00:00
Dianne Hackborn
e322d1253c
Merge "Improve messaging of pre boot apps."
2015-01-30 01:27:21 +00:00
Dianne Hackborn
a92cbad2a9
Improve messaging of pre boot apps.
...
Have the system take care of showing the boot message
as it runs pre boot apps, rather than relying on them
doing this on their own.
Change-Id: Ife6db0691907cf413311dafb4b023e63e8795a79
2015-01-29 17:22:25 -08:00
Christopher Ferris
3c1fd311ff
am 0654196f: am e7a69cbf: am dbd03924: Merge "Fix wrap property creation when truncating."
...
* commit '0654196fb08fb8c0dfed65ece00f0a4596ed70c2':
Fix wrap property creation when truncating.
2015-01-30 00:21:12 +00:00
RoboErik
4197cb60bc
Move mute/unmute handling to adjust volume paths
...
This deprecates the setStreamMute and setStreamSolo APIs. Soloing is no
longer supported and muting is redirected through the adjust volume APIs.
Also updates the hidden master versions of these APIs.
Change-Id: I65d2a5d5fc15b386bd497abf8ca6869fec75a26a
2015-01-29 16:14:30 -08:00
Christopher Ferris
0654196fb0
am e7a69cbf: am dbd03924: Merge "Fix wrap property creation when truncating."
...
* commit 'e7a69cbf920565b4b428459198fd53f193080796':
Fix wrap property creation when truncating.
2015-01-30 00:14:17 +00:00
Winson Chung
d16c565a60
Adding some debug controls to test multi-window.
...
Adding some preliminary controls to mirror the currently exposed api
to create new activity stacks, resize stacks, and to move tasks
between stacks.
Change-Id: I3fb51c248f53a1d4c4eb23ca9fb3a76888def1de
2015-01-29 15:56:58 -08:00
Christopher Ferris
95b1048d39
Fix wrap property creation when truncating.
...
If a property name gets truncated, make sure it doesn't end in a '.'
since that makes the name illegal.
Bug: 19196358
Bug: https://code.google.com/p/android/issues/detail?id=82947
(cherry picked from commit e32df45fe1a8cb7286bfdad392a0d36e0ddcf8e7)
Change-Id: I126a40ffae76ee6a06926e770ca015fb063a334b
2015-01-29 15:54:40 -08:00
Zhijun He
043adafffd
Merge "Camera2: metadata spec update for reprocessing"
2015-01-29 23:48:02 +00:00
Zhijun He
0e99c2260d
Camera2: metadata spec update for reprocessing
...
Change-Id: I37eda90970eace23c42ba9106d4db1587df8d1b4
2015-01-29 15:26:05 -08:00
Raph Levien
61ff4d1deb
am d24047dc: Merge "Use constants instead of resources for ellipsis." into lmp-mr1-dev
...
* commit 'd24047dcfed3fb7c913a0a5950c9f48ce3d49b9e':
Use constants instead of resources for ellipsis.
2015-01-29 23:17:01 +00:00
Raph Levien
d24047dcfe
Merge "Use constants instead of resources for ellipsis." into lmp-mr1-dev
2015-01-29 23:04:15 +00:00
Igor Viarheichyk
6f9f1d4b3b
Use constants instead of resources for ellipsis.
...
All supported locales use only U+2025 and U+2026 to represent
ellipses, and it will unlikely change in future. Given translated
resources are inconsistent and often use three dots it is safer
to use constants instead of resources.
(cherry-pick of ed0daa93e48d38e54a7ad1c99c461510a4c07599.)
Bug: 18542179
Change-Id: I51a6cb903f62f739fbadd6b78e5765c0028d641a
2015-01-29 15:00:13 -08:00