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
TreeHugger Robot
450f91b529
Merge "Quicksettings accessibility." into nyc-dev
2016-05-06 15:40:01 +00:00
Steve McKay
ea9092fdbf
Merge "Fix regression, show internal storage option..." into nyc-dev am: 9a76143ef5 am: 20898f682b
...
am: 5fa1f50f01
* commit '5fa1f50f0179313d32ec59d7949884be6801b17d':
Fix regression, show internal storage option...
Change-Id: I8f21a54839c594f16c3e4cec58f3de7e0881b852
2016-05-06 15:29:34 +00:00
Steve McKay
5fa1f50f01
Merge "Fix regression, show internal storage option..." into nyc-dev am: 9a76143ef5
...
am: 20898f682b
* commit '20898f682b749919c49e8ddb91be40aaa7d2259a':
Fix regression, show internal storage option...
Change-Id: I3e4a45cb65085a5539cadfdb070e013ae9e1f044
2016-05-06 15:24:15 +00:00
Steve McKay
77b964ce7f
Merge "Fix regression, show internal storage option..." into nyc-dev
...
am: 9a76143ef5
* commit '9a76143ef550a547aefed81acbad5d380cc33393':
Fix regression, show internal storage option...
Change-Id: Iccbaa87826350a9ac10a0b852dc793bc222f20de
2016-05-06 15:19:07 +00:00
Steve McKay
20898f682b
Merge "Fix regression, show internal storage option..." into nyc-dev
...
am: 9a76143ef5
* commit '9a76143ef550a547aefed81acbad5d380cc33393':
Fix regression, show internal storage option...
Change-Id: I70003518063b682b15b50bc075a923ae96815af2
2016-05-06 15:19:05 +00:00
Steve McKay
9a76143ef5
Merge "Fix regression, show internal storage option..." into nyc-dev
2016-05-06 15:07:50 +00:00
Julia Reynolds
20aef8a291
Quicksettings accessibility.
...
Bug: 15696340
Change-Id: I6887e2dad4822911d3a1642aaec5703174b57330
2016-05-06 10:24:38 -04:00
TreeHugger Robot
5cac6414d0
Merge "Import translations. DO NOT MERGE"
2016-05-06 14:17:03 +00:00
TreeHugger Robot
3891e8aeb4
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-05-06 14:15:31 +00:00
TreeHugger Robot
b8dd0c3786
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-05-06 14:15:15 +00: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
Bill Yi
32ef6fac2f
Import translations. DO NOT MERGE
...
Change-Id: I1d4745156fb9ddbff3d6af4564fa0a1754e1a384
Auto-generated-cl: translation import
2016-05-05 21:30:57 -07:00
Bill Yi
3b4672d8ae
Import translations. DO NOT MERGE
...
Change-Id: I15055663e1705ae0e64ca3f4242bbad3748461e4
Auto-generated-cl: translation import
2016-05-05 21:28:01 -07:00
Bill Yi
7202472fd4
Import translations. DO NOT MERGE
...
Change-Id: If86ccee44cc4dffa5624abb081b6da94e0234071
Auto-generated-cl: translation import
2016-05-05 20:26:14 -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
Steve McKay
5acf1ac2ab
Fix regression, show internal storage option...
...
...for non "Downloads" scenarios like "Copy to".
Bug: 28552420
Change-Id: If317e3f575a40cac69628c1b6eecfc6be1dfcbce
2016-05-05 14:38:55 -07: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