Commit Graph

36042 Commits

Author SHA1 Message Date
Jeff Sharkey
4d341a5a1c Merge "Unlock should always wait for pending PRE_BOOT." into nyc-dev am: 89fa73f
am: 25b3756

* commit '25b37561104a3dfb5cc52d076f904fe0e8313217':
  Unlock should always wait for pending PRE_BOOT.

Change-Id: Ieba43635739603787daa110a0bf35381c0e09574
2016-04-19 17:22:36 +00:00
Jeff Sharkey
89fa73fd7a Merge "Unlock should always wait for pending PRE_BOOT." into nyc-dev 2016-04-19 17:11:20 +00:00
Julia Reynolds
695b7e7a73 Merge changes I01afb5e9,I90d1adaf into nyc-dev
am: 3da3d7f4

* commit '3da3d7f455761b73309bf5a02bef5eba816df5cd':
  Add content intent to autogroup summary.
  Logging for ranker bundling.

Change-Id: Ic01693ab7568122a8b8221ba4e01f319e724c100
2016-04-19 12:55:50 +00:00
Julia Reynolds
3da3d7f455 Merge changes I01afb5e9,I90d1adaf into nyc-dev
* changes:
  Add content intent to autogroup summary.
  Logging for ranker bundling.
2016-04-19 12:50:34 +00:00
Tony Mak
85c2982c3d Merge "User action should only stop lock task mode if it is in pinned mode" into nyc-dev
am: 882a080

* commit '882a0802a7f7268750b15adb8747dd3904f935b0':
  User action should only stop lock task mode if it is in pinned mode

Change-Id: Ia6c098d03a028014632050f8edc790922fb13f35
2016-04-19 10:37:57 +00:00
Tony Mak
882a0802a7 Merge "User action should only stop lock task mode if it is in pinned mode" into nyc-dev 2016-04-19 10:32:33 +00:00
Chris Thornton
7e81493a96 Merge "Use .equals() to compare two UUIDs in SoundTriggerHelper, rather than ==" into nyc-dev
am: 7d5c695

* commit '7d5c6955208e82157e6e5ba42ba1d5f1507c6eb6':
  Use .equals() to compare two UUIDs in SoundTriggerHelper, rather than ==

Change-Id: I7d21e0959c8ea8c1928c9065c1ff28d8e9a4c93c
2016-04-19 02:36:13 +00:00
TreeHugger Robot
7d5c695520 Merge "Use .equals() to compare two UUIDs in SoundTriggerHelper, rather than ==" into nyc-dev 2016-04-19 02:29:06 +00:00
Chris Thornton
41e04a4525 Use .equals() to compare two UUIDs in SoundTriggerHelper, rather than ==
Also refactors ModelData::clearState to clear a bit more of the state.

Bug:28251543
Change-Id: I18d7ccd90a6a9ee8bc8743d9a92c48f17d87c842
2016-04-18 17:58:37 -07:00
Wale Ogunwale
f1273bfa71 Merge "Properly resume paused activity when docked stack in maximized" into nyc-dev
am: 84f0b791e2

* commit '84f0b791e2eb0170c6b797929235c98d44f12d47':
  Properly resume paused activity when docked stack in maximized

Change-Id: I742876edac9d15b7a088bb2785f6771ea53440d2
2016-04-19 00:51:16 +00:00
TreeHugger Robot
84f0b791e2 Merge "Properly resume paused activity when docked stack in maximized" into nyc-dev 2016-04-19 00:47:29 +00:00
Craig Donner
1aab2f6ac8 Merge "Checks for existence of vr components before trying to disable them." into nyc-dev
am: 3e38e6a

* commit '3e38e6accf5586d350581a301e1ecfcadaf03b93':
  Checks for existence of vr components before trying to disable them.

Change-Id: Ie9215c697fb1c89c97b53c05e8350d5351558047
2016-04-19 00:17:06 +00:00
Craig Donner
3e38e6accf Merge "Checks for existence of vr components before trying to disable them." into nyc-dev 2016-04-19 00:10:54 +00:00
Wale Ogunwale
a2ce89ce0d Merge "Use right starting window resource in multi-window mode." into nyc-dev
am: 3eefb4c

* commit '3eefb4c313d0269f7e8bd226bdcc2d039f9e5608':
  Use right starting window resource in multi-window mode.

Change-Id: Iae72368565a49a177dac4db22c1060f7af77f61b
2016-04-19 00:10:53 +00:00
TreeHugger Robot
3eefb4c313 Merge "Use right starting window resource in multi-window mode." into nyc-dev 2016-04-19 00:04:00 +00:00
Adam Lesinski
63696c00e2 Merge "BatteryStats: Introduce Async external stats requests" into nyc-dev
am: 0d47f4b

* commit '0d47f4b6463077074abd6bed489a5f9243615c64':
  BatteryStats: Introduce Async external stats requests

Change-Id: I7319535a0210e38a6bc3731a9f0ec42a4485924f
2016-04-18 23:38:11 +00:00
Craig Donner
672afaa43b Checks for existence of vr components before trying to disable them.
Fixes: 28249296
Change-Id: I98506c263387c9deb05ae6bc997e92e0000b71ad
2016-04-18 16:31:52 -07:00
Adam Lesinski
0d47f4b646 Merge "BatteryStats: Introduce Async external stats requests" into nyc-dev 2016-04-18 23:27:10 +00:00
Wale Ogunwale
3ad75d608d Properly resume paused activity when docked stack in maximized
Force focus to the fullscreen stack so that its activity is resumed
regardless of it current state when moving all tasks from the docked
stack to the fullscreen stack and the fullscreen stack should be on
top.

Bug: 28247643
Bug: 28196862
Change-Id: Ic60c3794db765e9ee31b0facbbc4f461d65f30c2
2016-04-18 16:18:42 -07:00
Wale Ogunwale
dfc18623ed Use right starting window resource in multi-window mode.
Use the override configuration for the task the app is contained
in to generate resources for the starting window.

Bug: 28220001
Change-Id: I6fdf39a6d6de41287b44b25861a76f58fe58dd53
2016-04-18 15:09:34 -07:00
Robert Greenwalt
60ba3b371f Merge "Fix issues of different phone objects sharing same mConnectionApns list." am: e05bdb1
am: 4bc0c30

* commit '4bc0c30b3c882e943358c5a27b940abbe6e320ea':
  Fix issues of different phone objects sharing same mConnectionApns list.

Change-Id: I90bf7c127c3bf611e692a0f3c9d414ce9ed50f57
2016-04-18 22:05:20 +00:00
Chong Zhang
a17502259b Merge "Misc fixes for IME adjust" into nyc-dev
am: b1dea03

* commit 'b1dea03f0a72923793895048e1a5aac0d4e485c5':
  Misc fixes for IME adjust

Change-Id: I47ec9e9a0af9a2fad1c21eb4a9a20bb52eda3586
2016-04-18 22:03:01 +00:00
Yifan Bai
4bc0c30b3c Merge "Fix issues of different phone objects sharing same mConnectionApns list."
am: e05bdb1

* commit 'e05bdb15e519fb0d7575d33cb08ff9e17b117568':
  Fix issues of different phone objects sharing same mConnectionApns list.

Change-Id: I8c422a3e3c80e7ceeb55bfdc518eae5626425f4d
2016-04-18 22:02:59 +00:00
Chong Zhang
b1dea03f0a Merge "Misc fixes for IME adjust" into nyc-dev 2016-04-18 22:01:10 +00:00
Robert Greenwalt
e05bdb15e5 Merge "Fix issues of different phone objects sharing same mConnectionApns list." 2016-04-18 21:58:05 +00:00
Chong Zhang
198afac5ce Misc fixes for IME adjust
- Use thinner divider when IME adjusted

- Dim non-focused stack

- Restrict IME adjustment so that top pane is shrunk to 30% at most

- Move top stack up together with IME adjust

- Move bottom stack up even when not focused for thinner divider

bug: 28175599

Change-Id: I83556535e5a171f0ec28d88429186fa1315b910c
2016-04-18 14:52:34 -07:00
Jeff Sharkey
84a4c971c4 Unlock should always wait for pending PRE_BOOT.
While processing an unlock request, we might go async to handle
long-running operations like dispatching PRE_BOOT_COMPLETED.  This
change ensures that all unlock requests for a particular user wait
in line behind any pending async operations.

Without this CL, any subsequent unlock requests would immediately
return successful, even though PRE_BOOT_COMPLETED events were still
being processed.

Bug: 28240584
Change-Id: I307d6aaebfb8f38028f3666a2e19e4399b7cf3a7
2016-04-18 15:38:35 -06:00
Jim Miller
3093156018 Merge "Fix operator precedence bug causing a crash." into nyc-dev
am: 8df9400

* commit '8df940000ddf82e4268350abe6b1cf4be375160c':
  Fix operator precedence bug causing a crash.

Change-Id: Id6a6432734f2d6836a993d997225eeed9e2dc59b
2016-04-18 21:28:16 +00:00
Craig Donner
c9848d0af9 Merge "Disables VR components by default, but enables them if a VR app is installed." into nyc-dev
am: de5dbec

* commit 'de5dbec3aba4b0fcae226a8a512d37b1ee3071a8':
  Disables VR components by default, but enables them if a VR app is installed.

Change-Id: Id2876ad07da9059ca111578503aab8651b604563
2016-04-18 21:28:10 +00:00
Jim Miller
8df940000d Merge "Fix operator precedence bug causing a crash." into nyc-dev 2016-04-18 21:09:52 +00:00
Jim Miller
c1e61b83c2 Fix operator precedence bug causing a crash.
This fixes a bug where string expression was being evaluated
and then compared to null.  The result is a constant expression
which always passes, resulting in inadvertently accessing the
null variable.

Fixes bug 28237450

Change-Id: I755b4466fd1985bd7f8984c17e06839ac4a30642
2016-04-18 14:08:37 -07:00
Craig Donner
de5dbec3ab Merge "Disables VR components by default, but enables them if a VR app is installed." into nyc-dev 2016-04-18 21:01:33 +00:00
Jorim Jaggi
d01a4d8417 Set correct stack before restoring tasks
am: 3c800a4

* commit '3c800a49178552d52354592790396a1e1f7ee8ef':
  Set correct stack before restoring tasks

Change-Id: I028f1c2db130f487d83543c8285a80e7392f8cb5
2016-04-18 20:27:36 +00:00
Jorim Jaggi
4f14219d3b Fix IME layout
am: d450aa9

* commit 'd450aa9ac5b30897abf14f76a9ae2a5d76bc5331':
  Fix IME layout

Change-Id: I2aa5f3b8d98d95c5a097632cd4746a812028fe1e
2016-04-18 20:27:33 +00:00
Jorim Jaggi
3c800a4917 Set correct stack before restoring tasks
When restoring a task when starting it from recents, we need to set
all the relevant state for the transition before we actually restore
the task and attach the docked stack, as all kinds of weird things
might go wrong otherwise.

Bug: 28194162
Bug: 27607141
Change-Id: I21d173a43c62d425e507e8cc3a1a576f95cfe048
2016-04-18 20:16:15 +00:00
Jorim Jaggi
d450aa9ac5 Fix IME layout
When introducing the fitToDisplay variable, it should have been

fitToDisplay = task != null -> (implies) !task.isFloating();

but was written as task != null && !task.isFloating.

Bug: 28182018
Change-Id: If0be86f1ed8bb88914ce167e9f5273b6b3dc2571
2016-04-18 20:15:49 +00:00
Jeff Sharkey
46eb6fde91 Merge "Iterate through all known users after moving." into nyc-dev
am: fed6c65

* commit 'fed6c65f2a05a75f75d0a258da214770ff9168de':
  Iterate through all known users after moving.

Change-Id: Ibb9ed6172f04dfb26a17311ffe8ba4114f655ba8
2016-04-18 19:57:53 +00:00
Jeff Sharkey
724dd82bdc Merge "Consistent creation/destruction of user data." into nyc-dev
am: ad14b88

* commit 'ad14b884f4110e03ec7b5ba7b913be25d19aa95c':
  Consistent creation/destruction of user data.

Change-Id: Ic9808f80ede52b6ca08cfacb51c9364e4497d2f6
2016-04-18 19:52:05 +00:00
Jeff Sharkey
fed6c65f2a Merge "Iterate through all known users after moving." into nyc-dev 2016-04-18 19:43:50 +00:00
Jeff Sharkey
ad14b884f4 Merge "Consistent creation/destruction of user data." into nyc-dev 2016-04-18 19:43:18 +00:00
Wale Ogunwale
ed5bea3985 Merge "Reduce activity lifecycle churn when exiting split-screen mode." into nyc-dev
am: 77ca362

* commit '77ca3629f60dd9a416938e625959d0bd750d1acd':
  Reduce activity lifecycle churn when exiting split-screen mode.

Change-Id: I0c6f19646538810975e3f1b8773e60d490493b63
2016-04-18 19:35:39 +00:00
TreeHugger Robot
77ca3629f6 Merge "Reduce activity lifecycle churn when exiting split-screen mode." into nyc-dev 2016-04-18 19:22:39 +00:00
Ruben Brunk
bde45994fe Merge "Fix VR->VR Activity transitions." into nyc-dev
am: 9d1d006

* commit '9d1d006cb3fb85304d1002b0d71c1b9fa11ad2f6':
  Fix VR->VR Activity transitions.

Change-Id: Idf21b70c5f8d4d0076ea25a0442b1be103589113
2016-04-18 19:08:48 +00:00
Ruben Brunk
9d1d006cb3 Merge "Fix VR->VR Activity transitions." into nyc-dev 2016-04-18 19:04:30 +00:00
Craig Donner
9906259202 Disables VR components by default, but enables them if a VR app is installed.
If an existing app or newly installed app is installed, then enable them,
otherwise, they stay disabled.

Fixes: 26568985
Change-Id: I8274b061220f41b9462d83b8aff501905d84a508
2016-04-18 11:59:29 -07:00
Robert Carr
b00d3f7d35 Merge "Always update DimLayer bounds when starting dim." into nyc-dev
am: 8dd32a5

* commit '8dd32a56f74b896b21895ec75d58fa415caa2c70':
  Always update DimLayer bounds when starting dim.

Change-Id: Ida830b0a2f1490bdfb0a6f4af5cf2412492dcd73
2016-04-18 18:19:33 +00:00
Robert Carr
0365833e5d Merge "Promote input method dialogs layers with input method." into nyc-dev
am: 36ac7e9

* commit '36ac7e9f88e43a518b9670f556c011cb3d8f236f':
  Promote input method dialogs layers with input method.

Change-Id: Idabaff2ebcf745a52e75fc26a3a74c22cec4208b
2016-04-18 18:19:30 +00:00
Rob Carr
8dd32a56f7 Merge "Always update DimLayer bounds when starting dim." into nyc-dev 2016-04-18 18:10:58 +00:00
Rob Carr
36ac7e9f88 Merge "Promote input method dialogs layers with input method." into nyc-dev 2016-04-18 18:10:20 +00:00
Shishir Agrawal
54cf95f618 Merge "Adding slotId to certain Telephony broadcasts." into nyc-dev
am: 3f6e211

* commit '3f6e211d7306bb7a4d5abc01a966e06294a48988':
  Adding slotId to certain Telephony broadcasts.

Change-Id: If4b3ca0500b43137bd33d22449fb362bdf30c1d1
2016-04-18 16:33:08 +00:00