Chris Craik
572d9acd59
Correctly initialize animator asynchronousity
...
bug:17483792
Change-Id: Icb6b6e6318d4c79ee94228806cb60b275424b9c9
2014-09-12 17:40:20 -07:00
Adam Powell
6ef2fca386
am dd9488c1: Merge "Provide a public API for View#computeFitSystemWindows" into lmp-dev
...
* commit 'dd9488c13f16699d190e399324c18b557b6a5b38':
Provide a public API for View#computeFitSystemWindows
2014-09-13 00:38:01 +00:00
Eric Laurent
b739cc61c1
am a7f44594: Merge "SoundTrigger: fix KeyphraseRecognitionEvent parceling" into lmp-dev
...
* commit 'a7f44594b56d5b4341dfeb074c9518e480de7e4c':
SoundTrigger: fix KeyphraseRecognitionEvent parceling
2014-09-13 00:37:56 +00:00
Joe Fernandez
8af9ea7c97
am 85c953ef: am 41b12f29: am 02480cbf: am 1b12b1dc: Merge "docs: remove bad link in the quick view box for TV Recommendations #2 " into klp-modular-docs
...
* commit '85c953ef4493ee19a6aed616f0bcbcdf1db590d4':
docs: remove bad link in the quick view box for TV Recommendations #2
2014-09-13 00:37:51 +00:00
Adam Powell
2642357b82
Merge "Provide a public API for View#computeFitSystemWindows" into lmp-dev
2014-09-13 00:22:29 +00:00
Eric Laurent
76466c7be3
Merge "SoundTrigger: fix KeyphraseRecognitionEvent parceling" into lmp-dev
2014-09-13 00:21:48 +00:00
Joe Fernandez
9890084952
am 41b12f29: am 02480cbf: am 1b12b1dc: Merge "docs: remove bad link in the quick view box for TV Recommendations #2 " into klp-modular-docs
...
* commit '41b12f2932893ed251a68cb0fe657ee918318c77':
docs: remove bad link in the quick view box for TV Recommendations #2
2014-09-13 00:18:27 +00:00
Paul Jensen
86fb2c8c0a
am 28b89f98: Allow libcore to perform necessary actions upon net config changes.
...
* commit '28b89f9869008ff0853419007734dad24937f578':
Allow libcore to perform necessary actions upon net config changes.
2014-09-13 00:08:33 +00:00
Amith Yamasani
6ee34b2af0
am 13c4e5ad: Merge "Rename and repurpose feature MANAGED_PROFILES to MANAGED_USERS" into lmp-dev
...
* commit '13c4e5ad86bcf61e12d5f928ba36bc0db2dd75bf':
Rename and repurpose feature MANAGED_PROFILES to MANAGED_USERS
2014-09-13 00:08:28 +00:00
Joe Fernandez
41b12f2932
am 02480cbf: am 1b12b1dc: Merge "docs: remove bad link in the quick view box for TV Recommendations #2 " into klp-modular-docs
...
* commit '02480cbffabd1ca80441c9676db01b177468883a':
docs: remove bad link in the quick view box for TV Recommendations #2
2014-09-13 00:00:29 +00:00
Paul Jensen
e401d17d3f
Allow libcore to perform necessary actions upon net config changes.
...
Delegate to libcore the responsibility of performing the necessary
actions upon a network configuration change, such as a DNS
configuration change. In the L-release, these responsibilities
now include flushing the HTTP connection pools to prevent connections
on lingering networks getting pulled from the pool inadvertently to
satisfy requests that should be going over the new network. All such
responsibilities can now be controlled and delegated by libcore's
new NetworkEventDispatcher, designed for this purpose.
bug:17314604
Change-Id: Ic796aea9d9a1f6ecb787fbdb38b3b7f5d991829b
2014-09-12 23:59:55 +00:00
Alan Viverette
69e7a9a6a4
am 1e8bb662: Merge "Apply VectorDrawable color filter at draw time" into lmp-dev
...
* commit '1e8bb662d59046c4f8b62040749b68857b5e13a3':
Apply VectorDrawable color filter at draw time
2014-09-12 23:54:05 +00:00
Jean-Michel Trivi
fd0edf9116
am 3d88a9c6: Merge "more AudioAttributes javadoc" into lmp-dev
...
* commit '3d88a9c65f0d808bb448e8e690a86fccfe8d265d':
more AudioAttributes javadoc
2014-09-12 23:54:00 +00:00
vandwalle
0f72571ab0
am e62a18e5: Merge "various fixes:" into lmp-dev
...
* commit 'e62a18e572b745c6b92794bfa3ac41eaa5c61ee4':
various fixes:
2014-09-12 23:53:55 +00:00
Adam Powell
d72068b38e
Provide a public API for View#computeFitSystemWindows
...
The current hidden API is necessary to perform correct inset behavior
for support libraries like appcompat. Provide a public method
consistent with the new WindowInsets APIs.
Bug 17411097
Change-Id: I71a63eea0238b94cae6b5c6f1721d5567560ba81
2014-09-12 16:51:28 -07:00
Amith Yamasani
d7fcca9511
Merge "Rename and repurpose feature MANAGED_PROFILES to MANAGED_USERS" into lmp-dev
2014-09-12 23:50:40 +00:00
Alan Viverette
264ea9c35f
Merge "Apply VectorDrawable color filter at draw time" into lmp-dev
2014-09-12 23:47:55 +00:00
Amith Yamasani
1d653272a2
Rename and repurpose feature MANAGED_PROFILES to MANAGED_USERS
...
Bug: 17392243
Change-Id: I5ff0e70eeeeba264c96eaa2a17a6bd3669576c96
2014-09-12 16:45:33 -07:00
Jean-Michel Trivi
f47ff5bf97
Merge "more AudioAttributes javadoc" into lmp-dev
2014-09-12 23:45:23 +00:00
Joe Fernandez
02480cbffa
am 1b12b1dc: Merge "docs: remove bad link in the quick view box for TV Recommendations #2 " into klp-modular-docs
...
* commit '1b12b1dc6f0203913ceb0a88dcf5ef1639fe6515':
docs: remove bad link in the quick view box for TV Recommendations #2
2014-09-12 23:42:04 +00:00
Alan Viverette
b07b086bd4
Apply VectorDrawable color filter at draw time
...
BUG: 17491152
Change-Id: Ia0ca0bd7cd00363ad5777d3e2e62fa1131a6d8a5
2014-09-12 16:37:44 -07:00
vandwalle
8ca1f18abf
Merge "various fixes:" into lmp-dev
2014-09-12 23:34:29 +00:00
Matthew Williams
641fc725b2
am 7e84b1a4: Merge "Fix NPE in JobServiceContext" into lmp-dev
...
* commit '7e84b1a4a4e72f1b4953c169cec4599e567c9203':
Fix NPE in JobServiceContext
2014-09-12 23:30:55 +00:00
Jae Seo
26e8e308f5
am 5e74ef0e: Merge "TIF: Add a system API to retrieve HDMI device information" into lmp-dev
...
* commit '5e74ef0eb4a333d4f6a0ab09f2ed6b659018e5c6':
TIF: Add a system API to retrieve HDMI device information
2014-09-12 23:30:50 +00:00
George Mount
331b3ba3e3
am 87483e5e: Merge "Made Transitions act only the views that they target." into lmp-dev
...
* commit '87483e5ea1e08467172d82f8707f8f2470107507':
Made Transitions act only the views that they target.
2014-09-12 23:30:45 +00:00
Alan Viverette
d5d668a0a4
am f559f89c: Merge "Report button opacity for current state, fix button shadows" into lmp-dev
...
* commit 'f559f89c3b4f28f83b163e957b0d2296578431a9':
Report button opacity for current state, fix button shadows
2014-09-12 23:30:40 +00:00
Joe Fernandez
1b12b1dc6f
Merge "docs: remove bad link in the quick view box for TV Recommendations #2 " into klp-modular-docs
2014-09-12 23:28:54 +00:00
Matthew Williams
c0595a7d7d
Merge "Fix NPE in JobServiceContext" into lmp-dev
2014-09-12 23:26:40 +00:00
Matthew Williams
7ac52d5bf6
Fix NPE in JobServiceContext
...
BUG: 17485390
The VERB_BINDING timeout that is set to wait for onBind() to complete
wasn't being cleared when onBind() returns false, i.e. that the service wasn't
available to be bound to.
This led to an NPE when the stale timeout expired. Fix is to clear the timeout
when onBind fails.
Change-Id: I318ca5ce1f3e12b170f7f256608ea7e28f3f120a
2014-09-12 23:26:28 +00:00
Jae Seo
0c1a2ef83b
Merge "TIF: Add a system API to retrieve HDMI device information" into lmp-dev
2014-09-12 23:24:07 +00:00
Joe Fernandez
b813f16c47
docs: remove bad link in the quick view box for TV Recommendations #2
...
Change-Id: I649d8d735bda2b0c657217bc86c1a29a2d7eddc2
2014-09-12 16:24:01 -07:00
Svetoslav
eb652db16f
am 376926b7: am 60eed0e5: Merge "Fix crash in spooler if printing app dies." into lmp-dev
...
* commit '376926b7010b848fc22631a7274eb7bcf2078a0b':
Fix crash in spooler if printing app dies.
2014-09-12 23:22:46 +00:00
Guang Zhu
34c5a6205a
am 24a36fa3: am 336a9316: Merge "do not allow monkey to flip OEM unlock flag" into lmp-dev
...
* commit '24a36fa33f304e112b93d5cecbb84a80c523ef9b':
do not allow monkey to flip OEM unlock flag
2014-09-12 23:22:40 +00:00
ztenghui
a5d91d52b4
am 8207e209: am 2bb77b5a: Merge "Add root alpha and animation to (Animated)VectorDrawable" into lmp-dev
...
* commit '8207e209ade72f13a1ed77f5bc219163385a28af':
Add root alpha and animation to (Animated)VectorDrawable
2014-09-12 23:22:34 +00:00
George Mount
a5757799f2
am 8f833d94: am 9032c757: Merge "Fixed: getDecor() NullPointeExceptions." into lmp-dev
...
* commit '8f833d941746993b0c1524fcc83e60084d9e81ae':
Fixed: getDecor() NullPointeExceptions.
2014-09-12 23:21:38 +00:00
Amith Yamasani
fcce1340c7
am 263a799f: am 849e1a9c: Merge "Prevent device owner registration after setup is complete" into lmp-dev
...
* commit '263a799fb983559a431ff8f9ce30e3f773ee04d2':
Prevent device owner registration after setup is complete
2014-09-12 23:21:33 +00:00
Yin-Chia Yeh
c01898c073
am 3661aa85: am e3505a3d: Merge "Camera2: add toString for TonemapCurve" into lmp-dev
...
* commit '3661aa8594e17d4d1401a86993d19e436f3ae525':
Camera2: add toString for TonemapCurve
2014-09-12 23:21:28 +00:00
George Mount
bc3e75a5c1
am 1390a1a2: am cc8973e4: Merge "Reset the alpha for offscreen views." into lmp-dev
...
* commit '1390a1a2c6eca730b7606cc700aa1b42fc71b6ab':
Reset the alpha for offscreen views.
2014-09-12 23:21:23 +00:00
Adam Powell
214860b030
am 7362db5d: am 91089aa5: Merge "Make Toolbars eat touch events" into lmp-dev
...
* commit '7362db5d1c24ccc9e0c641d8d3f5ff0eefb1bc37':
Make Toolbars eat touch events
2014-09-12 23:21:18 +00:00
George Mount
cb9ebc088a
am 47dece77: am f607a73b: Merge "Changed method name to match Activity\'s method name." into lmp-dev
...
* commit '47dece7797c4fc6e19b42b605a5b9d45023a0bc9':
Changed method name to match Activity's method name.
2014-09-12 23:21:01 +00:00
Dianne Hackborn
6de00759b6
am d37c9323: am 019a55d1: Merge "Revert "Set up final resource identifiers."" into lmp-dev
...
* commit 'd37c93232f75af27d020c43a317f189dea77f9d0':
Revert "Set up final resource identifiers."
2014-09-12 23:20:50 +00:00
Dianne Hackborn
10c1130a82
am 8ceb5021: am 1379b508: Merge "Set up final resource identifiers." into lmp-dev
...
* commit '8ceb5021de9b75376e7e52b7ef7e5631fdd5846c':
Set up final resource identifiers.
2014-09-12 23:20:45 +00:00
Svetoslav
5ea24a847b
am ff3e07bd: am 8e925e55: Merge "Fix a crash in print preview on multiple rotations." into lmp-dev
...
* commit 'ff3e07bd1ccc3fb19109e2775a9c3ba3c89bf0a7':
Fix a crash in print preview on multiple rotations.
2014-09-12 23:20:20 +00:00
George Mount
4d527888ac
Merge "Made Transitions act only the views that they target." into lmp-dev
2014-09-12 23:19:15 +00:00
Jae Seo
3c8e65a307
TIF: Add a system API to retrieve HDMI device information
...
Bug: 17487782
Change-Id: I53995735fa190c40819ff352a8b98765a6f7753f
2014-09-12 16:17:51 -07:00
George Mount
5030c7f6f1
Made Transitions act only the views that they target.
...
Bug 17465989
Bug 17452585
Change-Id: I2f921e98f68df3d549a370179c0a4488d56923ad
2014-09-12 16:15:44 -07:00
Craig Mautner
c6fcab0be4
am 1260584f: Merge "Rework the task affiliate chain validation" into lmp-dev
...
* commit '1260584f00c550b6aa8c0a4d483ced34fd3b6bbf':
Rework the task affiliate chain validation
2014-09-12 23:14:57 +00:00
Robert Greenwalt
3d12df3121
am 5710ec48: Merge "Make status bar indicators reflect the network actually in use." into lmp-dev
...
* commit '5710ec483d879d833f19c25eef4d944161ec5a6e':
Make status bar indicators reflect the network actually in use.
2014-09-12 23:14:53 +00:00
Robert Greenwalt
25c4aaafc4
am 3234c20e: Merge "Update Inet state when NetworkMonitor re-evaluates a network." into lmp-dev
...
* commit '3234c20e5eaea49559b31db88ef186fe5440d5a2':
Update Inet state when NetworkMonitor re-evaluates a network.
2014-09-12 23:14:48 +00:00
Alan Viverette
6d32576312
Merge "Report button opacity for current state, fix button shadows" into lmp-dev
2014-09-12 23:14:33 +00:00