OSDN Git Service
Lorenzo Colitti [Thu, 5 Feb 2015 02:41:31 +0000 (02:41 +0000)]
am
b43e74bb: am
12b26c12: am
21702263: Merge "Add a unit test for StaticIpConfiguration."
* commit '
b43e74bbce46f2f328e2031a7ae3447f415ef9ca':
Add a unit test for StaticIpConfiguration.
Lorenzo Colitti [Thu, 5 Feb 2015 02:31:40 +0000 (02:31 +0000)]
am
12b26c12: am
21702263: Merge "Add a unit test for StaticIpConfiguration."
* commit '
12b26c12483633f7a75d1f1c9ead73eaf6056811':
Add a unit test for StaticIpConfiguration.
Lorenzo Colitti [Thu, 5 Feb 2015 02:24:31 +0000 (02:24 +0000)]
am
21702263: Merge "Add a unit test for StaticIpConfiguration."
* commit '
21702263d96341bc13420e2c74af9a4bec6c7907':
Add a unit test for StaticIpConfiguration.
George Mount [Thu, 5 Feb 2015 02:12:42 +0000 (02:12 +0000)]
am
8e7c154b: Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS. automerge:
c3a043c automerge:
23eef1e
* commit '
8e7c154b07162fd91a5db1150f097606fb93f6c4':
Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS.
Miao Wang [Thu, 5 Feb 2015 02:12:23 +0000 (02:12 +0000)]
am
4bd2c00d: Merge "make Allocation.destroy() include setSurface(null) for USAGE_IO_OUTPUT (Native RS)" automerge:
9a55cbc automerge:
58fd96c
* commit '
4bd2c00d8d27d37c5e90a42ec2e39dd9fdd149eb':
make Allocation.destroy() include setSurface(null) for USAGE_IO_OUTPUT (Native RS)
George Mount [Thu, 5 Feb 2015 00:32:01 +0000 (00:32 +0000)]
Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS. automerge:
c3a043c
automerge:
23eef1e
* commit '
23eef1ec5ea1a9f3f5ec94ac049b8775fdd3562d':
Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS.
Miao Wang [Thu, 5 Feb 2015 00:27:49 +0000 (00:27 +0000)]
Merge "make Allocation.destroy() include setSurface(null) for USAGE_IO_OUTPUT (Native RS)" automerge:
9a55cbc
automerge:
58fd96c
* commit '
58fd96c607de7f7f821a0b15fd37bc28323fcfde':
make Allocation.destroy() include setSurface(null) for USAGE_IO_OUTPUT (Native RS)
Chris Craik [Thu, 5 Feb 2015 00:25:03 +0000 (00:25 +0000)]
Merge "GlopBuilder, and test app refactor"
Lorenzo Colitti [Thu, 5 Feb 2015 00:21:57 +0000 (00:21 +0000)]
Merge "Add a unit test for StaticIpConfiguration."
George Mount [Thu, 5 Feb 2015 00:15:50 +0000 (00:15 +0000)]
Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS.
automerge:
c3a043c
* commit '
c3a043cf0e1c91dcffc2cd596908266ba92a4c28':
Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS.
Miao Wang [Thu, 5 Feb 2015 00:07:17 +0000 (00:07 +0000)]
Merge "make Allocation.destroy() include setSurface(null) for USAGE_IO_OUTPUT (Native RS)"
automerge:
9a55cbc
* commit '
9a55cbc0523bb05f15a1ea252c6736ce5060c53e':
make Allocation.destroy() include setSurface(null) for USAGE_IO_OUTPUT (Native RS)
Miao Wang [Thu, 5 Feb 2015 00:01:29 +0000 (00:01 +0000)]
Merge "make Allocation.destroy() include setSurface(null) for USAGE_IO_OUTPUT (Native RS)"
Chris Craik [Tue, 3 Feb 2015 02:39:33 +0000 (18:39 -0800)]
GlopBuilder, and test app refactor
Change-Id: I2cd299ccf178007fd5f83bab6c3448f03aec7843
George Mount [Wed, 4 Feb 2015 22:37:04 +0000 (14:37 -0800)]
Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS.
Bug
19254085
Change-Id: I22d4c4e3d1d754ab96741eb0e0290d1ecfc05552
Alan Viverette [Wed, 4 Feb 2015 23:24:23 +0000 (23:24 +0000)]
Merge "Avoid unnecessary exception handling for <include> tag"
John Reck [Wed, 4 Feb 2015 22:47:23 +0000 (14:47 -0800)]
resolved conflicts for merge of
c7e6b93a to master
Change-Id: I4b791f37193727a0306214645f2f98cdf218cad0
John Reck [Wed, 4 Feb 2015 22:08:27 +0000 (22:08 +0000)]
am
af6eaf65: Merge "Fix ANR caused by hwuiTask thread" automerge:
5ad36d4
* commit '
af6eaf656ec0de5fcbea03968daffe2c845e2089':
Fix ANR caused by hwuiTask thread
John Reck [Wed, 4 Feb 2015 21:58:39 +0000 (21:58 +0000)]
Merge "Fix ANR caused by hwuiTask thread"
automerge:
5ad36d4
* commit '
5ad36d4591e7b3b1b74f0a213d18384f53734ab2':
Fix ANR caused by hwuiTask thread
John Reck [Wed, 4 Feb 2015 21:53:47 +0000 (21:53 +0000)]
Merge "Fix ANR caused by hwuiTask thread"
Chris Wren [Wed, 4 Feb 2015 21:09:39 +0000 (21:09 +0000)]
Merge "Add dumpsys info for heads up view."
Chris Wren [Fri, 5 Dec 2014 21:07:06 +0000 (16:07 -0500)]
Add dumpsys info for heads up view.
Bug:
18640969
Change-Id: Ie8d271fad3259da48854e9fd5e3f8eeec51ba91e
Elliott Hughes [Wed, 4 Feb 2015 20:45:18 +0000 (20:45 +0000)]
Elliott Hughes [Wed, 4 Feb 2015 20:37:59 +0000 (20:37 +0000)]
Elliott Hughes [Wed, 4 Feb 2015 20:31:45 +0000 (20:31 +0000)]
Elliott Hughes [Wed, 4 Feb 2015 20:26:02 +0000 (20:26 +0000)]
Merge "Fix build."
Elliott Hughes [Wed, 4 Feb 2015 20:24:21 +0000 (12:24 -0800)]
Fix build.
Change-Id: Ic14b6de7e7e58ce42ae4cc5ca945e4896e3b7b8f
Jason Monk [Wed, 28 Jan 2015 15:40:41 +0000 (10:40 -0500)]
Move Settings wifi tracking to SettingsLib
Make SettingsLib capable of tracking which wifi networks are
available/saved and their state.
Also modify Quick Settings to use this code rather than having
its own logic.
Bug:
19180466
Change-Id: Iff9f9aed240d79323dba41496496e8076b9fa6f2
Christopher Ferris [Wed, 4 Feb 2015 19:39:52 +0000 (19:39 +0000)]
am
9d25fcae: am
4fb79d14: Merge "Fix comment according to review." automerge:
ff6cebf
* commit '
9d25fcae8560a2e2bc2e28b08778bd1a94261cd1':
Fix comment according to review.
Christopher Ferris [Wed, 4 Feb 2015 19:29:56 +0000 (19:29 +0000)]
am
4fb79d14: Merge "Fix comment according to review."
automerge:
ff6cebf
* commit '
ff6cebf0a65f9d6e20497295a1a9c290df85052b':
Fix comment according to review.
Christopher Ferris [Wed, 4 Feb 2015 19:15:47 +0000 (19:15 +0000)]
am
4fb79d14: Merge "Fix comment according to review."
* commit '
4fb79d14bb6c81f72a92da85420090a05ec2c76d':
Fix comment according to review.
Christopher Ferris [Wed, 4 Feb 2015 19:07:15 +0000 (19:07 +0000)]
Merge "Fix comment according to review."
Geoff Mendal [Wed, 4 Feb 2015 18:58:09 +0000 (18:58 +0000)]
am
8911c2ae: (-s ours) Import translations. DO NOT MERGE automerge:
140a22d -s ours
* commit '
8911c2aeb17dfde123b9d412f700c20a33babbfc':
Import translations. DO NOT MERGE
Amith Yamasani [Wed, 4 Feb 2015 18:46:53 +0000 (18:46 +0000)]
Merge "Use ResolveInfo for label and icon for LauncherActivityInfo"
Amith Yamasani [Fri, 30 Jan 2015 22:18:52 +0000 (14:18 -0800)]
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
Christopher Ferris [Wed, 4 Feb 2015 18:40:12 +0000 (10:40 -0800)]
Fix comment according to review.
Change-Id: I784f2051cd173425e9a9570ac4555cf835dd277d
Geoff Mendal [Wed, 4 Feb 2015 17:54:36 +0000 (17:54 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 4 Feb 2015 17:41:54 +0000 (11:41 -0600)]
Import translations. DO NOT MERGE
Change-Id: I8869a20890b6395ef7facc7397fff2df6553997d
Auto-generated-cl: translation import
Sailesh Nepal [Wed, 4 Feb 2015 17:23:42 +0000 (17:23 +0000)]
Merge "Don't set address for failed remote connections"
Geoff Mendal [Wed, 4 Feb 2015 16:33:55 +0000 (16:33 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 4 Feb 2015 15:53:42 +0000 (07:53 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic5a8c3b60bfd6618b43a914c43b79eec1ffb73fe
Auto-generated-cl: translation import
Adrian Roos [Wed, 4 Feb 2015 13:35:23 +0000 (14:35 +0100)]
Follow-up to I8a89a10cf2746cefa2feba50dc60c5eccd2ab28d
Bug:
19233606
Change-Id: I394a015371acd124f84f1f6f82bc565fefc669d1
Geoff Mendal [Wed, 4 Feb 2015 14:51:45 +0000 (06:51 -0800)]
Import translations. DO NOT MERGE
Change-Id: I1045d9d3bcb2ddce2eb2c57fff87827c5ee23f04
Auto-generated-cl: translation import
Geoff Mendal [Wed, 4 Feb 2015 14:40:51 +0000 (14:40 +0000)]
Import translations. DO NOT MERGE
automerge:
140a22d -s ours
* commit '
140a22de8ead0f166eaea320a37b7134f265353e':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Feb 2015 14:28:45 +0000 (06:28 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ibdc0a2c8927af8036040a542f6484db1ea65880d
Auto-generated-cl: translation import
Adrian Roos [Tue, 27 Jan 2015 19:21:44 +0000 (20:21 +0100)]
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
Jorim Jaggi [Wed, 4 Feb 2015 11:46:55 +0000 (11:46 +0000)]
Merge "Add ability to colorize status bar"
Jorim Jaggi [Wed, 21 Jan 2015 21:23:48 +0000 (22:23 +0100)]
Add ability to colorize status bar
Bug:
19233606
Change-Id: I756599395c202c4d0dd04c44beac706fc19bfe17
Narayan Kamath [Wed, 10 Dec 2014 18:55:12 +0000 (18:55 +0000)]
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
Lorenzo Colitti [Fri, 23 Jan 2015 05:31:30 +0000 (14:31 +0900)]
Add a unit test for StaticIpConfiguration.
Change-Id: I68c735def8a242da0c8f95b7c5ea680ed902dab7
Lajos Molnar [Wed, 4 Feb 2015 08:19:25 +0000 (08:19 +0000)]
Merge "MediaCodecInfo: remove stack trace logspam when querying invalid sizes"
Svetoslav [Tue, 3 Feb 2015 03:47:04 +0000 (19:47 -0800)]
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
Miao Wang [Wed, 4 Feb 2015 01:16:43 +0000 (17:16 -0800)]
make Allocation.destroy() include setSurface(null) for USAGE_IO_OUTPUT
(Native RS)
Change-Id: I23041da03c2c928ceec76037804abb5dc7e6eb64
Alan Viverette [Wed, 4 Feb 2015 00:54:13 +0000 (00:54 +0000)]
Merge "Ensure AbsListView's drawable state reflects its actual state"
Alan Viverette [Wed, 4 Feb 2015 00:31:46 +0000 (16:31 -0800)]
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
Wale Ogunwale [Wed, 4 Feb 2015 00:29:20 +0000 (00:29 +0000)]
Merge "Fixed issue with resized stack sticking to the top of the screen."
Wale Ogunwale [Tue, 3 Feb 2015 22:49:20 +0000 (14:49 -0800)]
Fixed issue with resized stack sticking to the top of the screen.
WindowState.mUnderStatusBar wasn't set correctly when the stack was
resized before the window was added to it. Changed to use
TaskStack.mUnderStatusBar instead which will always have the
correct answer.
Bug:
19204013
Change-Id: Ib4660302c6a2aebd47bff354c1efab93a1e1a255
Wonsik Kim [Tue, 3 Feb 2015 23:59:02 +0000 (23:59 +0000)]
am
b86a4558: am
015fdf39: Merge "audio: allow audio port cache update even when audio patches contain invalidated sources/sinks" into lmp-mr1-dev automerge:
d7310bd
* commit '
b86a45588a67f88730c15c82f624cd64fe1da80c':
audio: allow audio port cache update even when audio patches contain invalidated sources/sinks
Alan Viverette [Tue, 3 Feb 2015 23:54:40 +0000 (23:54 +0000)]
Merge "PopupWindow animation fixes"
Wonsik Kim [Tue, 3 Feb 2015 23:52:42 +0000 (23:52 +0000)]
am
015fdf39: Merge "audio: allow audio port cache update even when audio patches contain invalidated sources/sinks" into lmp-mr1-dev automerge:
d7310bd
* commit '
015fdf392388f1bed3298f9f44012c1a82d7c1a1':
audio: allow audio port cache update even when audio patches contain invalidated sources/sinks
Alan Viverette [Tue, 3 Feb 2015 23:49:18 +0000 (15:49 -0800)]
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
Wonsik Kim [Tue, 3 Feb 2015 23:44:34 +0000 (23:44 +0000)]
Merge "audio: allow audio port cache update even when audio patches contain invalidated sources/sinks" into lmp-mr1-dev
automerge:
d7310bd
* commit '
d7310bd1499c0b48594a8fbbcbe0c7e80c1e5832':
audio: allow audio port cache update even when audio patches contain invalidated sources/sinks
Wonsik Kim [Tue, 3 Feb 2015 23:39:57 +0000 (23:39 +0000)]
Merge "audio: allow audio port cache update even when audio patches contain invalidated sources/sinks" into lmp-mr1-dev
Yin-Chia Yeh [Tue, 3 Feb 2015 23:39:52 +0000 (23:39 +0000)]
Merge "Camera2: framework updates for HAL3.3 keys"
Lajos Molnar [Tue, 3 Feb 2015 23:27:55 +0000 (23:27 +0000)]
am
d8e6a8b7: am
6999ef34: camera2: limit flexYUV array size in DngCreator automerge:
fdb2112
* commit '
d8e6a8b7643ffa037fbd0e409674c450f0296809':
camera2: limit flexYUV array size in DngCreator
Lajos Molnar [Tue, 3 Feb 2015 23:23:11 +0000 (23:23 +0000)]
am
6999ef34: camera2: limit flexYUV array size in DngCreator automerge:
fdb2112
* commit '
6999ef348818ec62a931f539c2caa799728b8a90':
camera2: limit flexYUV array size in DngCreator
Lajos Molnar [Tue, 3 Feb 2015 23:16:28 +0000 (23:16 +0000)]
camera2: limit flexYUV array size in DngCreator
automerge:
fdb2112
* commit '
fdb2112bbc140aab869aac047454cd2f67809df1':
camera2: limit flexYUV array size in DngCreator
Jean-Michel Trivi [Tue, 3 Feb 2015 23:02:19 +0000 (23:02 +0000)]
Merge "AudioAttributes javadoc update for conversion to stream types"
Lajos Molnar [Tue, 3 Feb 2015 22:55:21 +0000 (14:55 -0800)]
camera2: limit flexYUV array size in DngCreator
corrected overread
Bug:
19211135
Change-Id: I373b84dd9e2dc6219a305bf2d0308119668fab2a
Jae Seo [Tue, 3 Feb 2015 22:48:26 +0000 (22:48 +0000)]
Merge "TIF: Add a comment to remove padding around the channel logo image"
Alan Viverette [Tue, 3 Feb 2015 22:40:45 +0000 (14:40 -0800)]
Avoid unnecessary exception handling for <include> tag
Change-Id: I73357deed59cf5a601124584e4af740956d26a14
Craig Mautner [Tue, 3 Feb 2015 22:37:51 +0000 (22:37 +0000)]
Merge "Remove path, query, and fragment from http Uri."
Alan Viverette [Tue, 3 Feb 2015 22:37:04 +0000 (22:37 +0000)]
Merge "Add layer width, height, gravity, and RTL insets for LayerDrawable"
destradaa [Tue, 3 Feb 2015 21:33:06 +0000 (21:33 +0000)]
Merge "Reduce memory usage of GpsStatus objects."
Alan Viverette [Tue, 3 Feb 2015 21:24:59 +0000 (13:24 -0800)]
Add layer width, height, gravity, and RTL insets for LayerDrawable
Bug:
18473819
Change-Id: Iae8e3dbd3fcc7f4c2f08b266c69d40036e75dfb6
Paul Jensen [Tue, 3 Feb 2015 21:22:00 +0000 (21:22 +0000)]
am
f1b78d04: Merge "Facilitate network validation on networks with a per-network PAC." into lmp-mr1-dev automerge:
39ae054
automerge:
b35275a
* commit '
b35275a25e1a0775458fcbda5b6e8180a0e3311a':
Facilitate network validation on networks with a per-network PAC.
destradaa [Sat, 31 Jan 2015 00:11:20 +0000 (16:11 -0800)]
Reduce memory usage of GpsStatus objects.
A simple GpsStatus object uses 9K of space, given that it initializes an array
of 255 GpsSatellite objects.
This change reduces the memory footprint in the average case, and keeps the
semantics of the API and its GpsSatellite sibling objects without any changes.
In a best case scenario it brings the memory usage per object to 1K.
It's likely in most cases that only 20-50 satellites will be in view. So the
usage should not exceeed half of the original memory usage.
It was considered to keep the internal array but a SparseArray provided bigger
memory savings in the test scenario of ~700B.
Change-Id: Ie2d2144d776a74d4904a08c0d6c5aec6d3bba7cc
Paul Jensen [Tue, 3 Feb 2015 21:17:09 +0000 (21:17 +0000)]
am
f1b78d04: Merge "Facilitate network validation on networks with a per-network PAC." into lmp-mr1-dev automerge:
39ae054
* commit '
f1b78d046965f91c2e03d541cba4c91ea707111a':
Facilitate network validation on networks with a per-network PAC.
Paul Jensen [Tue, 3 Feb 2015 21:11:51 +0000 (21:11 +0000)]
Merge "Facilitate network validation on networks with a per-network PAC." into lmp-mr1-dev
automerge:
39ae054
* commit '
39ae0547ca5a1e7cfe24a945b2f8a910e09b7f3c':
Facilitate network validation on networks with a per-network PAC.
Paul Jensen [Tue, 3 Feb 2015 21:08:58 +0000 (21:08 +0000)]
Merge "Facilitate network validation on networks with a per-network PAC." into lmp-mr1-dev
Jae Seo [Tue, 3 Feb 2015 20:39:35 +0000 (12:39 -0800)]
TIF: Add a comment to remove padding around the channel logo image
Bug:
19066924
Change-Id: Ibb1efb945550028be4106ead826b1e152e488c92
Wale Ogunwale [Tue, 3 Feb 2015 20:30:24 +0000 (20:30 +0000)]
Merge "@hide ActivityInfo.resizeable."
Ruben Brunk [Tue, 3 Feb 2015 20:23:03 +0000 (20:23 +0000)]
Merge "Add ProcessInfoService to activity manager."
Winson Chung [Tue, 3 Feb 2015 20:06:36 +0000 (20:06 +0000)]
Merge "Ensuring that the list of stack views are mutable. (Bug
19245963)"
Winson Chung [Tue, 3 Feb 2015 18:26:22 +0000 (10:26 -0800)]
Ensuring that the list of stack views are mutable. (Bug
19245963)
Change-Id: I5a298bf389d8756492cce2777f127fc214f6d6be
Yin-Chia Yeh [Fri, 30 Jan 2015 18:47:22 +0000 (10:47 -0800)]
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
Craig Mautner [Tue, 3 Feb 2015 18:52:59 +0000 (18:52 +0000)]
Merge "[ActivityManager] Prevent application holding AMS lock" automerge:
53e8d6f automerge:
6112f63
automerge:
e8bd6d7
* commit '
e8bd6d734ccef685c4e25a0ec1735c140b9fe644':
[ActivityManager] Prevent application holding AMS lock
Craig Mautner [Tue, 3 Feb 2015 18:48:29 +0000 (18:48 +0000)]
Merge "[ActivityManager] Prevent application holding AMS lock" automerge:
53e8d6f
automerge:
6112f63
* commit '
6112f63369c7ba463c0384c73a4e4c0d45b63918':
[ActivityManager] Prevent application holding AMS lock
Craig Mautner [Tue, 3 Feb 2015 18:43:46 +0000 (18:43 +0000)]
Merge "[ActivityManager] Prevent application holding AMS lock"
automerge:
53e8d6f
* commit '
53e8d6f934be403b9c7733c190b6052d60dd0658':
[ActivityManager] Prevent application holding AMS lock
Craig Mautner [Tue, 3 Feb 2015 18:41:12 +0000 (18:41 +0000)]
Merge "[ActivityManager] Prevent application holding AMS lock"
Adrian Roos [Tue, 3 Feb 2015 18:18:01 +0000 (18:18 +0000)]
Merge "Remove UI code from LockPatternUtils"
Jean-Michel Trivi [Tue, 3 Feb 2015 18:15:08 +0000 (10:15 -0800)]
AudioAttributes javadoc update for conversion to stream types
Change-Id: I2b687d8a002897fff90a8c99d180aa0a3511a571
Clara Bayarri [Tue, 3 Feb 2015 18:13:59 +0000 (18:13 +0000)]
Merge "Floating Palettes: Create the ActionMode type and use it in Editor."
Adrian Roos [Thu, 15 Jan 2015 22:20:20 +0000 (23:20 +0100)]
Remove UI code from LockPatternUtils
Bug:
18931518
Change-Id: I951166f675731ec7a2bc51585e0a51e0cd92611d
Craig Mautner [Tue, 3 Feb 2015 18:09:38 +0000 (18:09 +0000)]
am
c0e9c1d0: am
240e8743: Merge "[ActivityManager] Set appropriate relation of task to home" automerge:
7d1aded
* commit '
c0e9c1d0a405c66e7ec75eb6268f84fe1d466344':
[ActivityManager] Set appropriate relation of task to home
Wale Ogunwale [Tue, 3 Feb 2015 17:29:00 +0000 (09:29 -0800)]
@hide ActivityInfo.resizeable.
Bug:
19178148
Change-Id: Icc132eef7196cc2b8e50294df10595bde8d73ecd
Craig Mautner [Tue, 3 Feb 2015 18:04:32 +0000 (18:04 +0000)]
am
240e8743: Merge "[ActivityManager] Set appropriate relation of task to home"
automerge:
7d1aded
* commit '
7d1adede2fbea8f4c0ad92214bee16395498dd07':
[ActivityManager] Set appropriate relation of task to home
Craig Mautner [Tue, 3 Feb 2015 17:16:52 +0000 (09:16 -0800)]
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
Craig Mautner [Tue, 3 Feb 2015 18:00:46 +0000 (18:00 +0000)]
am
240e8743: Merge "[ActivityManager] Set appropriate relation of task to home"
* commit '
240e8743977d1a1e7a43ff42e0d52148db10cda8':
[ActivityManager] Set appropriate relation of task to home
Craig Mautner [Tue, 3 Feb 2015 17:54:25 +0000 (17:54 +0000)]
Merge "[ActivityManager] Set appropriate relation of task to home"
Craig Mautner [Tue, 3 Feb 2015 17:51:31 +0000 (17:51 +0000)]
am
cd1b1ee3: Merge "Remove fall through for KEYCODE_VOICE_ASSIST" automerge:
84533ed automerge:
11c6f8b
* commit '
cd1b1ee39fbeaf7d95089c183b549b0853206ffd':
Remove fall through for KEYCODE_VOICE_ASSIST