Joe Fernandez
63ae9a589a
am 89f48e69: am 465e0532: am 2b0b7a6c: am 3bd60359: am c2f2a725: Merge "docs:builds tools 21.1.1 update" into lmp-docs automerge: cab3443
...
* commit '89f48e69d2e70896afb604a4318324d21d4a2412':
docs:builds tools 21.1.1 update
2014-11-11 00:16:05 +00:00
Alan Viverette
f89b58ca83
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
2014-11-10 16:14:27 -08:00
Jorim Jaggi
f5051fefb6
am c2aa0e13: am 12174a7d: Merge "Cancel lockscreen/shade gestures when orientation changes" into lmp-mr1-dev automerge: 8334c66
...
* commit 'c2aa0e137165f305525366f0a24860a2388722ba':
Cancel lockscreen/shade gestures when orientation changes
2014-11-11 00:10:43 +00:00
Adrian Roos
ba070ec037
am 15f7b37b: am f2bd3cc9: Merge "Add LockSettingsStorage tests" into lmp-mr1-dev automerge: 09fc10f
...
* commit '15f7b37b3c9e197a99d1f5833a751e38900e403a':
Add LockSettingsStorage tests
2014-11-11 00:10:38 +00:00
Yabin Cui
a31318620b
Merge "kill HAVE_INOTIFY"
2014-11-11 00:10:12 +00:00
Yabin Cui
fb8e2b1745
kill OS_CASE_SENSITIVE
...
Bug: 18314594
Change-Id: Ib11b45d2597b2576bc7df2d0167ce1bbd1449523
2014-11-10 16:08:50 -08:00
Joe Fernandez
89f48e69d2
am 465e0532: am 2b0b7a6c: am 3bd60359: am c2f2a725: Merge "docs:builds tools 21.1.1 update" into lmp-docs
...
automerge: cab3443
* commit 'cab3443fb44a32eb58a74ec5ed50b9923165e0be':
docs:builds tools 21.1.1 update
2014-11-11 00:06:59 +00:00
Jorim Jaggi
c2aa0e1371
am 12174a7d: Merge "Cancel lockscreen/shade gestures when orientation changes" into lmp-mr1-dev
...
automerge: 8334c66
* commit '8334c6666642ef83cf03df82af183dc34486d007':
Cancel lockscreen/shade gestures when orientation changes
2014-11-11 00:04:56 +00:00
Dirk Dougherty
b6b2612f87
am e991fac6: am 4254ac01: am 56d190c4: am f253fe3e: am 602c63f8: Merge "Add Nexus 6 and Nexus 9 to the device framer." into lmp-docs automerge: 42e620e
...
* commit 'e991fac66de1a99f6a8269c2cebd672c38a2a72c':
Add Nexus 6 and Nexus 9 to the device framer.
2014-11-11 00:04:54 +00:00
Justin Harrison
7841b7d32f
am 40681e21: am bd0eb36b: Merge "Use fonts for smaller languages of South and Southeast Asia." into lmp-mr1-dev automerge: 57421b1
...
* commit '40681e21658eb2ff4ae4907adf72b188a62fba0f':
Use fonts for smaller languages of South and Southeast Asia.
2014-11-11 00:04:49 +00:00
Deepanshu Gupta
de4731eafa
am fb5877a4: am 4c0f0e6c: Merge "Fix setting styles in custom views." into lmp-dev automerge: 5c22a79 automerge: 7d3d5fe automerge: 1f33b2f
...
* commit 'fb5877a4e7ac63df741489484f1642af0d592397':
Fix setting styles in custom views.
2014-11-11 00:04:35 +00:00
Adrian Roos
15f7b37b3c
am f2bd3cc9: Merge "Add LockSettingsStorage tests" into lmp-mr1-dev
...
automerge: 09fc10f
* commit '09fc10f18f6fac8d48e4a46a3a954c336f2bd8be':
Add LockSettingsStorage tests
2014-11-11 00:03:08 +00:00
Dirk Dougherty
e991fac66d
am 4254ac01: am 56d190c4: am f253fe3e: am 602c63f8: Merge "Add Nexus 6 and Nexus 9 to the device framer." into lmp-docs
...
automerge: 42e620e
* commit '42e620e5cfae56ded772d9e95d06e05f08d1b75d':
Add Nexus 6 and Nexus 9 to the device framer.
2014-11-11 00:01:13 +00:00
Yabin Cui
20a9cf4fe4
kill HAVE_INOTIFY
...
Bug: 18314841
Change-Id: I880a35bf51a1aecba2f111e7f6eae54c7d17a28d
2014-11-10 16:01:10 -08:00
Justin Harrison
40681e2165
am bd0eb36b: Merge "Use fonts for smaller languages of South and Southeast Asia." into lmp-mr1-dev
...
automerge: 57421b1
* commit '57421b1ccf835cd6de608afc94fecddcfad28a0c':
Use fonts for smaller languages of South and Southeast Asia.
2014-11-11 00:00:05 +00:00
Deepanshu Gupta
8d7a834dff
am 7cc11f8b: am 3cf0640d: Merge "Add primitive shadows support to LayoutLib" into lmp-dev automerge: 97c04ac automerge: 828db35 automerge: 1adeba2
...
* commit '7cc11f8bf3aedeb199331dca064c89ea58312a68':
Add primitive shadows support to LayoutLib
2014-11-10 23:59:50 +00:00
Deepanshu Gupta
0ca185adaf
am 9713d740: am 0e3925df: Merge "Remove needlessly thrown IOException." into lmp-dev automerge: f305d2c automerge: a09dda8 automerge: aa53920
...
* commit '9713d740182f37f15849997979384fde00a1f9c1':
Remove needlessly thrown IOException.
2014-11-10 23:59:45 +00:00
Andreas Gampe
1e19674107
Frameworks/base: Wall Werror in libs/hwui
...
Turn on -Wall -Werror in libs/hwui. Fix errors.
Change-Id: I74962d08c889712dacbd0d86d6760fc10802b6bd
2014-11-10 15:58:04 -08:00
Alan Viverette
e1362d1170
am 993e3d2d: Merge "Call OnTimeChangedListener when new TimePicker values are selected" into lmp-mr1-dev
...
* commit '993e3d2d40cbd95d78cd3d2a76c77af2f4ab0e88':
Call OnTimeChangedListener when new TimePicker values are selected
2014-11-10 23:57:55 +00:00
Eric Laurent
b782ccd832
am 85a5f23b: am ca7c01cb: am 3011e1be: am 8db769dd: am df878bd3: am ced2f74a: am e8c1a97f: am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant
...
* commit '85a5f23b7fe500e6b97a1664b02c612a2d890b96':
AudioEffect JNI: use new max preprocessing constant
2014-11-10 23:57:50 +00:00
Deepanshu Gupta
fb5877a4e7
am 4c0f0e6c: Merge "Fix setting styles in custom views." into lmp-dev automerge: 5c22a79 automerge: 7d3d5fe
...
automerge: 1f33b2f
* commit '1f33b2f6f61f66b751d6ecb2660bed8f36c91986':
Fix setting styles in custom views.
2014-11-10 23:57:27 +00:00
Deepanshu Gupta
7cc11f8bf3
am 3cf0640d: Merge "Add primitive shadows support to LayoutLib" into lmp-dev automerge: 97c04ac automerge: 828db35
...
automerge: 1adeba2
* commit '1adeba2c7399e619760b413d810de9c6371b3159':
Add primitive shadows support to LayoutLib
2014-11-10 23:56:18 +00:00
Andreas Gampe
6b83b76dd1
Frameworks/base: Wall Werror in libs/input
...
Enable -Wall -Werror in libs/input. Mask warnings from Skia.
Change-Id: I0deeffde07fcf3a09eadec2852e9bf5666b55ee8
2014-11-10 15:55:11 -08:00
Deepanshu Gupta
9713d74018
am 0e3925df: Merge "Remove needlessly thrown IOException." into lmp-dev automerge: f305d2c automerge: a09dda8
...
automerge: aa53920
* commit 'aa53920479b7e1916e0d2afbf6846250a2deeabf':
Remove needlessly thrown IOException.
2014-11-10 23:54:59 +00:00
Alan Viverette
993e3d2d40
Merge "Call OnTimeChangedListener when new TimePicker values are selected" into lmp-mr1-dev
2014-11-10 23:54:47 +00:00
George Mount
2fe4961d0d
am 19c1cbda: Merge "Only modify add Transition targets when they aren\'t targeted." into lmp-mr1-dev
...
* commit '19c1cbda5a00b92e4e8c31b820b652c75a6c0a06':
Only modify add Transition targets when they aren't targeted.
2014-11-10 23:53:15 +00:00
Eric Laurent
85a5f23b7f
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
2014-11-10 23:52:27 +00:00
George Mount
19c1cbda5a
Merge "Only modify add Transition targets when they aren't targeted." into lmp-mr1-dev
2014-11-10 23:48:34 +00:00
Eric Laurent
ca7c01cb5c
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
2014-11-10 23:44:16 +00:00
Eric Laurent
3011e1be2c
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
2014-11-10 23:38:23 +00:00
Eric Laurent
8db769dd56
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
2014-11-10 23:33:52 +00:00
Wale Ogunwale
98e70d0908
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
2014-11-10 15:32:59 -08:00
Eric Laurent
df878bd3fc
am ced2f74a: am e8c1a97f: am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant
...
* commit 'ced2f74ac170439231f189e31538b9f403909966':
AudioEffect JNI: use new max preprocessing constant
2014-11-10 23:29:07 +00:00
Eric Laurent
ced2f74ac1
am e8c1a97f: am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant
...
* commit 'e8c1a97fa33797df528265b6f0b0c2c39ac2c589':
AudioEffect JNI: use new max preprocessing constant
2014-11-10 23:24:02 +00:00
Eric Laurent
e8c1a97fa3
am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant
...
* commit '3b92fc04700a68dab3c3c4a873535837c4e51e8b':
AudioEffect JNI: use new max preprocessing constant
2014-11-10 23:20:06 +00:00
Joe Fernandez
cab3443fb4
am 465e0532: am 2b0b7a6c: am 3bd60359: am c2f2a725: Merge "docs:builds tools 21.1.1 update" into lmp-docs
...
* commit '465e0532491442a2814a37c939a650b3c4119b31':
docs:builds tools 21.1.1 update
2014-11-10 23:12:38 +00:00
Eric Laurent
3b92fc0470
am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant
...
* commit '1c2b0d52144dc94a7d1dcefb7e4fbd7fb29f5202':
AudioEffect JNI: use new max preprocessing constant
2014-11-10 23:11:00 +00:00
Joe Fernandez
465e053249
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
2014-11-10 23:06:46 +00:00
ztenghui
1a40facbfd
AVD: Requires all animator has stopped before start again.
...
We should treat all the animator as a group, we should not start again unless
all the previous animations have stopped.
b/18320770
Change-Id: I5b0c2c165cd314745ee6c7152aea3c666e9dff10
2014-11-10 15:03:59 -08:00
Joe Fernandez
2b0b7a6c2f
am 3bd60359: am c2f2a725: Merge "docs:builds tools 21.1.1 update" into lmp-docs
...
* commit '3bd60359e2db6cbd4437179225fe4f9dd4f682e4':
docs:builds tools 21.1.1 update
2014-11-10 23:02:56 +00:00
Joe Fernandez
3bd60359e2
am c2f2a725: Merge "docs:builds tools 21.1.1 update" into lmp-docs
...
* commit 'c2f2a72571a485671f36e9d5b5c1fd9e788c11cd':
docs:builds tools 21.1.1 update
2014-11-10 22:55:20 +00:00
Jorim Jaggi
8334c66666
am 12174a7d: Merge "Cancel lockscreen/shade gestures when orientation changes" into lmp-mr1-dev
...
* commit '12174a7d2940299ee0f951905bcbcc55ea724eae':
Cancel lockscreen/shade gestures when orientation changes
2014-11-10 22:54:11 +00:00
Joe Fernandez
c2f2a72571
Merge "docs:builds tools 21.1.1 update" into lmp-docs
2014-11-10 22:50:17 +00:00
Jorim Jaggi
12174a7d29
Merge "Cancel lockscreen/shade gestures when orientation changes" into lmp-mr1-dev
2014-11-10 22:49:39 +00:00
Adrian Roos
fa6aa121cd
am b7f42187: am 7dc3d703: Merge "Add caching to LockSettingsStorage" into lmp-mr1-dev automerge: e6ef98c
...
* commit 'b7f421875e7a08839971a116cfcf662803987e70':
Add caching to LockSettingsStorage
2014-11-10 22:42:51 +00:00
Evan Charlton
12fc80b2b2
am 13cf9cf1: am 3caf6fc7: Merge "Apply @hide / @SystemApi to android.telecom.*" into lmp-mr1-dev automerge: e2e649f
...
* commit '13cf9cf1d3f426d82a2af46c36bdf308ff43d428':
Apply @hide / @SystemApi to android.telecom.*
2014-11-10 22:42:46 +00:00
Adrian Roos
09fc10f18f
am f2bd3cc9: Merge "Add LockSettingsStorage tests" into lmp-mr1-dev
...
* commit 'f2bd3cc9df7e6da3e5802edd3d028b6b4498bb26':
Add LockSettingsStorage tests
2014-11-10 22:41:49 +00:00
Adam Lesinski
16b85b8d7a
am 9687153d: Merge "Merge commit \'fa31eb2c\' into manualmerge" into lmp-mr1-dev-plus-aosp
...
* commit '9687153de355343d40f5ab14a74fb17954cff373':
split-select: Fix rules generated for anydpi density
2014-11-10 22:38:47 +00:00
Adrian Roos
f2bd3cc9df
Merge "Add LockSettingsStorage tests" into lmp-mr1-dev
2014-11-10 22:37:36 +00:00
Adrian Roos
b7f421875e
am 7dc3d703: Merge "Add caching to LockSettingsStorage" into lmp-mr1-dev automerge: e6ef98c
...
* commit '7dc3d7033b4b7a90514772dbee9702257f1fe367':
Add caching to LockSettingsStorage
2014-11-10 22:35:52 +00:00