Eino-Ville Talvala
1de3ac6463
am d5ea6e11: Merge "Camera1: Rename setPreviewTexture to ...Target for clarity" into klp-dev
...
* commit 'd5ea6e113cfd573859f0966ae71cdcfd3d5e5f51':
Camera1: Rename setPreviewTexture to ...Target for clarity
2013-08-21 20:11:18 -07:00
Eino-Ville Talvala
d5ea6e113c
Merge "Camera1: Rename setPreviewTexture to ...Target for clarity" into klp-dev
2013-08-22 00:50:55 +00:00
Elliott Hughes
f479906939
Merge "The VM handles blocking SIGPIPE." into klp-dev
2013-08-21 23:57:59 +00:00
Sam Blitzstein
f85d7516c0
am 21ea2d03: Fix VALUE_RINGTONE_SILENT ref.
...
* commit '21ea2d0387e07569b3448c1161a3276599b3fbba':
Fix VALUE_RINGTONE_SILENT ref.
2013-08-21 16:12:19 -07:00
Elliott Hughes
d7a90ca50c
The VM handles blocking SIGPIPE.
...
We don't need this any more.
Bug: 10211309
(cherry picked from commit 437e76208d451e7954699ead8931d0fe147bb07d)
Change-Id: I97b3ab4f65a70eacca2fbe95cfb11b1cc85c4021
2013-08-21 16:08:29 -07:00
Sam Blitzstein
21ea2d0387
Fix VALUE_RINGTONE_SILENT ref.
...
Change-Id: I115c8d2e0e972f6d7d732071d26ae5f489b926f3
(cherry picked from commit 044ffbbbaa7dc07c2aa40a35d5d13b1b3e7bd0c0)
2013-08-21 23:08:21 +00:00
Elliott Hughes
ac26d9db0e
am 3d86d3b6: am f39abeb4: Merge "The VM handles blocking SIGPIPE."
...
* commit '3d86d3b633105695881fbfa55332fc8aa09d0573':
The VM handles blocking SIGPIPE.
2013-08-21 15:40:22 -07:00
Elliott Hughes
3d86d3b633
am f39abeb4: Merge "The VM handles blocking SIGPIPE."
...
* commit 'f39abeb4c4fe19bb0b83d1218e180d5ae1ef1a11':
The VM handles blocking SIGPIPE.
2013-08-21 15:38:19 -07:00
Eino-Ville Talvala
7b29779d97
Camera1: Rename setPreviewTexture to ...Target for clarity
...
Bug: 10312644
Change-Id: I4bee90428cb932a12d73dad89e91bb2ef492dc86
2013-08-21 14:54:19 -07:00
Sam Blitzstein
3ec1a686dd
am 435e7dfd: Extend AlarmClock API (just slightly)
...
* commit '435e7dfd922510bbc081800d0c6092ea52ed9cd1':
Extend AlarmClock API (just slightly)
2013-08-21 14:50:05 -07:00
Sam Blitzstein
435e7dfd92
Extend AlarmClock API (just slightly)
...
Add some extras to SET_ALARM action.
Add SET_TIMER action.
Change-Id: I436864ca875a7eb1c424d0d21882d624780d6ff1
(cherry picked from commit fe7dedefe9c146209f73306dbd1584f251f85d1c)
2013-08-21 21:41:46 +00:00
Chet Haase
3498d43a3d
am 5a284c42: Merge "Cancel running LayoutTransition before removing it from a container" into klp-dev
...
* commit '5a284c42087104ffe56619b204b9936cd2c345c7':
Cancel running LayoutTransition before removing it from a container
2013-08-21 14:12:31 -07:00
Chet Haase
5a284c4208
Merge "Cancel running LayoutTransition before removing it from a container" into klp-dev
2013-08-21 21:09:10 +00:00
Alan Viverette
1210c61be9
am a052d5a7: Merge "Move caption view from Settings into framework" into klp-dev
...
* commit 'a052d5a772665be53ecbcc4242dcf60e42453770':
Move caption view from Settings into framework
2013-08-21 14:05:40 -07:00
Alan Viverette
a052d5a772
Merge "Move caption view from Settings into framework" into klp-dev
2013-08-21 21:03:51 +00:00
Chet Haase
ef3cbfd4c4
Cancel running LayoutTransition before removing it from a container
...
Previously, setting a new LayoutTransition object on a container would
not do anything to the old transition object (if it existed). This means
that the previous transition could be mid-flight, changing stuff in that
container, and would continue doing so even after it was removed.
This could cause artifacts like that in the bug below where views
that are fading out would be put in the containers "disappearing children"
list for the duration of the fade... and then would never be removed from
that list because the container was no longer connected to that transition.
This caused items to stay visible even after they were removed from
their parent containers.
Issue #10119571 LayoutTransitions sometimes does not honor view's visibility
Change-Id: I3efa4065e47fa97c4dd90410bbc1a0273c2b8079
2013-08-21 14:01:02 -07:00
Elliott Hughes
437e76208d
The VM handles blocking SIGPIPE.
...
We don't need this any more.
Bug: 10211309
Change-Id: I8be0071d50296974e3861f8af9d2bae4f5678d5a
2013-08-21 13:56:15 -07:00
Alan Viverette
398ec0368b
Move caption view from Settings into framework
...
Renamed to SubtitleView, moved dimensions into resources.
BUG: 10260603
Change-Id: I5d86ee21ca260540ba3201c5295a5c1353e2d963
2013-08-21 13:43:00 -07:00
Mathieu Chartier
577a075983
am 67a4d32c: Merge "Launch VM with -XX:LowMemoryMode if ro.config.low_ram is "true"." into klp-dev
...
* commit '67a4d32c0d722e5daec48918211bf1474ab2f667':
Launch VM with -XX:LowMemoryMode if ro.config.low_ram is "true".
2013-08-21 13:13:58 -07:00
Mathieu Chartier
67a4d32c0d
Merge "Launch VM with -XX:LowMemoryMode if ro.config.low_ram is "true"." into klp-dev
2013-08-21 20:09:46 +00:00
Zhijun He
c275cbfe71
am 6b223c6a: Merge "Camera2: cleanup unused imports" into klp-dev
...
* commit '6b223c6a5be788ca28d5d911ab10650be673684b':
Camera2: cleanup unused imports
2013-08-21 12:04:40 -07:00
Zhijun He
6b223c6a5b
Merge "Camera2: cleanup unused imports" into klp-dev
2013-08-21 19:01:11 +00:00
Zhijun He
1deebbb836
am e8aae8a1: Merge "Camera2: Update tonemap curve definitions." into klp-dev
...
* commit 'e8aae8a122162a8d909bc917b32e6ba66d1d4170':
Camera2: Update tonemap curve definitions.
2013-08-21 11:47:43 -07:00
Zhijun He
e8aae8a122
Merge "Camera2: Update tonemap curve definitions." into klp-dev
2013-08-21 18:44:06 +00:00
Zhijun He
ed255a09ec
Camera2: cleanup unused imports
...
Bug: 10360518
Change-Id: I067a29ac43e7d70f07f45463bee46a8f6d3f31a5
2013-08-21 11:27:03 -07:00
Zhijun He
3ffd70554f
Camera2: Update tonemap curve definitions.
...
This updates android.tonemap.curveGreen and android.tonemap.curveBlue
definitions.
Also update android.sensor.info.physicalSize type.
Bug: 10394966
Change-Id: I23156ad0cd67fa59500a1c803068e392514756d4
2013-08-21 11:12:04 -07:00
Eino-Ville Talvala
ec1c218d26
am 0125ba70: Merge "Camera2: Convert camera device errors to exceptions" into klp-dev
...
* commit '0125ba70bb41406ed597002498823232c8b163b8':
Camera2: Convert camera device errors to exceptions
2013-08-21 11:08:53 -07:00
Eino-Ville Talvala
0125ba70bb
Merge "Camera2: Convert camera device errors to exceptions" into klp-dev
2013-08-21 18:05:49 +00:00
Alan Viverette
a2395c20ad
am a2e88ef8: Merge "Move forwarding code to ListPopupWindow, add drag-to-open in Spinner" into klp-dev
...
* commit 'a2e88ef89611d69b65b1830cc5ffebfb679e9d4d':
Move forwarding code to ListPopupWindow, add drag-to-open in Spinner
2013-08-21 10:59:00 -07:00
Alan Viverette
64969c8806
am 5feb0ad1: Merge "Use MULTI_LINE and OPENS_POPUP accessibility properties" into klp-dev
...
* commit '5feb0ad1d234cc7146286e96f96ae162bd628363':
Use MULTI_LINE and OPENS_POPUP accessibility properties
2013-08-21 10:58:57 -07:00
Alan Viverette
a2e88ef896
Merge "Move forwarding code to ListPopupWindow, add drag-to-open in Spinner" into klp-dev
2013-08-21 17:56:00 +00:00
Alan Viverette
5feb0ad1d2
Merge "Use MULTI_LINE and OPENS_POPUP accessibility properties" into klp-dev
2013-08-21 17:55:49 +00:00
Igor Murashkin
e90ec57760
am f6121f38: Merge "camera2: add sensor.temperature optional key. clear up some metadata definitions" into klp-dev
...
* commit 'f6121f38c0b8640cafb7ff8cbaa8f3413f085b78':
camera2: add sensor.temperature optional key. clear up some metadata definitions
2013-08-21 10:55:31 -07:00
Matthew Xie
1bab142be1
am e530c41b: Merge "Protect a bunch of broadcast intents" into klp-dev
...
* commit 'e530c41b57514d419cdc7a7b14802b6954d3293c':
Protect a bunch of broadcast intents
2013-08-21 10:55:28 -07:00
Igor Murashkin
f6121f38c0
Merge "camera2: add sensor.temperature optional key. clear up some metadata definitions" into klp-dev
2013-08-21 17:53:18 +00:00
Lorenzo Colitti
ea0ea75a45
am fd589c1d: Merge "Notify IP address changes to interface observers." into klp-dev
...
* commit 'fd589c1d946ca7633da43ae8e1b4989cb0a73043':
Notify IP address changes to interface observers.
2013-08-21 10:51:58 -07:00
Matthew Xie
e530c41b57
Merge "Protect a bunch of broadcast intents" into klp-dev
2013-08-21 17:51:02 +00:00
Lorenzo Colitti
fd589c1d94
Merge "Notify IP address changes to interface observers." into klp-dev
2013-08-21 17:47:13 +00:00
Adam Powell
3440e288cc
am b8c481d3: Merge "Add xxhdpi drawables" into klp-dev
...
* commit 'b8c481d3865c86aaaf30b570f86811919b99fc27':
Add xxhdpi drawables
2013-08-21 10:45:07 -07:00
Adam Powell
41a5de94b0
Add xxhdpi drawables
...
Change-Id: I16d27db7fc6a01710c4e6bde5d0e0d7cf3a14aba
2013-08-21 17:39:23 +00:00
Eino-Ville Talvala
5afd3e91b8
Camera2: Convert camera device errors to exceptions
...
Bug: 10360518
Change-Id: I1752cecf55269c2c9f22962660c0b3fc236138fa
2013-08-21 10:37:04 -07:00
Chris Craik
908d9bfafd
am dc70afae: Merge "Add inPremutiplied option to BitmapFactory.Options, functionality in Bitmap" into klp-dev
...
* commit 'dc70afaeabd7acacc07e8852b15cc820cd07531c':
Add inPremutiplied option to BitmapFactory.Options, functionality in Bitmap
2013-08-21 10:23:40 -07:00
Lorenzo Colitti
975bcabc43
am 10fa8c06: Merge "Make BaseNetworkObserver available to core code" into klp-dev
...
* commit '10fa8c0626dbc0a875fe2543bf3c14d617dee9fb':
Make BaseNetworkObserver available to core code
2013-08-21 10:23:37 -07:00
Chris Craik
dc70afaeab
Merge "Add inPremutiplied option to BitmapFactory.Options, functionality in Bitmap" into klp-dev
2013-08-21 17:22:24 +00:00
Lorenzo Colitti
10fa8c0626
Merge "Make BaseNetworkObserver available to core code" into klp-dev
2013-08-21 17:20:40 +00:00
Lorenzo Colitti
72c0dac1c9
am 4d3d5f1f: Merge "Modify LinkProperties address update methods." into klp-dev
...
* commit '4d3d5f1f9e2ccf680660086338f7b9b02c2eb648':
Modify LinkProperties address update methods.
2013-08-21 10:17:05 -07:00
Lorenzo Colitti
4d3d5f1f9e
Merge "Modify LinkProperties address update methods." into klp-dev
2013-08-21 17:13:50 +00:00
Mathew Inwood
e12c497d29
am 6a99a814: Merge "Remove android.provider.Applications" into klp-dev
...
* commit '6a99a8145c52749d794864c87ca073c7429850a5':
Remove android.provider.Applications
2013-08-21 10:13:32 -07:00
Lorenzo Colitti
08e91fd828
am b8aa06c7: Merge "Add a string constructor to LinkAddress." into klp-dev
...
* commit 'b8aa06c783bd315d04df3fe375682040ba619543':
Add a string constructor to LinkAddress.
2013-08-21 10:13:29 -07:00
Mathew Inwood
6a99a8145c
Merge "Remove android.provider.Applications" into klp-dev
2013-08-21 17:12:05 +00:00