OSDN Git Service
Kenny Guy [Wed, 5 Mar 2014 17:00:12 +0000 (09:00 -0800)]
am
e17bbad5: Merge "Fix bug with starting users in background."
* commit '
e17bbad52190382446fa0adb4f7a103e4b013d65':
Fix bug with starting users in background.
Kenny Guy [Wed, 5 Mar 2014 16:56:41 +0000 (16:56 +0000)]
Merge "Fix bug with starting users in background."
Kenny Guy [Wed, 5 Mar 2014 15:40:10 +0000 (15:40 +0000)]
Fix bug with starting users in background.
It shouldn't tell the window manager to lock or freeze the
screen when starting a user in the background.
Change-Id: I24c6c19a20c360ecbed7d28e1d7249c025a463b9
Alan Viverette [Wed, 5 Mar 2014 02:11:31 +0000 (18:11 -0800)]
am
4b131046: Revert "Revert "Fix the build.""
* commit '
4b131046aa5685112b8f198a989daef13279cadb':
Revert "Revert "Fix the build.""
Alan Viverette [Wed, 5 Mar 2014 02:11:28 +0000 (18:11 -0800)]
am
9e0c0a6e: Revert "Fix the build."
* commit '
9e0c0a6e974c8f006596207cb5ec92c7bfe1fa44':
Revert "Fix the build."
Alan Viverette [Wed, 5 Mar 2014 02:09:32 +0000 (02:09 +0000)]
Revert "Revert "Fix the build.""
WE MUST GO DEEPER
This reverts commit
9e0c0a6e974c8f006596207cb5ec92c7bfe1fa44.
Change-Id: Ia89f764648e15a60ce488d8a2b4bce97bdb37b20
Alan Viverette [Wed, 5 Mar 2014 02:08:29 +0000 (02:08 +0000)]
Revert "Fix the build."
This reverts commit
737629a346e953f5506672834e466acbb06caf39.
Change-Id: If3775b57f343094d343991e964faa202748d0236
Alan Viverette [Wed, 5 Mar 2014 01:45:43 +0000 (17:45 -0800)]
Alan Viverette [Wed, 5 Mar 2014 01:43:25 +0000 (17:43 -0800)]
Fix the build.
Change-Id: If6c301de541750ef76572879facc2c1f8f2c5855
Alan Viverette [Wed, 5 Mar 2014 01:26:18 +0000 (17:26 -0800)]
am
9e97fcba: Merge "Add lower density assets for Quantum"
* commit '
9e97fcba6a56134ef0abf6e005d5e1d34df3ca02':
Add lower density assets for Quantum
Alan Viverette [Wed, 5 Mar 2014 01:23:16 +0000 (01:23 +0000)]
Merge "Add lower density assets for Quantum"
Christopher Tate [Wed, 5 Mar 2014 01:14:23 +0000 (17:14 -0800)]
am
d4f30319: am
31aa0772: am
7a4e519e: am
8106dce7: am
a6c59158: am
f63ae644: am
1e995c76: Merge "Update PackageMonitor to recognize new \'replacing\' semantics" into klp-dev
* commit '
d4f30319ad599eebfea66057974929e40d34a42b':
Update PackageMonitor to recognize new 'replacing' semantics
Christopher Tate [Wed, 5 Mar 2014 01:11:53 +0000 (01:11 +0000)]
am
31aa0772: am
7a4e519e: am
8106dce7: am
a6c59158: am
f63ae644: am
1e995c76: Merge "Update PackageMonitor to recognize new \'replacing\' semantics" into klp-dev
* commit '
31aa077226b8d9d65d351ddb92a01273d9830070':
Update PackageMonitor to recognize new 'replacing' semantics
Christopher Tate [Wed, 5 Mar 2014 01:08:46 +0000 (01:08 +0000)]
am
7a4e519e: am
8106dce7: am
a6c59158: am
f63ae644: am
1e995c76: Merge "Update PackageMonitor to recognize new \'replacing\' semantics" into klp-dev
* commit '
7a4e519eda4e0e7bac9ad0159b29b11f61b50e01':
Update PackageMonitor to recognize new 'replacing' semantics
Christopher Tate [Wed, 5 Mar 2014 01:05:31 +0000 (01:05 +0000)]
am
8106dce7: am
a6c59158: am
f63ae644: am
1e995c76: Merge "Update PackageMonitor to recognize new \'replacing\' semantics" into klp-dev
* commit '
8106dce705ba69d5bc0ccafa8e21068216f42a5f':
Update PackageMonitor to recognize new 'replacing' semantics
Christopher Tate [Wed, 5 Mar 2014 01:00:50 +0000 (01:00 +0000)]
am
a6c59158: am
f63ae644: am
1e995c76: Merge "Update PackageMonitor to recognize new \'replacing\' semantics" into klp-dev
* commit '
a6c59158761423551941f6ed338a117658e581ad':
Update PackageMonitor to recognize new 'replacing' semantics
Christopher Tate [Wed, 5 Mar 2014 00:57:18 +0000 (00:57 +0000)]
am
f63ae644: am
1e995c76: Merge "Update PackageMonitor to recognize new \'replacing\' semantics" into klp-dev
* commit '
f63ae644a80ef2d0bd7bfb448eebb19691e4b6ec':
Update PackageMonitor to recognize new 'replacing' semantics
Christopher Tate [Wed, 5 Mar 2014 00:54:14 +0000 (00:54 +0000)]
am
1e995c76: Merge "Update PackageMonitor to recognize new \'replacing\' semantics" into klp-dev
* commit '
1e995c76485f8a7477177886890b834c31e8d1a6':
Update PackageMonitor to recognize new 'replacing' semantics
Christopher Tate [Wed, 5 Mar 2014 00:51:04 +0000 (00:51 +0000)]
Merge "Update PackageMonitor to recognize new 'replacing' semantics" into klp-dev
Ben Gilad [Wed, 5 Mar 2014 00:22:19 +0000 (00:22 +0000)]
Merge "Adding the aborted call state." into master-nova
Alan Viverette [Wed, 5 Mar 2014 00:12:34 +0000 (16:12 -0800)]
Add lower density assets for Quantum
BUG:
13300223
Change-Id: I1d89d92b5a3a4dbb6b21b740ede3cd4fffdac0b9
Ben Gilad [Wed, 5 Mar 2014 00:01:22 +0000 (16:01 -0800)]
Adding the aborted call state.
Change-Id: I26c1e2bc180a2be2d2374143546c666faeea2705
Dave Platt [Tue, 4 Mar 2014 23:58:18 +0000 (15:58 -0800)]
am
63761a2d: am
bf588bda: am
f08cd8c6: am
7d8262cb: am
22f66b76: Merge "Harden NsdManager against null-dereference crashes"
* commit '
63761a2d79d1ba751bf35a0a78d68337a64cac9c':
Harden NsdManager against null-dereference crashes
Will Haldean Brown [Tue, 4 Mar 2014 23:54:13 +0000 (15:54 -0800)]
am
568628dc: Manually merge commit \'
2faf28cf\' into master
* commit '
568628dc2cb92b3ec3a87cae9de3203fbdc5968c':
Add swipe-to-dismiss support to PhoneWindow.
Dave Platt [Tue, 4 Mar 2014 23:51:51 +0000 (23:51 +0000)]
am
bf588bda: am
f08cd8c6: am
7d8262cb: am
22f66b76: Merge "Harden NsdManager against null-dereference crashes"
* commit '
bf588bda2c4dc98919439946e905e98ad4d352dd':
Harden NsdManager against null-dereference crashes
Will Haldean Brown [Tue, 4 Mar 2014 23:25:43 +0000 (15:25 -0800)]
Manually merge commit '
2faf28cf' into master
Original commit message:
Add swipe-to-dismiss support to PhoneWindow.
This adds a new window feature -- FEATURE_SWIPE_TO_DISMISS -- and a
theme attribute to activate that feature. When the feature is
activated, a SwipeDismissLayout is inflated as the DecorView layout.
SwipeDismissLayout intercepts touch events and steals ones that are
large swipes to the right if its children don't. PhoneWindow
registers handlers that listen for these swipe events, translate the
window when necessary, and finish the activity at the end of the
gesture.
Conflicts:
core/java/android/view/Window.java
core/res/res/values/attrs.xml
Change-Id: I943290b436864ca4a1bd401b88d696e08c921cdd
John Spurlock [Tue, 4 Mar 2014 22:39:54 +0000 (14:39 -0800)]
am
0a5500a8: resolved conflicts for merge of
0dd1a828 to master
* commit '
0a5500a8fc6040e556f25c1235ec010e1c74866d':
Volume panel should not clear system ui flags.
Chris Craik [Tue, 4 Mar 2014 22:39:51 +0000 (14:39 -0800)]
am
240bd323: Merge "Pass correct paint to HW layer"
* commit '
240bd32345d1be7b5fe1b306d850ec3fa1c1a135':
Pass correct paint to HW layer
John Spurlock [Tue, 4 Mar 2014 22:39:48 +0000 (14:39 -0800)]
am
e5f4234e: am
42c0c519: am
a12c0bf8: am
ed7d7cba: am
c3371eb5: am
49eac16e: am
8ec59a72: Merge "Show hideycling for non-primary users." into klp-dev
* commit '
e5f4234e0126457c2283b5dd19346be2638ec1f0':
Show hideycling for non-primary users.
John Spurlock [Tue, 4 Mar 2014 22:39:46 +0000 (14:39 -0800)]
am
c6048361: am
6db2cfe6: am
b61fde1f: am
b85214bc: am
0a3bc3c4: am
2cc271eb: am
d36ede39: Merge "Allow lights-out + bar icon dimming on low-end devices." into klp-dev
* commit '
c6048361c665d3fd62b29dd2e731d77f3bbe27af':
Allow lights-out + bar icon dimming on low-end devices.
Guang Zhu [Tue, 4 Mar 2014 22:39:38 +0000 (14:39 -0800)]
am
ba27041f: am
395e3f51: am
ca3af0d7: am
a70d20f6: am
818f83d9: am
bf7b64bd: am
be659185: use min app launch time in AppLaunch perf test
* commit '
ba27041f8cb3a453eb5069bd1bbf8df7013c3e54':
use min app launch time in AppLaunch perf test
John Spurlock [Tue, 4 Mar 2014 22:32:16 +0000 (17:32 -0500)]
resolved conflicts for merge of
0dd1a828 to master
Change-Id: I6992c309b22a0b2e2ecfcafdd45a828be5aceb2c
Chris Craik [Tue, 4 Mar 2014 22:18:32 +0000 (22:18 +0000)]
Merge "Pass correct paint to HW layer"
John Spurlock [Tue, 4 Mar 2014 22:08:45 +0000 (22:08 +0000)]
am
42c0c519: am
a12c0bf8: am
ed7d7cba: am
c3371eb5: am
49eac16e: am
8ec59a72: Merge "Show hideycling for non-primary users." into klp-dev
* commit '
42c0c51930b77d9eb4357aad53eaf72a7b3c117f':
Show hideycling for non-primary users.
John Spurlock [Tue, 4 Mar 2014 22:08:42 +0000 (22:08 +0000)]
am
6db2cfe6: am
b61fde1f: am
b85214bc: am
0a3bc3c4: am
2cc271eb: am
d36ede39: Merge "Allow lights-out + bar icon dimming on low-end devices." into klp-dev
* commit '
6db2cfe6e14b8c1ee38e1fd5641e8af874a28011':
Allow lights-out + bar icon dimming on low-end devices.
Guang Zhu [Tue, 4 Mar 2014 22:08:38 +0000 (22:08 +0000)]
am
395e3f51: am
ca3af0d7: am
a70d20f6: am
818f83d9: am
bf7b64bd: am
be659185: use min app launch time in AppLaunch perf test
* commit '
395e3f51805149bf810d55b4e9e8968b76f59fd1':
use min app launch time in AppLaunch perf test
Dave Platt [Tue, 4 Mar 2014 22:06:56 +0000 (22:06 +0000)]
am
f08cd8c6: am
7d8262cb: am
22f66b76: Merge "Harden NsdManager against null-dereference crashes"
* commit '
f08cd8c656c4ea6a8c7bf8bafa3f8de72578ebca':
Harden NsdManager against null-dereference crashes
Dave Platt [Tue, 4 Mar 2014 22:02:55 +0000 (22:02 +0000)]
am
7d8262cb: am
22f66b76: Merge "Harden NsdManager against null-dereference crashes"
* commit '
7d8262cb554c41892794f23b92e01b52458288bb':
Harden NsdManager against null-dereference crashes
Dave Platt [Tue, 4 Mar 2014 21:59:57 +0000 (13:59 -0800)]
am
22f66b76: Merge "Harden NsdManager against null-dereference crashes"
* commit '
22f66b76f5e49704f3be76ad3fff7e4b5456864d':
Harden NsdManager against null-dereference crashes
Dave Platt [Tue, 4 Mar 2014 21:55:56 +0000 (21:55 +0000)]
Merge "Harden NsdManager against null-dereference crashes"
Will Haldean Brown [Tue, 4 Mar 2014 21:32:22 +0000 (21:32 +0000)]
am
11c51608: am
bd79652a: Merge "Add swipe-to-dismiss support to PhoneWindow." into klp-modular-dev
* commit '
11c51608ee1c368dd38b134603e85943629c6f44':
Add swipe-to-dismiss support to PhoneWindow.
Zhijun He [Tue, 4 Mar 2014 21:27:18 +0000 (13:27 -0800)]
am
add749f6: Camera2: make shading.mode key public
* commit '
add749f664660ea2d5acdfae5d66c5dcf511a76e':
Camera2: make shading.mode key public
Will Haldean Brown [Tue, 4 Mar 2014 21:27:11 +0000 (21:27 +0000)]
am
bd79652a: Merge "Add swipe-to-dismiss support to PhoneWindow." into klp-modular-dev
* commit '
bd79652a9afeee1e81f0f51d11e5869091f58af9':
Add swipe-to-dismiss support to PhoneWindow.
Dave Platt [Fri, 28 Feb 2014 00:16:20 +0000 (16:16 -0800)]
Harden NsdManager against null-dereference crashes
Due to race conditions or programming errors, the NsdManager
can attempt to process an asynchronous status message (and issue
a callback to the listener) after the listener has already been
removed from the NsdManager state. This causes dereferencing of
null objects, and a crash.
Split out the three async-queue message cases: these are ones
in which message.arg2 does not hold an NsdManager array index
and the code should not interpret this field as if it were.
Add an explicit check for "null listener" (the array index in the
message has already been released), log a warning, and exit early.
Safeguard accesses to the "NSD service type" string from a (possibly
null) NsdServiceInfo object... return a constant "?" string rather
than crashing.
Bug:
9016259
Change-Id: I40aabdfc65d86fdd0eaac7a1e7e56e6ff69796cf
Zhijun He [Tue, 4 Mar 2014 21:21:58 +0000 (13:21 -0800)]
Camera2: make shading.mode key public
Change-Id: I94f506be19940b1881e65a8de9fe8198194932a3
Will Haldean Brown [Tue, 4 Mar 2014 21:22:30 +0000 (21:22 +0000)]
Merge "Add swipe-to-dismiss support to PhoneWindow." into klp-modular-dev
John Spurlock [Tue, 4 Mar 2014 20:42:41 +0000 (20:42 +0000)]
am
76ee9b72: am
3b869238: am
c6ecac77: am
38f81ccc: am
fee6f69e: Merge "Volume panel should not clear system ui flags." into klp-dev
* commit '
76ee9b727a0ec0105a0aafa79f163f70b9533430':
Volume panel should not clear system ui flags.
John Spurlock [Tue, 4 Mar 2014 20:42:39 +0000 (20:42 +0000)]
am
a12c0bf8: am
ed7d7cba: am
c3371eb5: am
49eac16e: am
8ec59a72: Merge "Show hideycling for non-primary users." into klp-dev
* commit '
a12c0bf8944ab7fc5dbed1934f1bf03d242b8c6a':
Show hideycling for non-primary users.
John Spurlock [Tue, 4 Mar 2014 20:42:37 +0000 (20:42 +0000)]
am
b61fde1f: am
b85214bc: am
0a3bc3c4: am
2cc271eb: am
d36ede39: Merge "Allow lights-out + bar icon dimming on low-end devices." into klp-dev
* commit '
b61fde1f3d3352c510263d91b1654bcfd075c10d':
Allow lights-out + bar icon dimming on low-end devices.
Guang Zhu [Tue, 4 Mar 2014 20:42:33 +0000 (20:42 +0000)]
am
ca3af0d7: am
a70d20f6: am
818f83d9: am
bf7b64bd: am
be659185: use min app launch time in AppLaunch perf test
* commit '
ca3af0d7e89e52d05050e50c09360bb8f200c6cf':
use min app launch time in AppLaunch perf test
John Spurlock [Tue, 4 Mar 2014 20:36:56 +0000 (20:36 +0000)]
am
3b869238: am
c6ecac77: am
38f81ccc: am
fee6f69e: Merge "Volume panel should not clear system ui flags." into klp-dev
* commit '
3b86923854069fa1b3bcabc8643a5e2db40d7b10':
Volume panel should not clear system ui flags.
John Spurlock [Tue, 4 Mar 2014 20:36:53 +0000 (20:36 +0000)]
am
ed7d7cba: am
c3371eb5: am
49eac16e: am
8ec59a72: Merge "Show hideycling for non-primary users." into klp-dev
* commit '
ed7d7cba9d698aa619b654a485d7c88594ae5090':
Show hideycling for non-primary users.
John Spurlock [Tue, 4 Mar 2014 20:36:50 +0000 (20:36 +0000)]
am
b85214bc: am
0a3bc3c4: am
2cc271eb: am
d36ede39: Merge "Allow lights-out + bar icon dimming on low-end devices." into klp-dev
* commit '
b85214bcc32ff26a1dbc035c0128a2bebb193149':
Allow lights-out + bar icon dimming on low-end devices.
Guang Zhu [Tue, 4 Mar 2014 20:36:47 +0000 (20:36 +0000)]
am
a70d20f6: am
818f83d9: am
bf7b64bd: am
be659185: use min app launch time in AppLaunch perf test
* commit '
a70d20f6037a5c3f6ee18244a3b547454beb8399':
use min app launch time in AppLaunch perf test
Chris Craik [Tue, 4 Mar 2014 19:52:01 +0000 (11:52 -0800)]
Pass correct paint to HW layer
bug:
13299767
Change-Id: I8372a830b2076c489ed0837aba9a85650a4202fd
John Spurlock [Tue, 4 Mar 2014 19:19:14 +0000 (19:19 +0000)]
am
c6ecac77: am
38f81ccc: am
fee6f69e: Merge "Volume panel should not clear system ui flags." into klp-dev
* commit '
c6ecac77cfa35bbc72a4b7e1e3374ad00f83b305':
Volume panel should not clear system ui flags.
John Spurlock [Tue, 4 Mar 2014 19:19:10 +0000 (19:19 +0000)]
am
c3371eb5: am
49eac16e: am
8ec59a72: Merge "Show hideycling for non-primary users." into klp-dev
* commit '
c3371eb5d4bde6dc11499efb313f7529a6bf6d59':
Show hideycling for non-primary users.
John Spurlock [Tue, 4 Mar 2014 19:19:04 +0000 (19:19 +0000)]
am
0a3bc3c4: am
2cc271eb: am
d36ede39: Merge "Allow lights-out + bar icon dimming on low-end devices." into klp-dev
* commit '
0a3bc3c4d204c64267641dcad0d699a5db38d989':
Allow lights-out + bar icon dimming on low-end devices.
John Spurlock [Tue, 4 Mar 2014 19:15:56 +0000 (19:15 +0000)]
am
38f81ccc: am
fee6f69e: Merge "Volume panel should not clear system ui flags." into klp-dev
* commit '
38f81ccc768958b1a9100cb2caa93ec3aedd9b5e':
Volume panel should not clear system ui flags.
John Spurlock [Tue, 4 Mar 2014 19:15:53 +0000 (19:15 +0000)]
am
49eac16e: am
8ec59a72: Merge "Show hideycling for non-primary users." into klp-dev
* commit '
49eac16ec00ea63feaafc137a1d313fcb4374b36':
Show hideycling for non-primary users.
John Spurlock [Tue, 4 Mar 2014 19:15:49 +0000 (19:15 +0000)]
am
2cc271eb: am
d36ede39: Merge "Allow lights-out + bar icon dimming on low-end devices." into klp-dev
* commit '
2cc271ebbccc251ef96edee16b79a22fcf856244':
Allow lights-out + bar icon dimming on low-end devices.
Andy McFadden [Tue, 4 Mar 2014 19:15:42 +0000 (11:15 -0800)]
am
dcd1a102: Merge "Avoid restrictive locking around EGL calls"
* commit '
dcd1a1027f2dc68c4244ad9650d417339a8d900e':
Avoid restrictive locking around EGL calls
John Spurlock [Tue, 4 Mar 2014 19:12:40 +0000 (19:12 +0000)]
am
fee6f69e: Merge "Volume panel should not clear system ui flags." into klp-dev
* commit '
fee6f69e8321c3f94c2b341fe483f7b1f6534169':
Volume panel should not clear system ui flags.
John Spurlock [Tue, 4 Mar 2014 19:12:37 +0000 (19:12 +0000)]
am
8ec59a72: Merge "Show hideycling for non-primary users." into klp-dev
* commit '
8ec59a72889f7da0c13119977ca62ada8a1498e0':
Show hideycling for non-primary users.
John Spurlock [Tue, 4 Mar 2014 19:12:33 +0000 (19:12 +0000)]
am
d36ede39: Merge "Allow lights-out + bar icon dimming on low-end devices." into klp-dev
* commit '
d36ede391619e6fc8a1553f5b2f4b33b3603cd65':
Allow lights-out + bar icon dimming on low-end devices.
John Spurlock [Tue, 4 Mar 2014 19:09:20 +0000 (19:09 +0000)]
Merge "Volume panel should not clear system ui flags." into klp-dev
John Spurlock [Tue, 4 Mar 2014 19:08:46 +0000 (19:08 +0000)]
Merge "Show hideycling for non-primary users." into klp-dev
Andy McFadden [Tue, 4 Mar 2014 19:08:44 +0000 (19:08 +0000)]
Merge "Avoid restrictive locking around EGL calls"
John Spurlock [Tue, 4 Mar 2014 19:08:31 +0000 (19:08 +0000)]
Merge "Allow lights-out + bar icon dimming on low-end devices." into klp-dev
Guang Zhu [Tue, 4 Mar 2014 18:46:23 +0000 (18:46 +0000)]
am
818f83d9: am
bf7b64bd: am
be659185: use min app launch time in AppLaunch perf test
* commit '
818f83d965be3cc1af88a1c700115bff0dccf3a3':
use min app launch time in AppLaunch perf test
Guang Zhu [Tue, 4 Mar 2014 18:42:17 +0000 (18:42 +0000)]
am
bf7b64bd: am
be659185: use min app launch time in AppLaunch perf test
* commit '
bf7b64bd30bc1e7fabcfc7f46132f504b30ba97c':
use min app launch time in AppLaunch perf test
Guang Zhu [Tue, 4 Mar 2014 18:38:32 +0000 (18:38 +0000)]
am
be659185: use min app launch time in AppLaunch perf test
* commit '
be6591856bd62e14d7c87dd927db0cbbed242d81':
use min app launch time in AppLaunch perf test
Guang Zhu [Thu, 20 Feb 2014 01:58:38 +0000 (17:58 -0800)]
use min app launch time in AppLaunch perf test
Change-Id: Id3a5872ff29fba5daeff058f0842fd011e50a0a1
(cherry picked from commit
2861a89bed9066e206917c41357a5e589e8482cb)
Craig Mautner [Tue, 4 Mar 2014 18:01:26 +0000 (10:01 -0800)]
am
2e416f16: am
f716acc6: am
80b13579: am
7a93aa2f: am
a0b4d0ce: Merge "Avoid duplication of AppWindowToken in created Task"
* commit '
2e416f16745c55b4957611cb3fa5acc82f247092':
Avoid duplication of AppWindowToken in created Task
Michael Chock [Tue, 6 Aug 2013 22:21:10 +0000 (15:21 -0700)]
Avoid restrictive locking around EGL calls
Do not use critical section variants of JNI array mapping operations
when making EGL calls. They impose unnecessary restrictions on the
EGL implementation that can lead to intermittent crashes. Using the
non-critical variants makes no detectable performance difference.
Change-Id: I4ef643f1a7fcdc5995538ff9d543f43f33c8e412
Craig Mautner [Tue, 4 Mar 2014 17:55:47 +0000 (17:55 +0000)]
am
f716acc6: am
80b13579: am
7a93aa2f: am
a0b4d0ce: Merge "Avoid duplication of AppWindowToken in created Task"
* commit '
f716acc66f2c30503f8c10f57ecba3d597107801':
Avoid duplication of AppWindowToken in created Task
Yuhao Zheng [Tue, 4 Mar 2014 17:45:50 +0000 (09:45 -0800)]
am
d5273da9: Merge "Allow more proxy bypass patterns"
* commit '
d5273da95b333b018c0d13bd6917a1e8a769f064':
Allow more proxy bypass patterns
Yuhao Zheng [Tue, 4 Mar 2014 17:45:48 +0000 (09:45 -0800)]
am
5c43d4e4: Merge "Return detailed reason of invalid proxy settings"
* commit '
5c43d4e451a1480d82014a1e1c403a5c764e758c':
Return detailed reason of invalid proxy settings
Yuhao Zheng [Tue, 4 Mar 2014 17:43:48 +0000 (17:43 +0000)]
Merge "Allow more proxy bypass patterns"
Yuhao Zheng [Tue, 4 Mar 2014 17:43:47 +0000 (17:43 +0000)]
Merge "Return detailed reason of invalid proxy settings"
Will Haldean Brown [Wed, 12 Feb 2014 18:23:41 +0000 (10:23 -0800)]
Add swipe-to-dismiss support to PhoneWindow.
This adds a new window feature -- FEATURE_SWIPE_TO_DISMISS -- and a
theme attribute to activate that feature. When the feature is
activated, a SwipeDismissLayout is inflated as the DecorView layout.
SwipeDismissLayout intercepts touch events and steals ones that are
large swipes to the right if its children don't. PhoneWindow registers
handlers that listen for these swipe events, translate the window when
necessary, and finish the activity at the end of the gesture.
Change-Id: I512e758f3c3ffd3b353dba3b911c0e80a88d6f5f
Robert Greenwalt [Tue, 4 Mar 2014 17:23:41 +0000 (09:23 -0800)]
am
0f323747: Merge "Only apply tcp buffer sizes for default net"
* commit '
0f3237476904a59e351ef1d451cb7453b63b1d58':
Only apply tcp buffer sizes for default net
Craig Mautner [Tue, 4 Mar 2014 17:21:11 +0000 (17:21 +0000)]
am
80b13579: am
7a93aa2f: am
a0b4d0ce: Merge "Avoid duplication of AppWindowToken in created Task"
* commit '
80b1357909e57aa330c2624b8a5baac9f3bdce3f':
Avoid duplication of AppWindowToken in created Task
Robert Greenwalt [Tue, 4 Mar 2014 17:20:18 +0000 (17:20 +0000)]
Merge "Only apply tcp buffer sizes for default net"
Craig Mautner [Tue, 4 Mar 2014 17:14:58 +0000 (17:14 +0000)]
am
7a93aa2f: am
a0b4d0ce: Merge "Avoid duplication of AppWindowToken in created Task"
* commit '
7a93aa2fc2555b0de41bb5f30eb0e9cce2413084':
Avoid duplication of AppWindowToken in created Task
Craig Mautner [Tue, 4 Mar 2014 17:10:36 +0000 (09:10 -0800)]
am
a0b4d0ce: Merge "Avoid duplication of AppWindowToken in created Task"
* commit '
a0b4d0ce471cf10888bac4d4ec5b97fd562ad756':
Avoid duplication of AppWindowToken in created Task
Baligh Uddin [Tue, 4 Mar 2014 17:09:56 +0000 (09:09 -0800)]
am
05f55732: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
05f5573252fd643a0133fe04f885b8edf54a4994':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 4 Mar 2014 17:06:36 +0000 (17:06 +0000)]
Merge "Import translations. DO NOT MERGE"
Tom O'Neill [Tue, 4 Mar 2014 16:28:33 +0000 (08:28 -0800)]
am
5d8f40ba: Merge "Removing a test provider clears its enabled state"
* commit '
5d8f40baebcf3605ee6ab6ec99abeab4f58bbcd0':
Removing a test provider clears its enabled state
Tom O'Neill [Tue, 4 Mar 2014 16:24:44 +0000 (16:24 +0000)]
Merge "Removing a test provider clears its enabled state"
Craig Mautner [Tue, 4 Mar 2014 15:19:17 +0000 (15:19 +0000)]
Merge "Avoid duplication of AppWindowToken in created Task"
John Spurlock [Wed, 4 Dec 2013 18:47:36 +0000 (13:47 -0500)]
Volume panel should not clear system ui flags.
Remove private WM flag (used only by the volume panel) to force
the clearable system UI flags clear.
Instead, always lay out the volume panel as if the bars are visible,
as we do for system dialogs - and don't clear the flags.
Reverts part of I25f29af5b6518aba695b64a75977ae240b742118
Bug:
11986621
Change-Id: I842729d729d2a6eb2a687d0b930ddb160c6a1b57
John Spurlock [Mon, 9 Dec 2013 16:59:45 +0000 (11:59 -0500)]
Show hideycling for non-primary users.
User 0 owns the window (system_server) but should be allowed
to display on a user's behalf.
Use the corresponding private flag for this system window, since
we cannot classify it by type (TYPE_TOAST) in policy.
Bug:
12015090
Change-Id: I33aedb4624288415a5e1ae937676b693024546a9
John Spurlock [Tue, 14 Jan 2014 19:51:23 +0000 (14:51 -0500)]
Allow lights-out + bar icon dimming on low-end devices.
Maintain fallback to OPAQUE mode on low-end devices in place of the
translucent modes.
Bug:
12546110
Change-Id: Ia3582c305cb09aadd56c6aa58b039a174675c79a
Yevgen Pronenko [Wed, 19 Feb 2014 09:33:07 +0000 (10:33 +0100)]
Avoid duplication of AppWindowToken in created Task
When WindowManagerService creates a new Task, it passes atoken to the
Task constructor. In this case atoken is added to mAppTokens list by
the Task constructor and then it is added manually again by calling
newTask.mAppTokens.add(atoken). As a result, the same atoken is present
in mAppTokens list twice.
When another window token is added to the list, it may be placed in
beetwen duplicated tokens and corresponding window will be hidden from
the screen by corresponding duplicated windows.
From user perspective it means that some windows will not be displayed
on the screen.
The issue is fixed by avoid adding atoken to mAppTokens list manually
when it was added already in Task constructor.
Change-Id: I10628e68186160fffdde07beb7d84ab3cecb7051
David Friedman [Tue, 4 Mar 2014 08:28:21 +0000 (00:28 -0800)]
David Friedman [Tue, 4 Mar 2014 08:28:19 +0000 (00:28 -0800)]
am
afe2f2a6: am
4c4160a0: am
b0a6241b: am
58d4906b: am
663d7753: am
6aa6219a: Merge "NDK r9d: Incorporates all review comments, final file sizes." into klp-ub-dev
* commit '
afe2f2a65df89c590476b5a338922c45d572a186':
NDK r9d: Incorporates all review comments, final file sizes.
David Friedman [Tue, 4 Mar 2014 08:25:34 +0000 (08:25 +0000)]
David Friedman [Tue, 4 Mar 2014 08:25:29 +0000 (08:25 +0000)]
am
4c4160a0: am
b0a6241b: am
58d4906b: am
663d7753: am
6aa6219a: Merge "NDK r9d: Incorporates all review comments, final file sizes." into klp-ub-dev
* commit '
4c4160a041643072f0bcfbdcfbcc904796dd0a5c':
NDK r9d: Incorporates all review comments, final file sizes.
Yorke Lee [Tue, 4 Mar 2014 08:23:53 +0000 (00:23 -0800)]
am
c0e91830: am
06f385c3: am
440e9725: am
d53f7a71: am
6c758e86: am
468e973f: am
81479358: Reword the "Quick contacts not available" string
* commit '
c0e91830c947534008a8ecdf28cd10a13b058d97':
Reword the "Quick contacts not available" string