Narayan Kamath
e2d2ed4923
Conditionally include org.apache.http.legacy in app classpaths.
...
bug: 18027885
Change-Id: Id330ffde9d2a6e516fd60edc33f5529df719c634
2015-02-05 12:10:06 +00:00
Alan Viverette
323d888b64
am eeb69d17: Move layer-list to be top-level element in seek bar progress automerge: bac8e12 automerge: 6708ac4
...
* commit 'eeb69d171b4023e92fb729bf61d566540bdd5220':
Move layer-list to be top-level element in seek bar progress
2015-02-05 03:50:28 +00:00
Zhijun He
d7c32e4843
am 1350671f: am 81c80180: Merge "Camera2: relax the EV compensation requirements" into lmp-mr1-dev automerge: 6bafb86
...
* commit '1350671f406c238439e1dc4378287bd422aaf636':
Camera2: relax the EV compensation requirements
2015-02-05 03:50:18 +00:00
Alan Viverette
eeb69d171b
Move layer-list to be top-level element in seek bar progress automerge: bac8e12
...
automerge: 6708ac4
2015-02-05 03:45:31 +00:00
Zhijun He
1350671f40
am 81c80180: Merge "Camera2: relax the EV compensation requirements" into lmp-mr1-dev
...
automerge: 6bafb86
2015-02-05 03:44:01 +00:00
Alan Viverette
6708ac40f2
Move layer-list to be top-level element in seek bar progress
...
automerge: bac8e12
2015-02-05 03:35:27 +00:00
Alan Viverette
77ad055957
am c2bf7440: Merge "Allow top-level drawable container in progressDrawable" into lmp-mr1-dev automerge: 80252a9 automerge: a638c44
...
* commit 'c2bf7440ba9e3484d37d9c5df2ef02710682b7ed':
Allow top-level drawable container in progressDrawable
2015-02-05 02:53:52 +00:00
Alan Viverette
c2bf7440ba
Merge "Allow top-level drawable container in progressDrawable" into lmp-mr1-dev automerge: 80252a9
...
automerge: a638c44
2015-02-05 02:39:32 +00:00
Zhijun He
6bafb86655
am 81c80180: Merge "Camera2: relax the EV compensation requirements" into lmp-mr1-dev
...
* commit '81c80180311803d9faabc0bbd6c0813f44edcf7d':
Camera2: relax the EV compensation requirements
2015-02-05 02:15:49 +00:00
George Mount
efee230fe1
am 8e7c154b: Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS. automerge: c3a043c automerge: 23eef1e
...
* commit '8e7c154b07162fd91a5db1150f097606fb93f6c4':
Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS.
2015-02-05 02:12:42 +00:00
Alan Viverette
bac8e12ebd
Move layer-list to be top-level element in seek bar progress
...
There is a bug in <scale>, but this works around it for now. Removes
the previous fix, which broke the initial state due to the level not
propagating when the current drawable was swapped out.
Bug: 19269656
Change-Id: Ibe586ef4ea326a7ce7516ca42a369c5386c24359
2015-02-04 17:15:01 -08:00
Alan Viverette
a638c44bfc
Merge "Allow top-level drawable container in progressDrawable" into lmp-mr1-dev
...
automerge: 80252a9
2015-02-05 01:13:06 +00:00
Zhijun He
81c8018031
Merge "Camera2: relax the EV compensation requirements" into lmp-mr1-dev
2015-02-05 01:10:29 +00:00
Alan Viverette
80252a92e5
Merge "Allow top-level drawable container in progressDrawable" into lmp-mr1-dev
2015-02-05 00:47:17 +00:00
Alan Viverette
ae12ee34f3
Allow top-level drawable container in progressDrawable
...
Bug: 19269656
Change-Id: I82a49d1565f5c49320872f1489ce0f630ac85bd0
2015-02-04 16:44:02 -08:00
George Mount
8e7c154b07
Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS. automerge: c3a043c
...
automerge: 23eef1e
2015-02-05 00:32:01 +00:00
George Mount
23eef1ec5e
Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS.
...
automerge: c3a043c
2015-02-05 00:15:50 +00:00
George Mount
c3a043cf0e
Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS.
...
Bug 19254085
Change-Id: I22d4c4e3d1d754ab96741eb0e0290d1ecfc05552
2015-02-04 15:27:56 -08:00
Alan Viverette
e8d05b5bab
Merge "Avoid unnecessary exception handling for <include> tag"
2015-02-04 23:24:24 +00:00
Zhijun He
f1745ce8a8
Camera2: relax the EV compensation requirements
...
FULL and LIMITED is allowed to advertise [0,0], which indicates that the
exposure compensation is not supported.
Bug: 19219128
Change-Id: I6020a771201d754351f76617f68c06363fac78e8
2015-02-04 13:59:43 -08:00
Christopher Ferris
1a81b83e1e
am 9d25fcae: am 4fb79d14: Merge "Fix comment according to review." automerge: ff6cebf
...
* commit '9d25fcae8560a2e2bc2e28b08778bd1a94261cd1':
Fix comment according to review.
2015-02-04 19:39:52 +00:00
Christopher Ferris
9d25fcae85
am 4fb79d14: Merge "Fix comment according to review."
...
automerge: ff6cebf
2015-02-04 19:29:56 +00:00
Amith Yamasani
281dfe7fd2
Merge "Use ResolveInfo for label and icon for LauncherActivityInfo"
2015-02-04 18:46:54 +00:00
Amith Yamasani
7e19f5016f
Use ResolveInfo for label and icon for LauncherActivityInfo
...
Instead of using the ActivityInfo, use the ResolveInfo so that
any label or icon specified on the intent-filter is used.
Also handle the density param in getIcon()
Bug: 18482039
Change-Id: I65cb7adb34b2e472bfc68e7734f3a40fd0a6244c
2015-02-04 18:45:07 +00:00
Christopher Ferris
7254c123a1
Fix comment according to review.
...
Change-Id: I784f2051cd173425e9a9570ac4555cf835dd277d
2015-02-04 10:40:12 -08:00
Adrian Roos
75fa38539d
Add API for light status bar
...
Adds a systemUiVisibility flag and links it
to the status bar icon controller. Also adds a
theme attribute for setting the flag.
Bug: 19233606
Change-Id: I8a89a10cf2746cefa2feba50dc60c5eccd2ab28d
2015-02-04 14:28:14 +01:00
Narayan Kamath
406e1ed988
Remove apache specific socket factory API.
...
Note that this change also includes another (non-breaking) update from
another of my changes from a month ago. I guess nobody has updated API on
master in a very long time..
bug: 18027885
Change-Id: I1fb1bcdaac07131c3bc43b13ad21cacd12a2e7c8
2015-02-04 09:50:46 +00:00
Svetoslav
948c9a6393
Add duplex mode support.
...
This change adds support for duplex printing. The print UI now has a duplex
option which allows the user to choose one of the supported duplex options
by the currently selected printer. The chosen duplex mode is propaged to the
print service that manages this printer.
Change-Id: I807ba9da2723531535c0e1e33f2f4e1b503a54b0
2015-02-04 05:48:48 +00:00
Alan Viverette
d7596cff0b
Merge "Ensure AbsListView's drawable state reflects its actual state"
2015-02-04 00:54:14 +00:00
Alan Viverette
f723c83fe5
Ensure AbsListView's drawable state reflects its actual state
...
Previously, AbsListView assumed its drawable state would only be used
for the selector, so it only reflected the state of the selected child.
This didn't work so well for views that inherited from AbsListView or
for managing the scroll bar drawable state.
Change-Id: I73889645488b9a0fecbf4186b2d83d2511eccf35
2015-02-03 16:31:46 -08:00
Alan Viverette
ec22b802b6
Merge "PopupWindow animation fixes"
2015-02-03 23:54:41 +00:00
Alan Viverette
7878edfa1d
PopupWindow animation fixes
...
Calls the dismiss listener immediately, which fixes compatibility with
ListPopupWindow's global layout listener. Adjusts anchor bounds to
better match up with the laid out window position. Caches the content
view to avoid issues with setContentView(null) being called immediately
after dismiss().
Change-Id: I897caeba26ffb2e689f8face199d2ab70718a86c
2015-02-03 15:49:18 -08:00
Yin-Chia Yeh
31fdd4580c
Merge "Camera2: framework updates for HAL3.3 keys"
2015-02-03 23:39:52 +00:00
Lajos Molnar
3f514b5230
am d8e6a8b7: am 6999ef34: camera2: limit flexYUV array size in DngCreator automerge: fdb2112
...
* commit 'd8e6a8b7643ffa037fbd0e409674c450f0296809':
camera2: limit flexYUV array size in DngCreator
2015-02-03 23:27:55 +00:00
Lajos Molnar
d8e6a8b764
am 6999ef34: camera2: limit flexYUV array size in DngCreator automerge: fdb2112
...
* commit '6999ef348818ec62a931f539c2caa799728b8a90':
camera2: limit flexYUV array size in DngCreator
2015-02-03 23:23:11 +00:00
Lajos Molnar
6999ef3488
camera2: limit flexYUV array size in DngCreator
...
automerge: fdb2112
2015-02-03 23:16:28 +00:00
Lajos Molnar
fdb2112bbc
camera2: limit flexYUV array size in DngCreator
...
corrected overread
Bug: 19211135
Change-Id: I373b84dd9e2dc6219a305bf2d0308119668fab2a
2015-02-03 14:57:09 -08:00
Alan Viverette
e8489cd5f5
Avoid unnecessary exception handling for <include> tag
...
Change-Id: I73357deed59cf5a601124584e4af740956d26a14
2015-02-03 14:40:45 -08:00
Craig Mautner
635f9410e7
Merge "Remove path, query, and fragment from http Uri."
2015-02-03 22:37:52 +00:00
Wale Ogunwale
ad57529591
Merge "@hide ActivityInfo.resizeable."
2015-02-03 20:30:25 +00:00
Ruben Brunk
35fa2bc2e4
Merge "Add ProcessInfoService to activity manager."
2015-02-03 20:23:04 +00:00
Yin-Chia Yeh
d9fc67ce3c
Camera2: framework updates for HAL3.3 keys
...
1. Return new keys in legacy shim
2. Codegened doc update from the spec change
3. Remove DISABLED mode from available scene mode list to ensure
DISABLED is listed iff scene mode is not supported
Change-Id: If3dc74ea7e0fe6135722723f211024b604094f59
2015-02-03 11:52:04 -08:00
Adrian Roos
a9d5d3dbcb
Merge "Remove UI code from LockPatternUtils"
2015-02-03 18:18:06 +00:00
Clara Bayarri
54514cfa3e
Merge "Floating Palettes: Create the ActionMode type and use it in Editor."
2015-02-03 18:14:00 +00:00
Adrian Roos
c2e01683b3
Remove UI code from LockPatternUtils
...
Bug: 18931518
Change-Id: I951166f675731ec7a2bc51585e0a51e0cd92611d
2015-02-03 19:12:23 +01:00
Wale Ogunwale
4aab1bba69
@hide ActivityInfo.resizeable.
...
Bug: 19178148
Change-Id: Icc132eef7196cc2b8e50294df10595bde8d73ecd
2015-02-03 10:06:34 -08:00
Craig Mautner
b2a958fd3c
Remove path, query, and fragment from http Uri.
...
For http and https schemes leave only scheme and authority in
Uri.toSafeString().
Fixes bug 19217173.
Change-Id: Ic07665f4754bb33ad48f7a55ce5efda185df7577
2015-02-03 10:01:56 -08:00
Brian Attwell
2502f1d414
Merge "Expose EXTRA_MODE"
2015-02-03 17:43:23 +00:00
Brian Attwell
029e6819ae
Expose EXTRA_MODE
...
The ability to set EXTRA_MODE values on QuickContact
intents has existed for ages by setting the extraMode
parameter on showQuickContact().
Now we need a way for QuickContactActivity to read the intent.
Bug: 18777272
Change-Id: If5e4aa5757e62e942926a12a36345512d6fb66ca
2015-02-03 09:37:30 -08:00
Wale Ogunwale
f5db946ffa
Merge "Support for activity to opt-in/out of resizeable/multi-window support."
2015-02-03 17:16:16 +00:00
