Kenny Guy
6143a02f96
Start related users on boot and user switch.
...
Collect related initialized users and start
them on boot and user switch.
Update list users command to show whether a
user is running or not.
Change-Id: Ib3d5debcb01ec55a07d93450b988b0180fc63263
2014-03-05 22:24:01 +00:00
Brian Attwell
48d04ec3b7
Merge "Add IN_DEFAULT_DIRECTORY to contract"
2014-03-05 17:39:27 +00:00
John Reck
24ba99c235
Merge "DisplayList overhaul"
2014-03-05 17:00:54 +00:00
Kenny Guy
e17bbad521
Merge "Fix bug with starting users in background."
2014-03-05 16:56:41 +00:00
Kenny Guy
264707caa3
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
2014-03-05 15:40:10 +00:00
Alan Viverette
4b131046aa
Revert "Revert "Fix the build.""
...
WE MUST GO DEEPER
This reverts commit 9e0c0a6e974c8f006596207cb5ec92c7bfe1fa44.
Change-Id: Ia89f764648e15a60ce488d8a2b4bce97bdb37b20
2014-03-05 02:09:32 +00:00
Alan Viverette
9e0c0a6e97
Revert "Fix the build."
...
This reverts commit 737629a346e953f5506672834e466acbb06caf39.
Change-Id: If3775b57f343094d343991e964faa202748d0236
2014-03-05 02:08:29 +00:00
Alan Viverette
737629a346
Fix the build.
...
Change-Id: If6c301de541750ef76572879facc2c1f8f2c5855
2014-03-04 17:43:25 -08:00
Brian Attwell
2fa85d383d
Add IN_DEFAULT_DIRECTORY to contract
...
I want to expose this flag so that gmail can sort
based on it. Plus, it provides generally useful information.
Bug: 13173524
Change-Id: I93a35f8822b55f97b15e1fbb783110e3674c1622
2014-03-04 17:41:13 -08:00
Alan Viverette
9e97fcba6a
Merge "Add lower density assets for Quantum"
2014-03-05 01:23:17 +00:00
Christopher Tate
d4f30319ad
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
2014-03-05 01:11:53 +00:00
Christopher Tate
31aa077226
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
2014-03-05 01:08:46 +00:00
Christopher Tate
7a4e519eda
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
2014-03-05 01:05:31 +00:00
Christopher Tate
8106dce705
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
2014-03-05 01:00:50 +00:00
Christopher Tate
a6c5915876
am f63ae644: am 1e995c76: Merge "Update PackageMonitor to recognize new \'replacing\' semantics" into klp-dev
...
* commit 'f63ae644a80ef2d0bd7bfb448eebb19691e4b6ec':
Update PackageMonitor to recognize new 'replacing' semantics
2014-03-05 00:57:18 +00:00
Christopher Tate
f63ae644a8
am 1e995c76: Merge "Update PackageMonitor to recognize new \'replacing\' semantics" into klp-dev
...
* commit '1e995c76485f8a7477177886890b834c31e8d1a6':
Update PackageMonitor to recognize new 'replacing' semantics
2014-03-05 00:54:14 +00:00
Christopher Tate
1e995c7648
Merge "Update PackageMonitor to recognize new 'replacing' semantics" into klp-dev
2014-03-05 00:51:04 +00:00
Alan Viverette
465f2940ae
Add lower density assets for Quantum
...
BUG: 13300223
Change-Id: I1d89d92b5a3a4dbb6b21b740ede3cd4fffdac0b9
2014-03-04 16:12:34 -08:00
Dave Platt
63761a2d79
am bf588bda: am f08cd8c6: am 7d8262cb: am 22f66b76: Merge "Harden NsdManager against null-dereference crashes"
...
* commit 'bf588bda2c4dc98919439946e905e98ad4d352dd':
Harden NsdManager against null-dereference crashes
2014-03-04 23:51:51 +00:00
Will Haldean Brown
568628dc2c
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
2014-03-04 15:25:43 -08:00
John Reck
44fd8d24f7
DisplayList overhaul
...
Change-Id: I53418d580c98f706e971545cff81b9921c12cc5f
2014-03-04 15:18:16 -08:00
John Spurlock
0a5500a8fc
resolved conflicts for merge of 0dd1a828 to master
...
Change-Id: I6992c309b22a0b2e2ecfcafdd45a828be5aceb2c
2014-03-04 17:32:16 -05:00
Chris Craik
240bd32345
Merge "Pass correct paint to HW layer"
2014-03-04 22:18:32 +00:00
John Spurlock
e5f4234e01
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.
2014-03-04 22:08:45 +00:00
John Spurlock
c6048361c6
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.
2014-03-04 22:08:42 +00:00
Guang Zhu
ba27041f8c
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
2014-03-04 22:08:38 +00:00
Dave Platt
bf588bda2c
am f08cd8c6: am 7d8262cb: am 22f66b76: Merge "Harden NsdManager against null-dereference crashes"
...
* commit 'f08cd8c656c4ea6a8c7bf8bafa3f8de72578ebca':
Harden NsdManager against null-dereference crashes
2014-03-04 22:06:56 +00:00
Dave Platt
f08cd8c656
am 7d8262cb: am 22f66b76: Merge "Harden NsdManager against null-dereference crashes"
...
* commit '7d8262cb554c41892794f23b92e01b52458288bb':
Harden NsdManager against null-dereference crashes
2014-03-04 22:02:55 +00:00
Dave Platt
7d8262cb55
am 22f66b76: Merge "Harden NsdManager against null-dereference crashes"
...
* commit '22f66b76f5e49704f3be76ad3fff7e4b5456864d':
Harden NsdManager against null-dereference crashes
2014-03-04 13:59:57 -08:00
Dave Platt
22f66b76f5
Merge "Harden NsdManager against null-dereference crashes"
2014-03-04 21:55:56 +00:00
Will Haldean Brown
2faf28cf85
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.
2014-03-04 21:32:22 +00:00
Will Haldean Brown
11c51608ee
am bd79652a: Merge "Add swipe-to-dismiss support to PhoneWindow." into klp-modular-dev
...
* commit 'bd79652a9afeee1e81f0f51d11e5869091f58af9':
Add swipe-to-dismiss support to PhoneWindow.
2014-03-04 21:27:11 +00:00
Dave Platt
3fc376b733
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
2014-03-04 13:25:02 -08:00
Zhijun He
add749f664
Camera2: make shading.mode key public
...
Change-Id: I94f506be19940b1881e65a8de9fe8198194932a3
2014-03-04 21:23:34 +00:00
Will Haldean Brown
bd79652a9a
Merge "Add swipe-to-dismiss support to PhoneWindow." into klp-modular-dev
2014-03-04 21:22:30 +00:00
John Spurlock
0dd1a82883
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.
2014-03-04 20:42:41 +00:00
John Spurlock
42c0c51930
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.
2014-03-04 20:42:39 +00:00
John Spurlock
6db2cfe6e1
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.
2014-03-04 20:42:37 +00:00
Guang Zhu
395e3f5180
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
2014-03-04 20:42:33 +00:00
John Spurlock
76ee9b727a
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.
2014-03-04 20:36:56 +00:00
John Spurlock
a12c0bf894
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.
2014-03-04 20:36:53 +00:00
John Spurlock
b61fde1f3d
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.
2014-03-04 20:36:50 +00:00
Guang Zhu
ca3af0d7e8
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
2014-03-04 20:36:47 +00:00
Chris Craik
c152547815
Pass correct paint to HW layer
...
bug:13299767
Change-Id: I8372a830b2076c489ed0837aba9a85650a4202fd
2014-03-04 12:06:19 -08:00
John Spurlock
3b86923854
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.
2014-03-04 19:19:14 +00:00
John Spurlock
ed7d7cba9d
am c3371eb5: am 49eac16e: am 8ec59a72: Merge "Show hideycling for non-primary users." into klp-dev
...
* commit 'c3371eb5d4bde6dc11499efb313f7529a6bf6d59':
Show hideycling for non-primary users.
2014-03-04 19:19:10 +00:00
John Spurlock
b85214bcc3
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.
2014-03-04 19:19:04 +00:00
John Spurlock
c6ecac77cf
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.
2014-03-04 19:15:56 +00:00
John Spurlock
c3371eb5d4
am 49eac16e: am 8ec59a72: Merge "Show hideycling for non-primary users." into klp-dev
...
* commit '49eac16ec00ea63feaafc137a1d313fcb4374b36':
Show hideycling for non-primary users.
2014-03-04 19:15:53 +00:00
John Spurlock
0a3bc3c4d2
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.
2014-03-04 19:15:49 +00:00