Wale Ogunwale
e87b575046
Merge "Dismiss docked stack if an activity is shown on top of the lock screen" into nyc-dev am: 5d6a218d9e am: d9125edb98
...
am: 94d93dd38f
* commit '94d93dd38fbab0ff8f9a9ce397a522cf2fcd6429':
Dismiss docked stack if an activity is shown on top of the lock screen
Change-Id: Iaaf1dc4cd6f4008bf4bc571bb70365d431ea30ed
2016-05-06 18:54:56 +00:00
Wale Ogunwale
94d93dd38f
Merge "Dismiss docked stack if an activity is shown on top of the lock screen" into nyc-dev am: 5d6a218d9e
...
am: d9125edb98
* commit 'd9125edb98034562b5269a7cd97cc6bcac7a3238':
Dismiss docked stack if an activity is shown on top of the lock screen
Change-Id: I0b0130142296468e43fdb106d214f43a8fc500e5
2016-05-06 18:47:17 +00:00
Wale Ogunwale
d9125edb98
Merge "Dismiss docked stack if an activity is shown on top of the lock screen" into nyc-dev
...
am: 5d6a218d9e
* commit '5d6a218d9e0d21367f6365d4de51532ca7e14dc9':
Dismiss docked stack if an activity is shown on top of the lock screen
Change-Id: I4bf1ef48aef928e12d7dbb9faa6c4e0d489acadb
2016-05-06 18:42:09 +00:00
TreeHugger Robot
5d6a218d9e
Merge "Dismiss docked stack if an activity is shown on top of the lock screen" into nyc-dev
2016-05-06 18:30:23 +00:00
Jorim Jaggi
1f1746e1c5
Merge "Also notify divider when getting DockedTopTaskEvent am: 3273f31c40 am: 878dfb2dea" into nyc-mr1-dev-plus-aosp
...
am: 8dbee5f00a
* commit '8dbee5f00a245125082534da74a7309ddd5e7a2f':
Also notify divider when getting DockedTopTaskEvent
Change-Id: Ia6113d69a8faee79cc854ac1578efcf6bfb195ef
2016-05-06 17:41:47 +00:00
Jorim Jaggi
4738f64c24
Also notify divider when getting DockedTopTaskEvent am: 3273f31c40
...
am: 878dfb2dea
* commit '878dfb2dea14e311556ef95ccb2914d1106c0449':
Also notify divider when getting DockedTopTaskEvent
Change-Id: I4208e8a225dede122f546c0d06d973d50463ae56
2016-05-06 17:33:54 +00:00
Jorim Jaggi
5f95504247
Also notify divider when getting DockedTopTaskEvent
...
am: 3273f31c40
* commit '3273f31c40ce36010df9c6aa9324102bab9a2464':
Also notify divider when getting DockedTopTaskEvent
Change-Id: Ia6aadbcfbc9f1f7b6d26d328f25fe324c0a52d3f
2016-05-06 17:30:52 +00:00
Jorim Jaggi
878dfb2dea
Also notify divider when getting DockedTopTaskEvent
...
am: 3273f31c40
* commit '3273f31c40ce36010df9c6aa9324102bab9a2464':
Also notify divider when getting DockedTopTaskEvent
Change-Id: I48c31e355586c6698523dd4748371bfaa5ab6945
2016-05-06 17:30:47 +00:00
Bill Yi
c02ce275c6
Merge "Import translations. DO NOT MERGE"
2016-05-06 17:30:14 +00:00
Jorim Jaggi
3273f31c40
Also notify divider when getting DockedTopTaskEvent
...
Under some circumstances we never go through the activity lifecycle
if we call startActivity before it gets stopped, so we never notified
the divider about that we have drawn.
Bug: 28531536
Change-Id: I6a13527d52bf40a87f89de4b2799bd0833c6612a
2016-05-06 17:20:59 +00:00
Wale Ogunwale
9973294080
Dismiss docked stack if an activity is shown on top of the lock screen
...
It is risky/complicated to try to put the activity showing on-top of
the lock screen in the right fullscreen configuration with the current
architecture. So, we just dismiss for now.
Bug: 28195260
Change-Id: I29a0350993ce8fe548d4a465b06d877cde151c78
2016-05-06 10:13:14 -07:00
Julia Reynolds
594c3f02c5
Merge "Quicksettings accessibility." into nyc-dev am: 450f91b529 am: 7af7a4f9af
...
am: 4a0238aca9
* commit '4a0238aca9c6a5c9bed79616c00442a12dffbe21':
Quicksettings accessibility.
Change-Id: Idfe3e7ae60ab5a773741122102c9b8dd93199ebb
2016-05-06 15:58:14 +00:00
Julia Reynolds
4a0238aca9
Merge "Quicksettings accessibility." into nyc-dev am: 450f91b529
...
am: 7af7a4f9af
* commit '7af7a4f9af1e90d13b759e187f6f21dafd69ea89':
Quicksettings accessibility.
Change-Id: I3ccb82824a3979eb9043b1b37bcbf63d89c0e11f
2016-05-06 15:53:15 +00:00
Julia Reynolds
7af7a4f9af
Merge "Quicksettings accessibility." into nyc-dev
...
am: 450f91b529
* commit '450f91b52938de2a6cb9053b13b03ae75edd6be0':
Quicksettings accessibility.
Change-Id: I4928114e32cde07c62d371e3d957e23a35e8bc37
2016-05-06 15:48:39 +00:00
Julia Reynolds
39bc1f8728
Merge "Quicksettings accessibility." into nyc-dev
...
am: 450f91b529
* commit '450f91b52938de2a6cb9053b13b03ae75edd6be0':
Quicksettings accessibility.
Change-Id: I0c3f246894739defc09f3e309f97ff8ccf4719c1
2016-05-06 15:48:36 +00:00
Julia Reynolds
20aef8a291
Quicksettings accessibility.
...
Bug: 15696340
Change-Id: I6887e2dad4822911d3a1642aaec5703174b57330
2016-05-06 10:24:38 -04:00
TreeHugger Robot
0be9aefcf2
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-05-06 14:12:05 +00:00
Bill Yi
7c6fa063e1
Import translations. DO NOT MERGE
...
Change-Id: I13bd96983d273f4a65e270689b83e5214ef0b25e
Auto-generated-cl: translation import
2016-05-06 03:59:05 -07:00
Bill Yi
a5719af039
Import translations. DO NOT MERGE
...
Change-Id: I33c5a849763e5f3c3000645e56c9399aefae131e
Auto-generated-cl: translation import
2016-05-06 02:19:44 -07:00
Winson
c8a13c4bbb
Fix edge case crash with invalid bitmap dimensions. am: f9e79e0499 am: 948c3638a8
...
am: ec78e7db90
* commit 'ec78e7db903e28fe442f70f5f9c1c5726a688115':
Fix edge case crash with invalid bitmap dimensions.
Change-Id: Iccdb3ce3c78cc013fe71d6f9a0a526cb191947e2
2016-05-06 00:55:51 +00:00
Winson
ec78e7db90
Fix edge case crash with invalid bitmap dimensions. am: f9e79e0499
...
am: 948c3638a8
* commit '948c3638a8981d3958b7eb500e128011005fd5e3':
Fix edge case crash with invalid bitmap dimensions.
Change-Id: I5e88a94f9f8a3e0799046a5e2ce3ed06850455a9
2016-05-06 00:51:15 +00:00
Winson
616a2a158a
Fix edge case crash with invalid bitmap dimensions.
...
am: f9e79e0499
* commit 'f9e79e0499a114b184e0d0f4dbd45b3d690a4657':
Fix edge case crash with invalid bitmap dimensions.
Change-Id: Id8464d81b228ff917226a7088ab9199b885c32c2
2016-05-06 00:46:44 +00:00
Winson
948c3638a8
Fix edge case crash with invalid bitmap dimensions.
...
am: f9e79e0499
* commit 'f9e79e0499a114b184e0d0f4dbd45b3d690a4657':
Fix edge case crash with invalid bitmap dimensions.
Change-Id: Icbf146700a3d2cbea268eb3dbe4f2998099d05d5
2016-05-06 00:46:38 +00:00
Winson
f9e79e0499
Fix edge case crash with invalid bitmap dimensions.
...
- In these cases, skip returning an animation spec for that task
Bug: 28235453
Change-Id: I611dc4390c0cbd2ca5f16112e4784848b2d6896f
2016-05-06 00:35:10 +00:00
Rakesh Iyer
2aba62fd76
Merge "Delay the launch of the persistent task."
2016-05-06 00:14:40 +00:00
Rakesh Iyer
02ee885a3b
Delay the launch of the persistent task.
...
Looking at ActivityStarter, it seems like there is code to show
recents if the docked application is started from the home stack
and that ends up looking janky for us because we immediately switch
to the application we want to launch.
To avoid this, we defer the call to launch the docked stack until
after we get notified of a task launch on the fullscreen application
stack and avoid showing recents.
Change-Id: I92ba8aca3c29112f8c9520145aa00f6b58a1d31c
2016-05-05 16:06:59 -07:00
Evan Rosky
80ff968d3b
Merge "Get lockscreen wallpaper even for current user"
2016-05-05 22:18:12 +00:00
Evan Rosky
fa50e64e59
Merge "Changing locals to protected for subclasses"
2016-05-05 22:18:12 +00:00
Evan Rosky
1d2d2d1bf0
Merge "Enhance subclassing support in ScrimController."
2016-05-05 22:18:12 +00:00
TreeHugger Robot
19f981e2e1
Merge "sysui: refactor for extensibility."
2016-05-05 21:20:13 +00:00
Evan Rosky
4324f9f247
Get lockscreen wallpaper even for current user
...
Bug: 25184308
Change-Id: Id8093eccc82ffa9953eebd3c26fd6861a3749a80
(cherry picked from commit 39704ef5e412b031a7b99c1696f5544f0e4f4e7e)
2016-05-05 21:04:46 +00:00
Evan Rosky
216049c911
Changing locals to protected for subclasses
...
Bug: 25184308
Change-Id: Iaa7e3f8d2726409036b5909f10717ae1a22a940d
(cherry picked from commit 3068734156edff8fd23695b65237a6ec2ba334be)
2016-05-05 20:59:33 +00:00
Evan Rosky
9a895014d2
Enhance subclassing support in ScrimController.
...
Bug: 25184308
Change-Id: I6d6a24669c3c9dd676fcaed0082302f2d99a3747
(cherry picked from commit 5f0a36fbfcfe2b58fe91c673db149a45a51f3ed9)
2016-05-05 20:53:44 +00:00
Jason Monk
4c4d29db9a
Merge "QS Edit: fix some move logic" into nyc-dev am: 8e788d015c am: 97b48fdc6b
...
am: 4d9d60b418
* commit '4d9d60b41844df6658d97601a36d58d2b759f1bf':
QS Edit: fix some move logic
Change-Id: Idda2e1c4282d0902776248125b31d7fe7da6798d
2016-05-05 20:10:51 +00:00
Jason Monk
4d9d60b418
Merge "QS Edit: fix some move logic" into nyc-dev am: 8e788d015c
...
am: 97b48fdc6b
* commit '97b48fdc6b225c70f91720568dd163808a9ffb5d':
QS Edit: fix some move logic
Change-Id: Idfd4cf66d9c0c06aafb22fab7917f50c8e5e4567
2016-05-05 20:06:11 +00:00
Jason Monk
53f44f5665
Merge "QS Edit: fix some move logic" into nyc-dev
...
am: 8e788d015c
* commit '8e788d015cdb23077a9778e812f7de35819f8ed5':
QS Edit: fix some move logic
Change-Id: Ib8e92cbbaad46d9d4b97cdad29da9ded94adf1c4
2016-05-05 20:02:00 +00:00
Jason Monk
97b48fdc6b
Merge "QS Edit: fix some move logic" into nyc-dev
...
am: 8e788d015c
* commit '8e788d015cdb23077a9778e812f7de35819f8ed5':
QS Edit: fix some move logic
Change-Id: Ie32e34379d6bd2764ad523dab8bc6d25a251e670
2016-05-05 20:01:56 +00:00
Jason Monk
8e788d015c
Merge "QS Edit: fix some move logic" into nyc-dev
2016-05-05 19:51:55 +00:00
TreeHugger Robot
2524e16578
Merge "Let the framework position a window when switching to freeform"
2016-05-05 19:34:07 +00:00
Muyuan Li
0e9f538480
sysui: refactor for extensibility.
...
Extended QSDetail / QSTile to control the behavior with
header / footer.
Bug: 28169547
Change-Id: Ice7d5fc16a0e9080a5c842295abe87bc1e2d71be
(cherry picked from commit dbdcb44b7fa49931fc506535a4cc02c20085bca5)
2016-05-05 19:11:49 +00:00
Toni Barzic
fc3da60a2e
Merge "Handle PhoneStatusBarPolicy user switch callbacks on main thread"
2016-05-05 18:15:38 +00:00
Vladislav Kaznacheev
1f6b709ca6
Let the framework position a window when switching to freeform
...
When "freeform" button is tapped, the current Recents implementation
puts the window into the left top corner, and sets window size
to the size of the window snapshot as it is displayed in Recents. This
is confusing.
This patch lets the ActivityManager decide on the window bounds.
The first "freeformed" window is put at the center, and subsequent
windows are nicely cascaded.
Bug: 28316396
Bug: 28312983
Change-Id: I3e305df3ab1e1f715e1f4f94e0ed2a8a1bbd2f22
2016-05-05 11:09:43 -07:00
Jason Monk
a8f07d916d
QS Edit: fix some move logic
...
Make sure its possible to add tiles when none are there and remove
tiles when all are added.
Bug: 28067638
Change-Id: Ia5a145f095cd33cf8d4a85a0a8aabb2344e3dec6
2016-05-05 13:11:36 -04:00
Xiaohui Chen
96921b66db
sysui: fix notification background position
...
Bug: 28552487
Change-Id: Ie85c8fec7e2ff0160e77da778c5d0c2da2fc383b
(cherry picked from commit 806d3ee9138633df58c712cfb6b302bddd79b337)
2016-05-05 16:11:06 +00:00
Jason Monk
4a9f89ee22
Merge "Merge "Fix QS crash with RTL rotate" into nyc-dev am: 4a19a2043c am: 705e67b3f8" into nyc-mr1-dev-plus-aosp
...
am: 6b8c4bbb35
* commit '6b8c4bbb350163883007005bfe680a4e5c97e400':
Fix QS crash with RTL rotate
Change-Id: Iaf8f2661ce8aa4da2d9dd154ab3b81bf27caeca5
2016-05-05 16:04:36 +00:00
Jason Monk
75023fec4e
Merge "Merge "Fix QS edit accessibility" into nyc-dev am: c665a3d4e9 am: 09ed0764ed" into nyc-mr1-dev-plus-aosp
...
am: 43c4fd65ae
* commit '43c4fd65ae24f769546ad780072a59c80d34a2d9':
Fix QS edit accessibility
Change-Id: I138b20594bc1c77700e2f5b5bcf948cf23a400cc
2016-05-05 15:57:19 +00:00
Jason Monk
2325f67373
Merge "Merge "QS Edit: announce exit/entrance" into nyc-dev am: d27ed8b336 am: 8717808f0c" into nyc-mr1-dev-plus-aosp
...
am: a907cab739
* commit 'a907cab7394740795a3ee42b1dfd5befa7428cdf':
QS Edit: announce exit/entrance
Change-Id: Iebf7ac6efb7d9c5a6fba144f468cab5629080fae
2016-05-05 15:56:52 +00:00
Jason Monk
3d3994bffd
Merge "Fix QS header settings + user visibilities" into nyc-dev am: 3f50a94e6c am: 27461881b8
...
am: 1166c9d8f5
* commit '1166c9d8f508cf06d62c4cee0ec640db6972e1c6':
Fix QS header settings + user visibilities
Change-Id: I1e2fdeafba75505b9019391c2042a2dc4466daa0
2016-05-05 15:56:29 +00:00
Jason Monk
711162622d
Merge "Fix QS crash with RTL rotate" into nyc-dev am: 4a19a2043c
...
am: 705e67b3f8
* commit '705e67b3f8d4831321076ab5fc7f109c91afc6d3':
Fix QS crash with RTL rotate
Change-Id: I56a0e70ef8bf3aefde422ce4c0d71769940a3430
2016-05-05 15:54:19 +00:00
Jason Monk
09df93ed62
Merge "Fix QS edit accessibility" into nyc-dev am: c665a3d4e9
...
am: 09ed0764ed
* commit '09ed0764ed7ddbd642d8227bb2ce9131fd38eb1b':
Fix QS edit accessibility
Change-Id: I70c0e11013655ae9b997368deba2e435ce200dac
2016-05-05 15:51:17 +00:00