Yabin Cui
19d4e7806a
am a9235301: Merge "kill HAVE_SCHED_SETSCHEDULER"
...
* commit 'a9235301ad190814c779a13479b204f01980898f':
kill HAVE_SCHED_SETSCHEDULER
2014-11-10 22:24:03 +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
Elliott Hughes
32291900ec
am 984d81c3: am c34e6359: Merge "bionic\'s struct stat is now POSIX-compliant."
...
* commit '984d81c3937d46240fb9645ffa37c5166284a983':
bionic's struct stat is now POSIX-compliant.
2014-11-10 22:18:10 +00:00
John Spurlock
2e30ccfc56
am 7346a1ad: am 551f0778: Merge "Zen: Pull next-alarm tracking out into separate helper." into lmp-mr1-dev automerge: 7936ca3
...
* commit '7346a1ad0a9eb3e93387b328b49d5d6a23336d3e':
Zen: Pull next-alarm tracking out into separate helper.
2014-11-10 22:13:27 +00:00
Santos Cordon
c2f2aab667
am fac1b941: am 2ace3d48: Make add-call a global property of telecom. (1/4) automerge: 6c912b7
...
* commit 'fac1b941e9450745563cf989a2ca7a34fe68e5ef':
Make add-call a global property of telecom. (1/4)
2014-11-10 22:13:22 +00:00
Adrian Roos
d09f5bd031
am 8953c119: am 4dfc666c: Merge "Disable LockPatternUtilsCache" into lmp-mr1-dev automerge: a0ecc71
...
* commit '8953c119fd81a20c56bf0ee30a6830dfbae9649b':
Disable LockPatternUtilsCache
2014-11-10 22:13:18 +00:00
Jorim Jaggi
a1b8d610b4
am 050ea856: am 105ff073: Merge "Fix Keyguard affordances for RTL" into lmp-mr1-dev automerge: f4a15d4
...
* commit '050ea8569a1dbb9defd6f13e9c59d4f086976bf8':
Fix Keyguard affordances for RTL
2014-11-10 22:13:14 +00:00
Alan Viverette
1bda3a13a2
am e4404938: am 5ec0f1c9: Merge "Clean up encapsulation in date picker classes" into lmp-mr1-dev automerge: c0bf068
...
* commit 'e4404938c260bee08f83a0b49609fdac9dd8f9aa':
Clean up encapsulation in date picker classes
2014-11-10 22:13:09 +00:00
Dan Sandler
f2d9b00832
am 34f24aef: am eba923cc: am 04a1557c: Merge "Fix inset hinting when adding window" into lmp-mr1-dev
...
* commit '34f24aef58b015709447cb09bad5f7ae0ca7989c':
Fix inset hinting when adding window
2014-11-10 22:13:03 +00:00
Yabin Cui
a9235301ad
Merge "kill HAVE_SCHED_SETSCHEDULER"
2014-11-10 22:12:28 +00:00
Deepanshu Gupta
1f33b2f6f6
am 4c0f0e6c: Merge "Fix setting styles in custom views." into lmp-dev automerge: 5c22a79
...
automerge: 7d3d5fe
* commit '7d3d5feb31e393c97381f512995d9d799d18304f':
Fix setting styles in custom views.
2014-11-10 22:12:19 +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
1adeba2c73
am 3cf0640d: Merge "Add primitive shadows support to LayoutLib" into lmp-dev automerge: 97c04ac
...
automerge: 828db35
* commit '828db35568459638e09f86be40340d281804858d':
Add primitive shadows support to LayoutLib
2014-11-10 22:11:10 +00:00
Elliott Hughes
984d81c393
am c34e6359: Merge "bionic\'s struct stat is now POSIX-compliant."
...
* commit 'c34e63598e318c9aa0debde09730a26c64bc1203':
bionic's struct stat is now POSIX-compliant.
2014-11-10 22:10:21 +00:00
Deepanshu Gupta
aa53920479
am 0e3925df: Merge "Remove needlessly thrown IOException." into lmp-dev automerge: f305d2c
...
automerge: a09dda8
* commit 'a09dda8162ca48bea0fea0e2804af38e216996d8':
Remove needlessly thrown IOException.
2014-11-10 22:10:07 +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
John Spurlock
7346a1ad0a
am 551f0778: Merge "Zen: Pull next-alarm tracking out into separate helper." into lmp-mr1-dev automerge: 7936ca3
...
* commit '551f0778c39b030ebf1fd51c882c152b3e7ac320':
Zen: Pull next-alarm tracking out into separate helper.
2014-11-10 22:04:39 +00:00
Santos Cordon
fac1b941e9
am 2ace3d48: Make add-call a global property of telecom. (1/4) automerge: 6c912b7
...
* commit '2ace3d4803fff437387d36f27dab05f1c159b710':
Make add-call a global property of telecom. (1/4)
2014-11-10 22:04:33 +00:00
Adrian Roos
8953c119fd
am 4dfc666c: Merge "Disable LockPatternUtilsCache" into lmp-mr1-dev automerge: a0ecc71
...
* commit '4dfc666cd2e77602c98b0c5214169f5fb47af846':
Disable LockPatternUtilsCache
2014-11-10 22:04:27 +00:00
Jorim Jaggi
050ea8569a
am 105ff073: Merge "Fix Keyguard affordances for RTL" into lmp-mr1-dev automerge: f4a15d4
...
* commit '105ff0731075f9dab8bc6c7cb47bc5250abab1e2':
Fix Keyguard affordances for RTL
2014-11-10 22:04:22 +00:00
Alan Viverette
e4404938c2
am 5ec0f1c9: Merge "Clean up encapsulation in date picker classes" into lmp-mr1-dev automerge: c0bf068
...
* commit '5ec0f1c9deb37c2eca4d717e2076e5982bbef99b':
Clean up encapsulation in date picker classes
2014-11-10 22:04:15 +00:00
Dan Sandler
34f24aef58
am eba923cc: am 04a1557c: Merge "Fix inset hinting when adding window" into lmp-mr1-dev
...
* commit 'eba923ccce573ac9f426d58d79e23a1fcd8ee1a7':
Fix inset hinting when adding window
2014-11-10 22:04:09 +00:00
Adrian Roos
7dc3d7033b
Merge "Add caching to LockSettingsStorage" into lmp-mr1-dev
...
automerge: e6ef98c
* commit 'e6ef98cf0528cbc2722b979e5ad86ba859fa78b0':
Add caching to LockSettingsStorage
2014-11-10 21:48:50 +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
Evan Charlton
3caf6fc7df
Merge "Apply @hide / @SystemApi to android.telecom.*" into lmp-mr1-dev
...
automerge: e2e649f
* commit 'e2e649f5371857e0df41356512c6e06663ba8577':
Apply @hide / @SystemApi to android.telecom.*
2014-11-10 20:29:27 +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
Yabin Cui
65b4a68669
kill HAVE_SCHED_SETSCHEDULER
...
Bug: 18300670
Change-Id: I3033c3542e83963e72d49a639db76501d12ad581
2014-11-10 12:21:57 -08: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
Adam Lesinski
fa31eb2cd1
Merge "split-select: Fix rules generated for anydpi density" into lmp-mr1-dev
...
automerge: a674a1e
* commit 'a674a1ee79e34749127524434fd7439e7fd5ba09':
split-select: Fix rules generated for anydpi density
2014-11-10 19:54:31 +00:00
John Spurlock
551f0778c3
Merge "Zen: Pull next-alarm tracking out into separate helper." into lmp-mr1-dev
...
automerge: 7936ca3
* commit '7936ca36d9dfd620df0bfead6c79b5eddc761c20':
Zen: Pull next-alarm tracking out into separate helper.
2014-11-10 19:53:14 +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
Santos Cordon
2ace3d4803
Make add-call a global property of telecom. (1/4)
...
automerge: 6c912b7
* commit '6c912b7d056c67b41fd46f31de168795e97c2336':
Make add-call a global property of telecom. (1/4)
2014-11-10 19:51:50 +00: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
Adrian Roos
4dfc666cd2
Merge "Disable LockPatternUtilsCache" into lmp-mr1-dev
...
automerge: a0ecc71
* commit 'a0ecc714c3aeaaa05649e0ab1f054cc8efbb126f':
Disable LockPatternUtilsCache
2014-11-10 19:06:54 +00:00
Jorim Jaggi
105ff07310
Merge "Fix Keyguard affordances for RTL" into lmp-mr1-dev
...
automerge: f4a15d4
* commit 'f4a15d438acad20cc46fa2fbec0aa1e5cf85b4ff':
Fix Keyguard affordances for RTL
2014-11-10 19:05:37 +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