Commit Graph

56205 Commits

Author SHA1 Message Date
Alexandre Elias
f2a5537477 Merge "Add some View methods overrides and WebViewDelegate interfaces." 2016-02-25 19:58:12 +00:00
Sunny Goyal
c0f8f13c24 Merge "Fixing the parent check loop to allow RemoteViewsFrameLayout" into nyc-dev am: c1a3181d8d
am: 645ffa05f0

* commit '645ffa05f09870db14bb0332de04fcbc324e1752':
  Fixing the parent check loop to allow RemoteViewsFrameLayout
2016-02-25 18:16:36 +00:00
Sunny Goyal
645ffa05f0 Merge "Fixing the parent check loop to allow RemoteViewsFrameLayout" into nyc-dev
am: c1a3181d8d

* commit 'c1a3181d8db25e36b4303822e429b2839468e259':
  Fixing the parent check loop to allow RemoteViewsFrameLayout
2016-02-25 18:14:15 +00:00
Sunny Goyal
c1a3181d8d Merge "Fixing the parent check loop to allow RemoteViewsFrameLayout" into nyc-dev 2016-02-25 18:10:38 +00:00
Alan Viverette
069b12af15 Merge "Use correct index when obtaining unresolved attribute value" into nyc-dev am: 4d85985f80
am: 60d3b019eb

* commit '60d3b019ebaa741bb1ab7cc01ce01217b5ae6ac1':
  Use correct index when obtaining unresolved attribute value
2016-02-25 17:38:27 +00:00
Alan Viverette
60d3b019eb Merge "Use correct index when obtaining unresolved attribute value" into nyc-dev
am: 4d85985f80

* commit '4d85985f80c114456ec47d3cce75ac0b4c2bdb5a':
  Use correct index when obtaining unresolved attribute value
2016-02-25 17:34:00 +00:00
Alan Viverette
4d85985f80 Merge "Use correct index when obtaining unresolved attribute value" into nyc-dev 2016-02-25 17:25:39 +00:00
Sunny Goyal
b880d167a6 Fixing the parent check loop to allow RemoteViewsFrameLayout
Bug: 27328093
Change-Id: I0f6ae8e95f952d40589eafb912ba188d15d7624c
2016-02-25 09:07:37 -08:00
Seigo Nonaka
da0be6e7a3 Merge "Show selection handles at the correct position for view transformation" into nyc-dev am: 6d2b3ac67c
am: 31493584b6

* commit '31493584b6d487c64dba0b24ff42b46e4202414a':
  Show selection handles at the correct position for view transformation
2016-02-25 07:09:44 +00:00
Winson Chung
923ddb7527 Merge changes Ib309e9de,Ia7cf8b99,I055b0825,Ie2ea4318,If92221d3 into nyc-dev am: e1c4641d6f
am: 27f2698fa4

* commit '27f2698fa46f77955d2dbe5d905796d0139b9edd':
  Fixing crash when focusing tasks.
  Minor tweaks to layout and visuals.
  Improving transition from paging to stack.
  Fixing issue with persistent screenshot notification
  Updating task description when activity is visible.
2016-02-25 07:07:19 +00:00
Seigo Nonaka
31493584b6 Merge "Show selection handles at the correct position for view transformation" into nyc-dev
am: 6d2b3ac67c

* commit '6d2b3ac67c9d308da89fd98ef50dd9f47f8b29bd':
  Show selection handles at the correct position for view transformation
2016-02-25 06:02:40 +00:00
Seigo Nonaka
6d2b3ac67c Merge "Show selection handles at the correct position for view transformation" into nyc-dev 2016-02-25 05:59:19 +00:00
Winson Chung
27f2698fa4 Merge changes Ib309e9de,Ia7cf8b99,I055b0825,Ie2ea4318,If92221d3 into nyc-dev
am: e1c4641d6f

* commit 'e1c4641d6f7d234a912284254f67c0122d7eca5b':
  Fixing crash when focusing tasks.
  Minor tweaks to layout and visuals.
  Improving transition from paging to stack.
  Fixing issue with persistent screenshot notification
  Updating task description when activity is visible.
2016-02-25 03:17:24 +00:00
Winson Chung
e1c4641d6f Merge changes Ib309e9de,Ia7cf8b99,I055b0825,Ie2ea4318,If92221d3 into nyc-dev
* changes:
  Fixing crash when focusing tasks.
  Minor tweaks to layout and visuals.
  Improving transition from paging to stack.
  Fixing issue with persistent screenshot notification
  Updating task description when activity is visible.
2016-02-25 03:15:25 +00:00
Jorim Jaggi
77bd7f0d6c Merge "Use actual window size for layout" into nyc-dev am: 5a5057a78b
am: c9e0b2840a

* commit 'c9e0b2840a5c15b8784b020808d7d93aa20cccdc':
  Use actual window size for layout
2016-02-25 02:41:47 +00:00
Thierry Strudel
b4dd9b60ef Merge "Revert "Temporary fix for QXDM crashes."" into nyc-dev am: 0601a1c670
am: 6f5d54ebef

* commit '6f5d54ebef08da95003b4e79d3e4d4ab20c0a06c':
  Revert "Temporary fix for QXDM crashes."
2016-02-25 02:39:29 +00:00
Jorim Jaggi
c9e0b2840a Merge "Use actual window size for layout" into nyc-dev
am: 5a5057a78b

* commit '5a5057a78bc83e6d419c421224850139097662f4':
  Use actual window size for layout
2016-02-25 02:32:07 +00:00
Thierry Strudel
6f5d54ebef Merge "Revert "Temporary fix for QXDM crashes."" into nyc-dev
am: 0601a1c670

* commit '0601a1c6701aafca16c0e1c65962fe00d256e624':
  Revert "Temporary fix for QXDM crashes."
2016-02-25 02:30:15 +00:00
Jorim Jaggi
5a5057a78b Merge "Use actual window size for layout" into nyc-dev 2016-02-25 02:26:32 +00:00
Thierry Strudel
0601a1c670 Merge "Revert "Temporary fix for QXDM crashes."" into nyc-dev 2016-02-25 02:16:51 +00:00
Edward Cunningham
ab8c082879 Merge "Revert "DO NOT MERGE Extend the DownloadManager.addCompletedDownload() method to support origin details."" into nyc-dev
am: 648b952956

* commit '648b952956d4e2459f28982e5aa4ab53411e752b':
  Revert "DO NOT MERGE Extend the DownloadManager.addCompletedDownload() method to support origin details."
2016-02-25 02:15:51 +00:00
Thierry Strudel
e60b28d99b Revert "Temporary fix for QXDM crashes."
This reverts commit d7793693ad.

Change-Id: I9f27d6d5075be7b170ebe7a5bf4f2c3fe8c7c604
2016-02-25 02:14:16 +00:00
Jorim Jaggi
26d02d29e3 Use actual window size for layout
When doing the actual layout pass, desiredWindowWidth/Height might be wrong,
because window manager has the final say how large the surface is, so use
that size.

Bug: 27342700
Change-Id: I4f74fdef66ba7aa88b86f8c95fb391b1cc847beb
2016-02-25 01:21:20 +00:00
Edward Cunningham
648b952956 Merge "Revert "DO NOT MERGE Extend the DownloadManager.addCompletedDownload() method to support origin details."" into nyc-dev 2016-02-25 01:10:57 +00:00
Alex Klyubin
2a1ae0e743 Merge "Disallow downgrading of non-debuggable packages." into nyc-dev am: c008d3f196
am: 3e0a92519d

* commit '3e0a92519d51f83e773c09a6e37dbe142a8b7c4a':
  Disallow downgrading of non-debuggable packages.
2016-02-25 00:32:25 +00:00
Chad Brubaker
2929f9648e Merge "Dont trust the user added CA store by default for apps targeting N" into nyc-dev am: c1b0236d70
am: bc2cd253a0

* commit 'bc2cd253a07159cf7b89280c0261d06d52aaa2cf':
  Dont trust the user added CA store by default for apps targeting N
2016-02-25 00:30:46 +00:00
Winson
b6403150af Updating task description when activity is visible.
Bug: 27275448
Change-Id: If92221d30c84c58b5d36db1b254d264a0ff3ec25
2016-02-24 16:30:17 -08:00
Alex Klyubin
3e0a92519d Merge "Disallow downgrading of non-debuggable packages." into nyc-dev
am: c008d3f196

* commit 'c008d3f196da804eada77e00119addf2a08544de':
  Disallow downgrading of non-debuggable packages.
2016-02-25 00:24:27 +00:00
Chad Brubaker
bc2cd253a0 Merge "Dont trust the user added CA store by default for apps targeting N" into nyc-dev
am: c1b0236d70

* commit 'c1b0236d7069c99195607a48c5d10377e6750748':
  Dont trust the user added CA store by default for apps targeting N
2016-02-25 00:22:06 +00:00
Phil Burk
da0c640171 Merge "Settings: add ENCODED_SURROUND_OUTPUT" into nyc-dev am: 8dcdaaf11f
am: 6c5aacccd8

* commit '6c5aacccd8af20fa777bb8034d840e78102af640':
  Settings: add ENCODED_SURROUND_OUTPUT
2016-02-25 00:18:06 +00:00
Phil Burk
6c5aacccd8 Merge "Settings: add ENCODED_SURROUND_OUTPUT" into nyc-dev
am: 8dcdaaf11f

* commit '8dcdaaf11fe3b12a3d82f68287aa4f6119aafaa4':
  Settings: add ENCODED_SURROUND_OUTPUT
2016-02-25 00:10:02 +00:00
Alex Klyubin
c008d3f196 Merge "Disallow downgrading of non-debuggable packages." into nyc-dev 2016-02-25 00:05:36 +00:00
Chad Brubaker
c1b0236d70 Merge "Dont trust the user added CA store by default for apps targeting N" into nyc-dev 2016-02-25 00:02:37 +00:00
Alan Viverette
683273ab10 Merge "Fix exit transition and dismiss callback for popup exit transition" into nyc-dev am: 5249bd296d
am: d3b13eb3ef

* commit 'd3b13eb3efd1695f31d863a90e0dfec8eaae5fed':
  Fix exit transition and dismiss callback for popup exit transition
2016-02-24 23:51:18 +00:00
Phil Burk
8dcdaaf11f Merge "Settings: add ENCODED_SURROUND_OUTPUT" into nyc-dev 2016-02-24 23:49:18 +00:00
Alan Viverette
d3b13eb3ef Merge "Fix exit transition and dismiss callback for popup exit transition" into nyc-dev
am: 5249bd296d

* commit '5249bd296df1a91bc3bc0009d067321f1c119866':
  Fix exit transition and dismiss callback for popup exit transition
2016-02-24 23:33:52 +00:00
Arunesh Mishra
3ad1022a77 Merge "Fix AlwaysOnHotwordDetector recognition event bug." into nyc-dev am: 7dbef2da93
am: 5f2742afd8

* commit '5f2742afd8dd05ac83e0d5b4fd9b5da52202c9ab':
  Fix AlwaysOnHotwordDetector recognition event bug.
2016-02-24 23:26:03 +00:00
Alan Viverette
5249bd296d Merge "Fix exit transition and dismiss callback for popup exit transition" into nyc-dev 2016-02-24 23:22:21 +00:00
Arunesh Mishra
5f2742afd8 Merge "Fix AlwaysOnHotwordDetector recognition event bug." into nyc-dev
am: 7dbef2da93

* commit '7dbef2da936093bf7e9e6bb3059c3825ce1e408d':
  Fix AlwaysOnHotwordDetector recognition event bug.
2016-02-24 23:18:45 +00:00
Adam Powell
0f646a0865 Merge "Protect FragmentManager against View.NO_ID container ids" into nyc-dev am: dc5e3a3074
am: ee1970208e

* commit 'ee1970208e4e6a168113fb3cf57901de30282204':
  Protect FragmentManager against View.NO_ID container ids
2016-02-24 23:12:17 +00:00
Arunesh Mishra
7dbef2da93 Merge "Fix AlwaysOnHotwordDetector recognition event bug." into nyc-dev 2016-02-24 23:12:12 +00:00
Adam Powell
ee1970208e Merge "Protect FragmentManager against View.NO_ID container ids" into nyc-dev
am: dc5e3a3074

* commit 'dc5e3a30745ecdb219b33cec2b826f377ba5d134':
  Protect FragmentManager against View.NO_ID container ids
2016-02-24 23:06:01 +00:00
Todd Kennedy
bbba6c2d3c Merge "Revert "Remove deprecated methods / classes"" into nyc-dev am: fe01ea05dd
am: acbcf9d9ab

* commit 'acbcf9d9abfdecaf9c8038f810e12e183c59f422':
  Revert "Remove deprecated methods / classes"
2016-02-24 23:04:53 +00:00
Adam Powell
dc5e3a3074 Merge "Protect FragmentManager against View.NO_ID container ids" into nyc-dev 2016-02-24 23:01:34 +00:00
Todd Kennedy
acbcf9d9ab Merge "Revert "Remove deprecated methods / classes"" into nyc-dev
am: fe01ea05dd

* commit 'fe01ea05dd196acaf95a61e169f6b75654ae0875':
  Revert "Remove deprecated methods / classes"
2016-02-24 22:54:13 +00:00
Makoto Onuki
137077cddd Merge "Support safe mode properly." into nyc-dev am: a4fae1545a
am: 04d8eca54a

* commit '04d8eca54af9d46e793134a9168f658b9d68017f':
  Support safe mode properly.
2016-02-24 22:47:47 +00:00
Raph Levien
930d0e0063 Merge "Update data for emoji modifier bases to Unicode 9" into nyc-dev am: 785eb6039b
am: 56e9bb0db4

* commit '56e9bb0db4157d62c78e6b6063d05da33ffc20ba':
  Update data for emoji modifier bases to Unicode 9
2016-02-24 22:46:02 +00:00
Todd Kennedy
fe01ea05dd Merge "Revert "Remove deprecated methods / classes"" into nyc-dev 2016-02-24 22:45:50 +00:00
Todd Kennedy
5cbeb59026 Revert "Remove deprecated methods / classes"
This reverts commit 9706c01f9b.

Change-Id: I14c53ab140220e48f6728b1173ea58760bbeb7f9
2016-02-24 22:45:00 +00:00
Edward Cunningham
c6f5738d3c Revert "DO NOT MERGE Extend the DownloadManager.addCompletedDownload() method to support origin details."
This reverts commit baccf15a4a.

Change-Id: If218d579cbf473fdab2b16a715a5dbb75dc9fbbc
2016-02-24 22:43:15 +00:00