John Spurlock
62d0664fed
am e153ddcf: am 1f35a9b6: Merge "QS: Fix NPE path inside cell tile." into lmp-dev
...
* commit 'e153ddcf4d7f764de0a833e51d444cecae5792da':
QS: Fix NPE path inside cell tile.
2014-09-10 21:55:10 +00:00
Craig Mautner
c787572762
am 99a902ed: am cef60b6a: Merge "Wait for animation complete before completing boot" into lmp-dev
...
* commit '99a902ed763df87484342899ebe33aa3744be420':
Wait for animation complete before completing boot
2014-09-10 21:55:05 +00:00
Nancy Chen
06c11d5798
am 8f1e1f21: am 61922585: Merge "Add docs to Conference object." into lmp-dev
...
* commit '8f1e1f21285a4590fdc236d4a0803602909a5067':
Add docs to Conference object.
2014-09-10 21:54:58 +00:00
John Spurlock
4829719465
am 1f35a9b6: Merge "QS: Fix NPE path inside cell tile." into lmp-dev
...
* commit '1f35a9b62db9cb420dd69676f1c4b7c18b6f01ba':
QS: Fix NPE path inside cell tile.
2014-09-10 21:44:30 +00:00
Craig Mautner
bb869ba791
am cef60b6a: Merge "Wait for animation complete before completing boot" into lmp-dev
...
* commit 'cef60b6ac6e490803a1b14d4a4214e097cc5d269':
Wait for animation complete before completing boot
2014-09-10 21:44:25 +00:00
Nancy Chen
74d99a1498
am 61922585: Merge "Add docs to Conference object." into lmp-dev
...
* commit '61922585c8e03bbbfe5776b4cbf6c272994dfb7b':
Add docs to Conference object.
2014-09-10 21:44:20 +00:00
John Spurlock
66c0d0cb8c
Merge "QS: Fix NPE path inside cell tile." into lmp-dev
2014-09-10 21:40:43 +00:00
George Mount
2e9616354c
am 7726c740: am b74b8d49: Merge "Move capturing entering views until just before transition." into lmp-dev
...
* commit '7726c7408402872e57c36bc23add1f387ff5eb71':
Move capturing entering views until just before transition.
2014-09-10 21:38:34 +00:00
Chet Haase
da789748f3
am 969628cd: am 804df9eb: Use constant state in AnimatedVectorDrawable
...
* commit '969628cdad8f3ba8581c01c0ffbf2b224196e979':
Use constant state in AnimatedVectorDrawable
2014-09-10 21:38:29 +00:00
vandwalle
afc4885042
am a5ef501a: am 9e444d7a: Merge "make autojoin configurable, clean up BSSID info that may be stake in WifiConfiguration" into lmp-dev
...
* commit 'a5ef501abfec5b93486f59c1140dc5791433656d':
make autojoin configurable, clean up BSSID info that may be stake in WifiConfiguration
2014-09-10 21:38:22 +00:00
John Spurlock
f7f00ea9d3
QS: Fix NPE path inside cell tile.
...
Bug:17456632
Change-Id: Ifc859cf8c1620152fd333d3a92bcd1a47ac1d7e7
2014-09-10 17:34:56 -04:00
Craig Mautner
ebcd9189e3
Merge "Wait for animation complete before completing boot" into lmp-dev
2014-09-10 21:33:43 +00:00
Nancy Chen
23a7a394f5
Merge "Add docs to Conference object." into lmp-dev
2014-09-10 21:33:02 +00:00
George Mount
18812b4c63
am b74b8d49: Merge "Move capturing entering views until just before transition." into lmp-dev
...
* commit 'b74b8d498f584dc5b51b67190da45e266f95edf3':
Move capturing entering views until just before transition.
2014-09-10 21:32:31 +00:00
Chet Haase
ee75b75ec8
am 804df9eb: Use constant state in AnimatedVectorDrawable
...
* commit '804df9eb62ed13668aacbd1609640a92846932f9':
Use constant state in AnimatedVectorDrawable
2014-09-10 21:27:11 +00:00
vandwalle
abdf298d67
am 9e444d7a: Merge "make autojoin configurable, clean up BSSID info that may be stake in WifiConfiguration" into lmp-dev
...
* commit '9e444d7a905f4fbfb4e3511380d7e668d9700561':
make autojoin configurable, clean up BSSID info that may be stake in WifiConfiguration
2014-09-10 21:27:06 +00:00
George Mount
4245e161c6
Merge "Move capturing entering views until just before transition." into lmp-dev
2014-09-10 21:26:23 +00:00
Chet Haase
6f6578e81c
Use constant state in AnimatedVectorDrawable
...
Complex animated vector drawables can be expensive to load due to
sub-optimal parsing of the String-based pathData. Suffering that penalty
every time the same drawable is loaded (such as material-themed
ProgressBars) is painful.
The new approach caches constant state of both the VectorDrawable (including
the pathData geometry) and the animators (which includes potentially expensive
path-based interpolators).
issue #17366831 Material ProgressBar taking 200+ms to inflate
Change-Id: Iba3b541e24cfce8c07f5aa9fe6aa7d7b92b2fe1c
2014-09-10 21:21:53 +00:00
vandwalle
9da6c90577
Merge "make autojoin configurable, clean up BSSID info that may be stake in WifiConfiguration" into lmp-dev
2014-09-10 21:16:58 +00:00
Mathieu Chartier
baaf9a246d
am 410d0de7: am 6a593012: Merge "Change EmptyArray System.identityHashCode to Object.hashCode." into lmp-dev
...
* commit '410d0de763e469c521cd1467e822257c3dec2838':
Change EmptyArray System.identityHashCode to Object.hashCode.
2014-09-10 21:16:54 +00:00
Raph Levien
03d291fd5b
am fff6aab7: am a31b4f03: Merge "Remove auto spaceifying behavior on paste" into lmp-dev
...
* commit 'fff6aab7826321c6005987ef4bfc88ae695ac0aa':
Remove auto spaceifying behavior on paste
2014-09-10 21:16:49 +00:00
Mathieu Chartier
26c60db184
am 6a593012: Merge "Change EmptyArray System.identityHashCode to Object.hashCode." into lmp-dev
...
* commit '6a5930128cbd3fa5dace9262ee6cefa7db53d378':
Change EmptyArray System.identityHashCode to Object.hashCode.
2014-09-10 21:06:15 +00:00
Raph Levien
a857719419
am a31b4f03: Merge "Remove auto spaceifying behavior on paste" into lmp-dev
...
* commit 'a31b4f03f6a98edcd8ae97900e9b1b24957ae4e0':
Remove auto spaceifying behavior on paste
2014-09-10 21:06:10 +00:00
Jorim Jaggi
d240042ce9
am a199a6b3: am 303fa836: Merge "Fix PIN/PUK flow" into lmp-dev
...
* commit 'a199a6b3d57273508a0b0cee9b3038e6cfbdfee2':
Fix PIN/PUK flow
2014-09-10 21:05:39 +00:00
Jorim Jaggi
54fa252822
am bde1fe9f: am 70968134: Merge "Fix invisible Keyguard" into lmp-dev
...
* commit 'bde1fe9fd4353398d2b322f2d4d58fd853d65125':
Fix invisible Keyguard
2014-09-10 21:05:34 +00:00
Mathieu Chartier
1b848d4894
Merge "Change EmptyArray System.identityHashCode to Object.hashCode." into lmp-dev
2014-09-10 21:02:26 +00:00
Raph Levien
20dbc370e3
Merge "Remove auto spaceifying behavior on paste" into lmp-dev
2014-09-10 20:55:51 +00:00
Jorim Jaggi
d19273ee87
am 303fa836: Merge "Fix PIN/PUK flow" into lmp-dev
...
* commit '303fa8368258ec03d8a9a6994e5c38884ed2b129':
Fix PIN/PUK flow
2014-09-10 20:53:43 +00:00
Jorim Jaggi
1cfeaa6147
am 70968134: Merge "Fix invisible Keyguard" into lmp-dev
...
* commit '70968134205bcaf97076b84f5fda9ee867aa21e5':
Fix invisible Keyguard
2014-09-10 20:53:38 +00:00
Jon Miranda
7296d609f9
am a8ced922: am cfb0664e: Merge "Tries to resolve reference resource names instead of its data." into lmp-dev
...
* commit 'a8ced9220ac8f946d5bc5d1584981434eecb562b':
Tries to resolve reference resource names instead of its data.
2014-09-10 20:53:25 +00:00
vandwalle
e26bc8fda7
make autojoin configurable, clean up BSSID info that may be stake in WifiConfiguration
...
Change-Id: I5052f6a76bcd1f980ef558bff54ce1b172319743
2014-09-10 13:49:48 -07:00
Jorim Jaggi
e81d5c97e8
Merge "Fix PIN/PUK flow" into lmp-dev
2014-09-10 20:48:46 +00:00
Jorim Jaggi
ef764551c9
Merge "Fix invisible Keyguard" into lmp-dev
2014-09-10 20:43:51 +00:00
Jon Miranda
7cc8603199
am cfb0664e: Merge "Tries to resolve reference resource names instead of its data." into lmp-dev
...
* commit 'cfb0664eb37e09ed352991f65dc7135ba00f5fa6':
Tries to resolve reference resource names instead of its data.
2014-09-10 20:42:51 +00:00
Jae Seo
3fb2fe88ff
am 1bb8ff97: am 5ea50c1a: TIF: Enable inflating class android.media.tv.TvView on non-TV devices
...
* commit '1bb8ff97fce1650ad88fa7a0e65b395b421b96e4':
TIF: Enable inflating class android.media.tv.TvView on non-TV devices
2014-09-10 20:36:59 +00:00
Jon Miranda
83e3ec9d4e
Merge "Tries to resolve reference resource names instead of its data." into lmp-dev
2014-09-10 20:34:08 +00:00
Jae Seo
f01b8517d9
am 5ea50c1a: TIF: Enable inflating class android.media.tv.TvView on non-TV devices
...
* commit '5ea50c1ae245170d4c553894d98e80e1448e9389':
TIF: Enable inflating class android.media.tv.TvView on non-TV devices
2014-09-10 20:26:36 +00:00
Svetoslav
cd57fcfe8d
am b875ca77: am 0f2e085d: Merge "RTL support for print UI." into lmp-dev
...
* commit 'b875ca7792276cfd5dcf8fbcbad10cf7a7443f69':
RTL support for print UI.
2014-09-10 20:26:19 +00:00
Svetoslav
4e994bde5d
am deaa395a: am d327046d: Merge "Fix page spacing in preview list." into lmp-dev
...
* commit 'deaa395a518c24a0b4f1e9bb5cd9480b9a7eb171':
Fix page spacing in preview list.
2014-09-10 20:26:14 +00:00
Jorim Jaggi
5cbfe5476b
Fix invisible Keyguard
...
Bug: 17439581
Change-Id: Ie649af4a3455a650ab46372f1e5500b530a24f34
2014-09-10 22:23:08 +02:00
Svetoslav
689ae852ea
am 0f2e085d: Merge "RTL support for print UI." into lmp-dev
...
* commit '0f2e085da75d003a2f3b7490dda9b9ac2aef58ba':
RTL support for print UI.
2014-09-10 20:14:36 +00:00
Svetoslav
cfb3fb16db
am d327046d: Merge "Fix page spacing in preview list." into lmp-dev
...
* commit 'd327046d05f6823e5ad3ee2ee81bf3531f23bbdc':
Fix page spacing in preview list.
2014-09-10 20:14:32 +00:00
Jae Seo
9127e4580c
TIF: Enable inflating class android.media.tv.TvView on non-TV devices
...
Needed to pass the CTS for those devices.
Bug: 17455222
Change-Id: Ief9a76835418906d9e8e06d4e5ddc71a3370055d
2014-09-10 13:11:13 -07:00
Svetoslav
fc81bfe3fb
Merge "RTL support for print UI." into lmp-dev
2014-09-10 20:06:18 +00:00
Svetoslav
0421754a21
Merge "Fix page spacing in preview list." into lmp-dev
2014-09-10 20:05:46 +00:00
Eino-Ville Talvala
7c715ae007
am 6b63cd11: am 90229edc: Merge "Camera2: Allow captures right after abort" into lmp-dev
...
* commit '6b63cd118f2c3a82453c30618339092fa5d30323':
Camera2: Allow captures right after abort
2014-09-10 20:04:08 +00:00
Sailesh Nepal
68cf2b324b
am d7bcd595: am f668d735: Merge "Set remote connection state after setting handle" into lmp-dev
...
* commit 'd7bcd595638f84768055a42783b593cf9178634c':
Set remote connection state after setting handle
2014-09-10 20:04:03 +00:00
Mathieu Chartier
b4e5061fd6
Change EmptyArray System.identityHashCode to Object.hashCode.
...
Equivalent behavior, improves performance since
Object.hashCode has a fast path in the java side that does not
require JNI.
According to traceview sampling profiler:
Calendar had 6.8% time in System.identityHashCode during launch.
0.4% time in System.identityHashCode after the change.
Bug: 16828525
Change-Id: I1ed1d1283a990f990b0d4352cc1f4822b1dadf7b
2014-09-10 12:57:29 -07:00
Eino-Ville Talvala
f5f31cfcf6
am 90229edc: Merge "Camera2: Allow captures right after abort" into lmp-dev
...
* commit '90229edc689b3faebe215ce4841d1bf39d848bb5':
Camera2: Allow captures right after abort
2014-09-10 19:53:16 +00:00
Sailesh Nepal
6bc6f46973
am f668d735: Merge "Set remote connection state after setting handle" into lmp-dev
...
* commit 'f668d735e2097b0c7036dca4b6d7dcf16f5a9115':
Set remote connection state after setting handle
2014-09-10 19:53:11 +00:00