223186 Commits

Author SHA1 Message Date
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
160f4c0d5c Temporary workaround for b/25980198
Change-Id: I467758ad45c499d72b1756a7e4f5c379089b3049
2015-12-02 19:06:44 -08: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
Yohei Yukawa
ed65bc0c62 Fix special handling of a fake language code "tl".
My previous CL 92280cd309b0f5967dd253280962d8581844db89 [1] had a silly
mistake that "tl" is converted to "fil" but "tl_PH" is not.

  [1] I94f203bddceb9c87710cb187cc3cc0ee6d9092a5

With this CL, the compatibility rewrite-rule from "tl" to "fil" starts
working regardless of the existence of countly/variant subtags in locale
string.  So far the only affected platfrom is API Level 23.

Bug: 20696126
Change-Id: Ica9cd2baac002c406f92331aadd7725d7424046a
2015-12-02 18:22:41 -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
Fyodor Kupolov
af38b8ea3e Fix instrumentation context initialization
Previously, when a user was not the system user, an instrumentation context
was not properly initialized. Its ApplicationInfo should had been initialized for
the current user id .

Bug: 25981683
Change-Id: I7b934bb6de42be15a613ac26fd5377c9de1682cc
2015-12-02 16:16:07 -08: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
Andy Hung
0a887bcd5c DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
Sample decoding still occurs in SoundPoolThread
without holding the SoundPool lock.

Bug: 25781119
Change-Id: I11fde005aa9cf5438e0390a0d2dfe0ec1dd282e8
(cherry picked from commit 0275a982abecee683f16c827d405eafe51fb67ae)
2015-12-02 23:28:28 +00:00
Chris Craik
8160f20b0a Reorganize hwui test directories
Now test-only common files reside in tests/common, and each test
executable type (macrobench, microbench, and unit) has a subdir there.

This change means the shared lib no longer has test code in it, and
sets up a means for scenes to be shared between tests.

Change-Id: I37b081f6977300e03fdd961b8e6439fde730605e
2015-12-02 15:25:10 -08: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
Chris Elliott
14b4836a42 DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property." am: 8e79dae3f6 am: 087d30c142
am: a6ed5dcd04  -s ours

* commit 'a6ed5dcd044fdeec84b42472cb393ddf9315a0ae':
  DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property."
2015-12-02 22:54:29 +00:00
Todd Kennedy
a6f0aa5785 Merge "Fix SplitTests CTS test" 2015-12-02 22:51:58 +00:00
Chris Elliott
a6ed5dcd04 DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property." am: 8e79dae3f6
am: 087d30c142

* commit '087d30c14243f38c28793877b8e5ad12d3a2b269':
  DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property."
2015-12-02 22:46:11 +00:00
Steve McKay
dbdaa49be4 Add DownloadsActivity functional test.
Bug: 25809806
Change-Id: I43ceaf3a99715a57e3d349bee60f2edf7f6666bd
2015-12-02 14:11:47 -08:00
Chris Elliott
087d30c142 DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property."
am: 8e79dae3f6

* commit '8e79dae3f67aae032010ddbbef2f8032ace01263':
  DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property."
2015-12-02 21:57:06 +00:00
Todd Kennedy
3398be854a Fix SplitTests CTS test
A recent change tightened the check for whether or not an APK has code.
The check verified against the application and not the individual split.

Bug: 25769800
Change-Id: Ia53bd0e31ce3379bdd8bfe6d0c3da99b6d65fe31
2015-12-02 13:56:04 -08:00
Roozbeh Pournader
47040d6247 Merge "Make Hyphenator load Spanish hyphenation patterns" 2015-12-02 21:19:48 +00:00
Chris Elliott
8e79dae3f6 DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property."
This reverts commit f60491183def4c46b4026afb4648544e7289ea5f.
2015-12-02 13:16:46 -08:00
Jason Monk
000932a815 Merge "Speed up setting launch" 2015-12-02 21:10:45 +00:00