Commit Graph

236136 Commits

Author SHA1 Message Date
John Reck
0bb8d5f95c Merge "Disable HWUI_NEW_OPS" into nyc-dev am: 4dfd6c0abc
am: af367e47f5

* commit 'af367e47f56da35f498a5fb6c7eaef6d8589ba97':
  Disable HWUI_NEW_OPS
2016-02-26 00:04:45 +00:00
Phil Weaver
b397de9c25 Merge "Accessibility to toggle multiwindow mode" into nyc-dev am: 8ca583b29f
am: c6677b2d16

* commit 'c6677b2d16ea1c4d6cb704b03fc7f37ba5fa8fd8':
  Accessibility to toggle multiwindow mode
2016-02-26 00:03:16 +00:00
Adam Lesinski
1434e8ce6c Merge "Revert "AAPT: Allow duplicate attribute definitions if identical"" into nyc-dev am: 913a2fdb06
am: b0767441fc

* commit 'b0767441fcb0ea48f43a3c6a74b814272e0864a5':
  Revert "AAPT: Allow duplicate attribute definitions if identical"
2016-02-26 00:01:50 +00:00
Jaewan Kim
86c5547d59 resolve merge conflicts of 8f1df67c9f to master
Change-Id: I04f1c77a0879fe12594c31ecac19938a5972101d
2016-02-26 08:48:59 +09:00
John Reck
af367e47f5 Merge "Disable HWUI_NEW_OPS" into nyc-dev
am: 4dfd6c0abc

* commit '4dfd6c0abc67e9a367513727ecdda0dbb78acbd8':
  Disable HWUI_NEW_OPS
2016-02-25 23:30:59 +00:00
John Reck
4dfd6c0abc Merge "Disable HWUI_NEW_OPS" into nyc-dev 2016-02-25 23:28:38 +00:00
Phil Weaver
c6677b2d16 Merge "Accessibility to toggle multiwindow mode" into nyc-dev
am: 8ca583b29f

* commit '8ca583b29f7a06dcd2ccb2da7c4273d4db8bf7fd':
  Accessibility to toggle multiwindow mode
2016-02-25 23:23:37 +00:00
Adam Lesinski
b0767441fc Merge "Revert "AAPT: Allow duplicate attribute definitions if identical"" into nyc-dev
am: 913a2fdb06

* commit '913a2fdb064c479dd5d7c4e47a0844bdd5895414':
  Revert "AAPT: Allow duplicate attribute definitions if identical"
2016-02-25 23:19:22 +00:00
Phil Weaver
8ca583b29f Merge "Accessibility to toggle multiwindow mode" into nyc-dev 2016-02-25 23:16:52 +00:00
Jaewan Kim
8f1df67c9f Merge "PIP: Apply the latest UI spec for onboarding activity" into nyc-dev
am: 91b440aaea

* commit '91b440aaea97a61b277bfa6466edf3644e451aa0':
  PIP: Apply the latest UI spec for onboarding activity
2016-02-25 23:15:18 +00:00
Adam Lesinski
913a2fdb06 Merge "Revert "AAPT: Allow duplicate attribute definitions if identical"" into nyc-dev 2016-02-25 23:13:24 +00:00
Phil Weaver
315c34e7d6 Accessibility to toggle multiwindow mode
Encapsulating the logic to toggle multiwindow mode from recents,
and plumbing it through to accessibility global actions. Sending
accessibility events when windows bounds change. Exposing the
dock divider window type to accessibility services.

Bug: 27250995
Change-Id: Ib7491f1f853dc7f01bf5c5a4ac1f914f55d0608a
2016-02-25 15:13:11 -08:00
Adam Lesinski
525db2489d Revert "AAPT: Allow duplicate attribute definitions if identical"
This reverts commit c25283b5e2.

Change-Id: I2f42a4360fa53c4333494afe0178dcec56d62d8e
2016-02-25 23:13:08 +00:00
Jaewan Kim
91b440aaea Merge "PIP: Apply the latest UI spec for onboarding activity" into nyc-dev 2016-02-25 23:11:51 +00:00
Jaewan Kim
edd02dc159 PIP: Apply the latest UI spec for onboarding activity
Bug: 27273286
Change-Id: I57b3050e1f07ffbcee66e30404578937f65c3189
2016-02-25 15:06:40 -08:00
John Reck
0bed032eb2 Disable HWUI_NEW_OPS
Bug: 27365711

Change-Id: Ife7ecc7c688738df4028f30847a2ff914e433b99
2016-02-25 15:03:48 -08:00
Joshua Schwarz
d900a37dad Merge "Add Google Now intent so that it is discoverable to AppLaunch metrics." into cw-e-dev am: dcd0b05dc3 am: e73af21807 am: d456303a17
am: dcb3ec7716

* commit 'dcb3ec7716095c7e4af4fca2b64b43b7a2db177a':
  Add Google Now intent so that it is discoverable to AppLaunch metrics.
2016-02-25 23:03:02 +00:00
Hyungtae Tim Kim
0949708248 Merge "UiBench adapted for TV" into nyc-dev am: e811ebda31
am: fbaef6747c

* commit 'fbaef6747c7557e84fac20325c1087888437f082':
  UiBench adapted for TV
2016-02-25 22:57:30 +00:00
Joshua Schwarz
dcb3ec7716 Merge "Add Google Now intent so that it is discoverable to AppLaunch metrics." into cw-e-dev am: dcd0b05dc3 am: e73af21807
am: d456303a17

* commit 'd456303a179b89cd3b7ac33754b34b5bba6cb87a':
  Add Google Now intent so that it is discoverable to AppLaunch metrics.
2016-02-25 22:55:35 +00:00
Hyungtae Tim Kim
fbaef6747c Merge "UiBench adapted for TV" into nyc-dev
am: e811ebda31

* commit 'e811ebda31074716dee58ad112acfb6d8549b1d8':
  UiBench adapted for TV
2016-02-25 22:53:36 +00:00
Joshua Schwarz
d456303a17 Merge "Add Google Now intent so that it is discoverable to AppLaunch metrics." into cw-e-dev am: dcd0b05dc3
am: e73af21807

* commit 'e73af21807706c12245d4a2c081b06a1a66ea88d':
  Add Google Now intent so that it is discoverable to AppLaunch metrics.
2016-02-25 22:51:54 +00:00
Hyungtae Kim
e811ebda31 Merge "UiBench adapted for TV" into nyc-dev 2016-02-25 22:49:26 +00:00
Joshua Schwarz
e73af21807 Merge "Add Google Now intent so that it is discoverable to AppLaunch metrics." into cw-e-dev
am: dcd0b05dc3

* commit 'dcd0b05dc35fb058f89a16d370bb7965b339c1c5':
  Add Google Now intent so that it is discoverable to AppLaunch metrics.
2016-02-25 22:48:02 +00:00
Joshua Schwarz
dcd0b05dc3 Merge "Add Google Now intent so that it is discoverable to AppLaunch metrics." into cw-e-dev 2016-02-25 22:45:22 +00:00
Felipe Leme
19108d3ab8 Merge "Removed toast messsage sent after screenshot is taken." into nyc-dev am: 8c0412c8d3
am: 0d243005d3

* commit '0d243005d3d43619f2e65355714497b7ff34aaae':
  Removed toast messsage sent after screenshot is taken.
2016-02-25 22:33:53 +00:00
Winson
6e92230a6c Merge changes I4d542a09,Icd792ed4,I020dcbac into nyc-dev am: fcd6e7cb72
am: c6b6f2e694

* commit 'c6b6f2e694d6647103ed6210edc4d288a1a1a9d0':
  Removing boot completed check before hiding Recents.
  Track double taps to launch the previous task.
  Dev preview changes for incompatible apps.
2016-02-25 22:32:30 +00:00
Felipe Leme
0d243005d3 Merge "Removed toast messsage sent after screenshot is taken." into nyc-dev
am: 8c0412c8d3

* commit '8c0412c8d3b033f84f7ec8fbd9e3b96899543a40':
  Removed toast messsage sent after screenshot is taken.
2016-02-25 22:27:53 +00:00
Alan Viverette
e47aa888a9 Merge "Revert "Fix exit transition and dismiss callback for popup exit transition"" into nyc-dev am: 9cae665410
am: 0fe51a4d4e

* commit '0fe51a4d4e232206ff9f1ae65b8e3c277ad06b93':
  Revert "Fix exit transition and dismiss callback for popup exit transition"
2016-02-25 22:27:25 +00:00
Winson
c6b6f2e694 Merge changes I4d542a09,Icd792ed4,I020dcbac into nyc-dev
am: fcd6e7cb72

* commit 'fcd6e7cb72b57c439550092ca3cfa2900289bb47':
  Removing boot completed check before hiding Recents.
  Track double taps to launch the previous task.
  Dev preview changes for incompatible apps.
2016-02-25 22:25:13 +00:00
Alan Viverette
0fe51a4d4e Merge "Revert "Fix exit transition and dismiss callback for popup exit transition"" into nyc-dev
am: 9cae665410

* commit '9cae665410e339b19633645a67c353fe4b10a559':
  Revert "Fix exit transition and dismiss callback for popup exit transition"
2016-02-25 22:23:20 +00:00
Felipe Leme
8c0412c8d3 Merge "Removed toast messsage sent after screenshot is taken." into nyc-dev 2016-02-25 22:20:30 +00:00
Winson Chung
fcd6e7cb72 Merge changes I4d542a09,Icd792ed4,I020dcbac into nyc-dev
* changes:
  Removing boot completed check before hiding Recents.
  Track double taps to launch the previous task.
  Dev preview changes for incompatible apps.
2016-02-25 22:19:32 +00:00
Winson
2799eca217 Removing boot completed check before hiding Recents.
- This was legacy from old code that was calling sendBroadcast(), and 
  with the event bus, we no longer need to wait until boot is completed
  before launching home.

Bug: 26616934
Change-Id: I4d542a096174ac8b69035836e9311cbf8340b15b
2016-02-25 14:17:16 -08:00
Alan Viverette
9cae665410 Merge "Revert "Fix exit transition and dismiss callback for popup exit transition"" into nyc-dev 2016-02-25 22:17:12 +00:00
Winson
d93429076c Track double taps to launch the previous task.
Change-Id: Icd792ed4f508f8a8540a5cd2d12c3bdfd5827410
2016-02-25 14:17:05 -08:00
Winson
931845fcb3 Dev preview changes for incompatible apps.
- Disable drop targets when picking up a task that can’t be docked, and
  show toast notifying user (for now)
- When a task is docked, update the task headers for non-dockable tasks
  to indicate that they don’t support multi window.  Update these 
  headers every time the multi window state changes.

Bug: 26774190
Change-Id: I020dcbac9b1230dba166eecaa12366986e684f9e
2016-02-25 14:16:23 -08:00
Jaewan Kim
c8e76500a8 Merge "PIP: Apply the latest UI spec for PIP menu" into nyc-dev am: 0d2d1f7b6f
am: f54fbe45ef

* commit 'f54fbe45efcc286e6e1b9c05d8be7cdf2dbf5e6a':
  PIP: Apply the latest UI spec for PIP menu
2016-02-25 21:57:47 +00:00
Alan Viverette
7970894a9c Revert "Fix exit transition and dismiss callback for popup exit transition"
This reverts most of commit 21d361806c, which
broke too many expectations in both apps and framework widgets. We need to
find a safer way to handle the exit transition callback.

Bug: 27359366
Bug: 27353218
Change-Id: I769ac7a25cb900c50e857839ca0563fbc5a3cb16
2016-02-25 16:57:08 -05:00
Jaewan Kim
f54fbe45ef Merge "PIP: Apply the latest UI spec for PIP menu" into nyc-dev
am: 0d2d1f7b6f

* commit '0d2d1f7b6f26e2fbd92dbffaa0047267cbd92705':
  PIP: Apply the latest UI spec for PIP menu
2016-02-25 21:53:39 +00:00
Jaewan Kim
0d2d1f7b6f Merge "PIP: Apply the latest UI spec for PIP menu" into nyc-dev 2016-02-25 21:50:48 +00:00
Jason Monk
fd91a163a2 Make sure QS tile layouts don\'t have overlapping rendering am: c5bdafb776
am: 49919514ad

* commit '49919514ad9885886ef835e499397efb67f8e973':
  Make sure QS tile layouts don't have overlapping rendering
2016-02-25 21:46:15 +00:00
Sid Soundararajan
5be795e585 Merge "Add Launch Task Animation, re-do values for red-lines." 2016-02-25 21:42:23 +00:00
Simranjit Kohli
1927004aac Merge "Revert "[Fix extra data in cache]"" into nyc-dev am: 236fcafab5
am: e528d2982b

* commit 'e528d2982b13f64942ce5d374dc956316a361b3a':
  Revert "[Fix extra data in cache]"
2016-02-25 21:39:29 +00:00
Jason Monk
49919514ad Make sure QS tile layouts don\'t have overlapping rendering
am: c5bdafb776

* commit 'c5bdafb776ae8111da9da8f2b619181e136f1419':
  Make sure QS tile layouts don't have overlapping rendering
2016-02-25 21:37:36 +00:00
Jason Monk
c5bdafb776 Make sure QS tile layouts don't have overlapping rendering
Bug: 27361901
Change-Id: I177bbf8c0d13b0e9595d9b95c87eb01df1bc7d05
2016-02-25 21:34:46 +00:00
Simranjit Kohli
e528d2982b Merge "Revert "[Fix extra data in cache]"" into nyc-dev
am: 236fcafab5

* commit '236fcafab5cceb5c9ae708d4198838021035e2be':
  Revert "[Fix extra data in cache]"
2016-02-25 21:33:56 +00:00
Simranjit Kohli
236fcafab5 Merge "Revert "[Fix extra data in cache]"" into nyc-dev 2016-02-25 21:28:32 +00:00
Jason Monk
4bea070751 Merge "Fix QS Issues" into nyc-dev am: 493497178a
am: f92908975b

* commit 'f92908975baa8217b71e1f869a39a12c82396ee3':
  Fix QS Issues
2016-02-25 21:22:46 +00:00
Ben Kwa
d302b137f9 Merge "Return true when keystrokes are handled in BaseKeyListener." into nyc-dev am: 2cecbb2408
am: bce4fe1bdd

* commit 'bce4fe1bdd2e6247bc8355041f5f63de4b4ff708':
  Return true when keystrokes are handled in BaseKeyListener.
2016-02-25 21:21:31 +00:00
Simranjit Kohli
27d0e1fd66 Revert "[Fix extra data in cache]"
This reverts commit a666d74d4b.

Bug: 27314050
Change-Id: I1562c51751f983a49a11e1d37d936974e17388ef
2016-02-25 13:20:16 -08:00