223089 Commits

Author SHA1 Message Date
Chris Tate
c169181747 Merge "Improve docs for Parcelable.describeContents()" 2015-12-03 19:00:47 +00:00
Wale Ogunwale
69970ceb71 Merge "Set proper stack in WM when activity is moved to stack in AM" 2015-12-03 18:51:13 +00:00
George Mount
e1abaa631e Adds a way to exclude test directories from javadoc. am: f6be993407
am: c26d7c378a

* commit 'c26d7c378a58f4f312b8385baf4d318c2df35478':
  Adds a way to exclude test directories from javadoc.
2015-12-03 18:38:48 +00:00
George Mount
c26d7c378a Adds a way to exclude test directories from javadoc.
am: f6be993407

* commit 'f6be99340769cae717a604c7362f85830e4601c6':
  Adds a way to exclude test directories from javadoc.
2015-12-03 18:29:46 +00:00
Adam Skory
a1d8f42fcd Merge "Make isAppProvidedWebUri false from setDefaultIntent()" 2015-12-03 18:29:05 +00:00
Wale Ogunwale
2998eef694 Set proper stack in WM when activity is moved to stack in AM
When an activity is moved to a stack using the
ActivityStack#moveActivityToStack API a new task is created to
hold the activity in the stack. However, when the new task is
created in the window manager side it uses the stack id of the
previous stack the activity was in. We now pass the stack to use
from activity manager to window manager.

Bug: 25987309
Bug: 25961636
Change-Id: Iecc71f6d9b3e70a8d88e134b42f7532ba5327bad
2015-12-03 10:20:16 -08:00
George Mount
f6be993407 Adds a way to exclude test directories from javadoc.
By adding a file named NO_DOCS to a directory, all
java files under that directory will be ignored for
javadoc builds. This is especially useful for marking
test projects as not participating in the javadoc
build.

Change-Id: I3b0259f4bb3c8460c3560fdcf97c6cac11d8001d
2015-12-03 10:12:52 -08:00
Matt Sarett
5c3252ec97 Change dependency to match renamed libjpeg-turbo
Change-Id: Ie5a88e0e011dc655cff564de28928938112a3073
2015-12-03 16:23:43 +00:00
Clara Bayarri
10ad84a17d Create a separate Work Challenge check
This allows us to tell lock checks from FBE checks separately,
and will be useful when dealing with password unification.

Change-Id: Ifbea425f749fee4d6d51faddd8b64bf717a1a5f8
2015-12-03 16:18:53 +00:00
Clara Bayarri
29fcf1b1db Apply Admin password restrictions to work profile
When the Work Challenge is in place, re-route the
enforcing of Admin policies on the password to the
work profile. The Admin should not be allowed to
dictate policies on the device lock in this case.

This is part of the Separate Work Challenge feature.

Change-Id: I757973e540797b5fb10bea7a2fd1925561655bc9
2015-12-03 16:18:53 +00:00
Robin Lee
b3958d766b Merge "DPMS: Replace ArrayList<>(1) with SingletonList" 2015-12-03 16:12:54 +00:00
Jason Monk
2a5d79aa6f Fix crashes in Settings + SUW
Bug: 25981625
Bug: 25989520
Bug: 25987331
Change-Id: Ib53c99edf45bb4550bfb9761ed09ca3677068591
2015-12-03 10:51:58 -05:00
Robin Lee
968dea0969 DPMS: Replace ArrayList<>(1) with SingletonList
Change-Id: I78f8230d959f17c3aa2f248122973a8cd5c96693
2015-12-03 14:54:38 +00:00
Jason Monk
8f7f3184d5 Allow QS tiles to open dialogs
Add a TYPE_QS_DIALOG window type, that is in the same layer as
apps and dialogs and such.  It is guarded by having a token
that is granted by SysUI after a click has occured.  If the
app shows a dialog before listening finishes (QS closes) then
the token will stay granted until the tile is removed by the
user, otherwise the token will be removed immediately to avoid
later dialogs.

Also fix a couple tiny TileService issues:
 - Stop/Start listening reversed
 - Fix javadoc referencing wrong action

Change-Id: Iedcdd5fd9a2af2b33eb7f6f17bb0e6c997879876
2015-12-03 09:22:15 -05:00
Matt Sarett
00d70d36f9 Merge "Merge new implementation of BitmapRegionDecoder." 2015-12-03 13:38:03 +00:00
Clara Bayarri
8469b86e87 Merge "Create work challenge timeout" 2015-12-03 12:04:24 +00:00
Clara Bayarri
56878a9398 Create work challenge timeout
The work challenge should be locked whenever the device goes to sleep + admin
timeout or when the power button is pressed if the lock setting is on.

This change creates the infrastructure to lock a specific user instead of the
device and uses it in these cases. Then, the current code that brings up the
work challenge can check to only show it if the user is locked.

Change-Id: I89b4342b1458d97734d7afa66be52bf04ec3a3d4
2015-12-03 12:01:39 +00:00
Neil Fuller
568f4de11a Merge "Fix @code escapes" 2015-12-03 09:44:01 +00:00
Winson Chung
f430d3074f Merge "Fixing crash when trying to reset focused task after removing task." 2015-12-03 02:59:50 +00:00
Winson
a0731a1a26 Fixing crash when trying to reset focused task after removing task.
- Moving the focused state back into the stack, since the task view
  is transient and can be rebound.  Also ensuring that we update the
  task view focus state as we return and pick up views from the view
  pool
- Fixing issue where going back from recents would not go back home
- Properly calculating the task visibility (regression)

Bug: 25975225

Change-Id: Ica861f0d8996e4e254e875199a2d704a65bf8e58
2015-12-02 18:59:07 -08:00
Winson Chung
bb2e38f6eb Merge "Updating the freeform workspace layout" 2015-12-03 02:22:15 +00:00
Winson Chung
dfaf9a3cb1 Merge "Adding notion of stack state to the layout." 2015-12-03 02:21:44 +00:00
Wale Ogunwale
b60206a5e7 Merge "Make sure tap detector is valid before trying to initialize." 2015-12-03 02:18:44 +00:00
Keun-young Park
aa8b1c35ad Merge "Revert "allow locking UI mode and block launching car dock for automotive"" 2015-12-03 02:11:20 +00:00
Keun-young Park
3b741e03b3 Revert "allow locking UI mode and block launching car dock for automotive"
This reverts commit 1746369a6bcd1a7219e94366b3774bfdfff08fc6.

Change-Id: I4989e99b8f648145d0dbfe18e557102939e7d1e3
2015-12-03 02:11:00 +00:00
Wale Ogunwale
abaa4ad84e Make sure tap detector is valid before trying to initialize.
Bug: 25879224
Change-Id: Iefebeec9a0c75fe25d4e2476b797a003670b047a
2015-12-02 17:46:17 -08:00
Keun-young Park
ef3ca438c9 Merge "allow locking UI mode and block launching car dock for automotive" 2015-12-03 01:45:12 +00:00
Colin Cross
242f927555 Merge "Don\'t hardcode expected path to mainDexClasses" am: be1613379e am: 38400b4696
am: 6b644ec528

* commit '6b644ec528f62b74850e8566132a790e8f9f00da':
  Don't hardcode expected path to mainDexClasses
2015-12-03 01:35:41 +00:00
Colin Cross
6b644ec528 Merge "Don\'t hardcode expected path to mainDexClasses" am: be1613379e
am: 38400b4696

* commit '38400b4696111d88b4fadb1fe99bdd05e40ba6be':
  Don't hardcode expected path to mainDexClasses
2015-12-03 01:28:09 +00:00
Colin Cross
38400b4696 Merge "Don\'t hardcode expected path to mainDexClasses"
am: be1613379e

* commit 'be1613379e4814e9c54901d6e0171841e68f60ab':
  Don't hardcode expected path to mainDexClasses
2015-12-03 01:19:28 +00:00
Colin Cross
be1613379e Merge "Don't hardcode expected path to mainDexClasses" 2015-12-03 01:12:05 +00:00
Fyodor Kupolov
633e837db6 Merge "Allow current user in settings command" 2015-12-03 00:57:51 +00:00
Winson
5b7dd536aa Updating the freeform workspace layout
- Updating layout for freeform workspaces
- Consolidates the clipping and bitmap scale with the transform to make
  the transitions more unified
- Updating clipping as we synchronize scroll instead of afterwards

Change-Id: I33de4e2646c75f0bc0eb75bd6909fe94557196b5
2015-12-02 16:47:16 -08:00
Winson
f0d1c44a59 Adding notion of stack state to the layout.
- This allows us to choose which layout to show, either freeform, stack,
  or a combination of the two
- Fixing crash with null bitmap

Change-Id: I659e66d89f7205ccb0c2ba22c57aee95c8d4b3ab
2015-12-02 16:47:16 -08:00
Adam Skory
a5381085d3 Make isAppProvidedWebUri false from setDefaultIntent()
Just assign mUri directly instead of calling setUri()
to avoid flipping mIsAppProvidedWebUri to true exactly
when it shouldn't be.

Also, make sure the boolean gets un/parceled.

Bug: 25952056

Change-Id: I973e585d04a73c2b7eab5975ea7f2b447b270c26
2015-12-02 17:43:19 -07:00
Christopher Tate
d1f09e2b43 Improve docs for Parcelable.describeContents()
Make the meaning of CONTENTS_FILE_DESCRIPTOR more explicit, and
emphasize that describeContents() applies to the current object
instance, not to the class generically.

Change-Id: Ie5010e24c2e57bdc6c982249adb9d4c871d46f5a
2015-12-02 16:30:15 -08:00
Fyodor Kupolov
9571b3365b Allow current user in settings command
settings command now accepts current user as an argument.

Bug: 25950700
Change-Id: Ia0cee8e956efe7bc341d87e5a7c7ec57678313bc
2015-12-02 16:29:05 -08:00
Colin Cross
b4ff8e4815 Don't hardcode expected path to mainDexClasses
Use MAINDEXCLASSES defined by the build system instead of manually using
$(HOST_OUT_EXECUTABLES)/mainDexClasses.

Change-Id: Iede13c243ef0c4e374c8e80bab4a995cea76b9b1
2015-12-02 16:24:08 -08:00
Felipe Leme
ec52d7983c Merge "Adds a notification action to cancel a bugreport in progress." 2015-12-03 00:18:34 +00:00
Philip P. Moltmann
d366011d65 Merge "Unset is -1 not Nan" 2015-12-03 00:01:42 +00:00
John Reck
c8aad06efe Merge "Nuke HardwareRenderer abstract base" 2015-12-02 23:54:01 +00:00
John Reck
51aaf906f9 Nuke HardwareRenderer abstract base
Bug: 17303292

Change-Id: I4a272ea4f695f4f9993e8be640fdd8530b691be0
2015-12-02 15:46:11 -08:00
Felipe Leme
9cadb75714 Adds a notification action to cancel a bugreport in progress.
BUG: 25794470
Change-Id: I6f9c58fa7257f0826ab77007562cbff7db3e4cf0
2015-12-02 15:42:52 -08:00
Philip P. Moltmann
a958fc336b Unset is -1 not Nan
Change-Id: I6e7fac4b9f1c3dc6cc88c786db856ddecf3f8538
2015-12-02 15:39:35 -08:00
Amit Mahajan
9ca712d69d Merge "Promoting a function from Gsm/Cdma CellLocation classes to parent class" 2015-12-02 23:32:16 +00:00
Chris Craik
dfabfea764 Merge "Add ListView rendering benchmark" 2015-12-02 23:21:21 +00:00
Chris Craik
54fa17f667 Add ListView rendering benchmark
Also fixes a bug in DrawRenderNodeOp recording, which was triggered by
the new test.

Change-Id: I328f2ed908495eb95ca8ce87a365d02650e72cd5
2015-12-02 15:20:26 -08:00
Steve McKay
362ab0dd68 Merge "Add DownloadsActivity functional test." 2015-12-02 23:06:35 +00:00
Keisuke Kuroyanagi
7489de2ebf Merge "Make drag handle tests stable." 2015-12-02 23:04:22 +00:00
Keisuke Kuroyanagi
5f71b5afe8 Make drag handle tests stable.
The center position of a drag handle can be outside of the
screen. In such cases, selection handle tests can be failed.
Changed to drag the visible position to deal with it.

Bug: 25730231
Change-Id: Id9270fc03d0f39041f243c9e9d17deca19925e09
2015-12-02 15:02:05 -08:00