Isaac Katzenelson
edf7c5caf9
Merge "Fix VALUE_RINGTONE_SILENT ref."
2013-08-21 23:08:04 +00:00
Sam Blitzstein
044ffbbbaa
Fix VALUE_RINGTONE_SILENT ref.
...
Change-Id: I115c8d2e0e972f6d7d732071d26ae5f489b926f3
2013-08-21 16:02:21 -07:00
Jonathan Dixon
4f28d70aa3
Merge "Fix nit - use primative type and make volatile"
2013-08-21 21:58:41 +00:00
Sam Blitzstein
0fb6488e0a
Merge "Extend AlarmClock API (just slightly)"
2013-08-21 21:39:52 +00:00
Chet Haase
5c9c0be0fb
am 3498d43a: am 5a284c42: Merge "Cancel running LayoutTransition before removing it from a container" into klp-dev
...
* commit '3498d43a3d2c4d21b4a58d0f81079964db551d43':
Cancel running LayoutTransition before removing it from a container
2013-08-21 14:16: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
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
Jonathan Dixon
0d6a1451d5
Fix nit - use primative type and make volatile
...
Doesn't need a boxed boolean. Technically might get read on many thread
so making it volatile too.
Change-Id: I7c96d03fe3680310e39e67f4ab59d0cfa4696d23
2013-08-21 13:09:36 -07:00
Zhijun He
c3df7eac13
am c275cbfe: am 6b223c6a: Merge "Camera2: cleanup unused imports" into klp-dev
...
* commit 'c275cbfe718f5e52575b468d46586f2462d6f543':
Camera2: cleanup unused imports
2013-08-21 12:06:11 -07:00
Zhijun He
6b223c6a5b
Merge "Camera2: cleanup unused imports" into klp-dev
2013-08-21 19:01:11 +00:00
Zhijun He
faee2c26ef
am 1deebbb8: am e8aae8a1: Merge "Camera2: Update tonemap curve definitions." into klp-dev
...
* commit '1deebbb836c596d1e9302b690e94ccbb927e8ac6':
Camera2: Update tonemap curve definitions.
2013-08-21 11:50:25 -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
Eino-Ville Talvala
b612cbd61c
am ec1c218d: am 0125ba70: Merge "Camera2: Convert camera device errors to exceptions" into klp-dev
...
* commit 'ec1c218d26e3cf26b8f01a27eef2fece24278004':
Camera2: Convert camera device errors to exceptions
2013-08-21 11:12:13 -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
0125ba70bb
Merge "Camera2: Convert camera device errors to exceptions" into klp-dev
2013-08-21 18:05:49 +00:00
Alan Viverette
9888296958
am a2395c20: am a2e88ef8: Merge "Move forwarding code to ListPopupWindow, add drag-to-open in Spinner" into klp-dev
...
* commit 'a2395c20ad1d1890eca883e1122bc92eefd59699':
Move forwarding code to ListPopupWindow, add drag-to-open in Spinner
2013-08-21 11:00:59 -07:00
Alan Viverette
907b85773a
am 64969c88: am 5feb0ad1: Merge "Use MULTI_LINE and OPENS_POPUP accessibility properties" into klp-dev
...
* commit '64969c880684140f494a01b9c80265d95d3c0e86':
Use MULTI_LINE and OPENS_POPUP accessibility properties
2013-08-21 11:00:55 -07:00
Igor Murashkin
f35be1b000
am e90ec577: am f6121f38: Merge "camera2: add sensor.temperature optional key. clear up some metadata definitions" into klp-dev
...
* commit 'e90ec5776095449c9e5da518049a9a03497efc8f':
camera2: add sensor.temperature optional key. clear up some metadata definitions
2013-08-21 10:57:29 -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
Lorenzo Colitti
5b24618b2f
am ea0ea75a: am fd589c1d: Merge "Notify IP address changes to interface observers." into klp-dev
...
* commit 'ea0ea75a45f4f57a26cc7ed06e12c21b0c48c528':
Notify IP address changes to interface observers.
2013-08-21 10:53:53 -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
fd589c1d94
Merge "Notify IP address changes to interface observers." into klp-dev
2013-08-21 17:47:13 +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
ed2515e853
am 908d9bfa: am dc70afae: Merge "Add inPremutiplied option to BitmapFactory.Options, functionality in Bitmap" into klp-dev
...
* commit '908d9bfafd576755d06f0566fc4cac3831476f63':
Add inPremutiplied option to BitmapFactory.Options, functionality in Bitmap
2013-08-21 10:26:23 -07:00
Lorenzo Colitti
2a5053e05b
am 975bcabc: am 10fa8c06: Merge "Make BaseNetworkObserver available to core code" into klp-dev
...
* commit '975bcabc438f580aa9e78e4358cfbe0a80a676bd':
Make BaseNetworkObserver available to core code
2013-08-21 10:26:21 -07:00
Lorenzo Colitti
f306a137ae
am 72c0dac1: am 4d3d5f1f: Merge "Modify LinkProperties address update methods." into klp-dev
...
* commit '72c0dac1c9af66b599d8c8148254088b88987c96':
Modify LinkProperties address update methods.
2013-08-21 10:22:56 -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
Mathew Inwood
73ce31924b
am e12c497d: am 6a99a814: Merge "Remove android.provider.Applications" into klp-dev
...
* commit 'e12c497d296c5a7c7a5d0d740686b3f15e7a7ef4':
Remove android.provider.Applications
2013-08-21 10:16:06 -07:00
Lorenzo Colitti
7f740abfc8
am 08e91fd8: am b8aa06c7: Merge "Add a string constructor to LinkAddress." into klp-dev
...
* commit '08e91fd8289f8b1ce3e5b16381f1e9f03c8d2698':
Add a string constructor to LinkAddress.
2013-08-21 10:16:03 -07:00
Lorenzo Colitti
4d3d5f1f9e
Merge "Modify LinkProperties address update methods." into klp-dev
2013-08-21 17:13:50 +00:00
Mathew Inwood
6a99a8145c
Merge "Remove android.provider.Applications" into klp-dev
2013-08-21 17:12:05 +00:00
Lorenzo Colitti
b8aa06c783
Merge "Add a string constructor to LinkAddress." into klp-dev
2013-08-21 17:11:00 +00:00
Mathew Inwood
e14380a798
Remove android.provider.Applications
...
ApplicationsProvider is going away since it's no longer needed. Remove
the related constants also.
Depends on change I6ee638a3d2b65f092d6f90410156d7cd24436914 in
packages/provider/ApplicationsProvider.
Bug: 10407790
Change-Id: Ib3188612a8713266a77d59d514113ed5d61b0810
2013-08-21 17:04:05 +01:00
John Spurlock
dc9485f6b9
am e21d5b37: am b06b8b02: Merge "Improve transient bar transitions." into klp-dev
...
* commit 'e21d5b373af9dadf8bec77504192d7d5ce2ab5ba':
Improve transient bar transitions.
2013-08-21 06:40:41 -07:00
John Spurlock
b06b8b0267
Merge "Improve transient bar transitions." into klp-dev
2013-08-21 13:36:36 +00:00
Alan Viverette
1a15a05573
am c281ff9b: am d3927bd0: Merge "Allow recycling of Preferences in com.android.* packages" into klp-dev
...
* commit 'c281ff9bccf88d7fb925ee02e20c3273dfe67778':
Allow recycling of Preferences in com.android.* packages
2013-08-20 19:07:23 -07:00
Alan Viverette
d3927bd035
Merge "Allow recycling of Preferences in com.android.* packages" into klp-dev
2013-08-21 01:58:55 +00:00
Chris Craik
1abf5d6242
Add inPremutiplied option to BitmapFactory.Options, functionality in Bitmap
...
bug:2248948
Change-Id: I8fdd649332667598504a1076d5a447572bd53086
2013-08-20 18:29:33 -07:00
Alan Viverette
791b37e0d9
Allow recycling of Preferences in com.android.* packages
...
Refactors hasSpecifiedLayout to canRecycleLayout for readability's
sake. All boolean references to the method have been inverted.
BUG: 10079104
Change-Id: Ie6beda9f0b837f889a6cc6a80377349e98cc4883
2013-08-20 17:34:19 -07:00
Selim Gurun
b7a3740773
Revert "Added the callback signal."
...
Change-Id: I18de018060f80f85e0534a069b2f5c6ecd2c8177
(cherry picked from commit f295ad0c50e56a358bba53ca3861f4558479da8e)
2013-08-21 00:16:57 +00:00
Svetoslav Ganov
5cdaf8c3e5
Merge "Fix build" into klp-dev
2013-08-20 23:58:13 +00:00
Svetoslav Ganov
3bf7976e78
Fix build
...
Change-Id: Iff815dd264008c005995ab8a95b442dad7aca18e
2013-08-20 16:40:57 -07:00
Jason Monk
ff796e5a24
Merge "Change PacProcessor to Android Service" into klp-dev
2013-08-20 23:35:26 +00:00
Alan Viverette
59bbba7c37
Merge "Add implicit parent dependency for Preferences" into klp-dev
2013-08-20 23:28:16 +00:00
Christopher Tate
439c9f5bf3
Merge "Make "low ram device" a readonly system property" into klp-dev
2013-08-20 22:59:39 +00:00
Selim Gurun
22df87b669
Merge "Added the callback signal." into klp-dev
2013-08-20 22:41:53 +00:00
Selim Gurun
fc3f4ee8a0
Added the callback signal.
...
Bug:10190508
Change-Id: I52b327e0724938e1de7ce7550d26563364ff1589
2013-08-20 15:18:31 -07:00