OSDN Git Service

android-x86/frameworks-base.git
8 years agoFix selection expansion detection logic.
Keisuke Kuroyanagi [Wed, 2 Dec 2015 23:04:57 +0000 (15:04 -0800)]
Fix selection expansion detection logic.

The logic to detect vertical expansion is inverted on RTL
text. As a result, the selection handle cannot be moved
when it's dragged toward vertically expanding and
horizontally shrinking direction.

Bug: 25893288
Change-Id: I096595d287261b1287862c6ad27ae7f6f0a73262

8 years agoMake drag handle tests stable.
Keisuke Kuroyanagi [Wed, 2 Dec 2015 23:02:05 +0000 (15:02 -0800)]
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

8 years agoMerge "SoundPool: add lock for findSample access from SoundPoolThread"
Andy Hung [Wed, 2 Dec 2015 18:27:08 +0000 (18:27 +0000)]
Merge "SoundPool: add lock for findSample access from SoundPoolThread"

8 years agoMerge "Show share button in downloads."
Steve McKay [Wed, 2 Dec 2015 18:27:03 +0000 (18:27 +0000)]
Merge "Show share button in downloads."

8 years agoMerge "Refactoring: SelectionHandleView."
Keisuke Kuroyanagi [Wed, 2 Dec 2015 18:18:58 +0000 (18:18 +0000)]
Merge "Refactoring: SelectionHandleView."

8 years agoMerge "Add bounds information to stack/task WM dump"
Wale Ogunwale [Wed, 2 Dec 2015 18:13:37 +0000 (18:13 +0000)]
Merge "Add bounds information to stack/task WM dump"

8 years agoMerge "Copy into ASEC container"
Todd Kennedy [Wed, 2 Dec 2015 17:34:50 +0000 (17:34 +0000)]
Merge "Copy into ASEC container"

8 years agoMerge "Audio focus: uid/pid log info on focus request/abandon"
Jean-Michel Trivi [Wed, 2 Dec 2015 17:31:05 +0000 (17:31 +0000)]
Merge "Audio focus: uid/pid log info on focus request/abandon"

8 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 2 Dec 2015 16:52:42 +0000 (16:52 +0000)]
Merge "Import translations. DO NOT MERGE"

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 2 Dec 2015 16:48:39 +0000 (17:48 +0100)]
Import translations. DO NOT MERGE

Change-Id: I58bd0cba05ce41485fb9733e922ed9daa5ec6363
Auto-generated-cl: translation import

8 years agoMerge "Fix animating quick settings tiles"
Jason Monk [Wed, 2 Dec 2015 16:43:06 +0000 (16:43 +0000)]
Merge "Fix animating quick settings tiles"

8 years agoMerge "Allow print service to specify progress of print and status"
Philip P. Moltmann [Wed, 2 Dec 2015 16:34:58 +0000 (16:34 +0000)]
Merge "Allow print service to specify progress of print and status"

8 years agoFix animating quick settings tiles
Jason Monk [Wed, 2 Dec 2015 16:30:36 +0000 (11:30 -0500)]
Fix animating quick settings tiles

Bug: 25835488
Change-Id: Id9757dd2ae05c73a8b06d3bf9e8b3a2cb8296437

8 years agoMerge "Fix getKeySetByAlias PackageMgr test."
Daniel Cashman [Wed, 2 Dec 2015 15:35:28 +0000 (15:35 +0000)]
Merge "Fix getKeySetByAlias PackageMgr test."

8 years agoFix getKeySetByAlias PackageMgr test.
dcashman [Wed, 2 Dec 2015 01:04:58 +0000 (17:04 -0800)]
Fix getKeySetByAlias PackageMgr test.

commit 42aed1b8ecf591009f9e2df8eaca4f41074c37c8 changed the hidden
KeySet API to allow packages to retrieve keysets of other packages.
Change the PackageManagerTests to not expect a SecurityExeption
anymore and also make sure that this is supported.

Bug: 25935839
Change-Id: I18c00997a627c9df1eb3826650c1aa71f563a2bd

8 years agoMerge "Fix tests"
Todd Kennedy [Wed, 2 Dec 2015 15:25:31 +0000 (15:25 +0000)]
Merge "Fix tests"

8 years agoMerge "Resolve merge conflicts of 5ec51457e1 to master."
Robin Lee [Wed, 2 Dec 2015 13:57:04 +0000 (13:57 +0000)]
Merge "Resolve merge conflicts of 5ec51457e1 to "

8 years agoResolve merge conflicts of 5ec51457e1 to master.
Robin Lee [Wed, 2 Dec 2015 13:48:32 +0000 (13:48 +0000)]
Resolve merge conflicts of 5ec51457e1 to master.

Change-Id: I70c12ad663c3b4d3b5e3b8f40bc659cb94d82c14

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 2 Dec 2015 13:37:33 +0000 (05:37 -0800)]
Import translations. DO NOT MERGE

Change-Id: Icead64fbc942b39b292289d3054845eefe3170b8
Auto-generated-cl: translation import

8 years agoMerge "DevicePolicy: Always send ACTION_PASSWORD_CHANGED" am: 3fe5a65b1c
Robin Lee [Wed, 2 Dec 2015 12:47:59 +0000 (12:47 +0000)]
Merge "DevicePolicy: Always send ACTION_PASSWORD_CHANGED" am: 3fe5a65b1c
am: 427edbce96

* commit '427edbce965f62707a2a43d86d70d9d19f6c60dc':
  DevicePolicy: Always send ACTION_PASSWORD_CHANGED

8 years agoMerge "DevicePolicy: Always send ACTION_PASSWORD_CHANGED"
Robin Lee [Wed, 2 Dec 2015 12:41:20 +0000 (12:41 +0000)]
Merge "DevicePolicy: Always send ACTION_PASSWORD_CHANGED"
am: 3fe5a65b1c

* commit '3fe5a65b1cc621d40f6278dd1e38d5ec58f92fb6':
  DevicePolicy: Always send ACTION_PASSWORD_CHANGED

8 years agoMerge "DevicePolicy: Always send ACTION_PASSWORD_CHANGED"
Robin Lee [Wed, 2 Dec 2015 12:35:14 +0000 (12:35 +0000)]
Merge "DevicePolicy: Always send ACTION_PASSWORD_CHANGED"

8 years agoMerge "FloatingToolbar polish."
Abodunrinwa Toki [Wed, 2 Dec 2015 12:01:45 +0000 (12:01 +0000)]
Merge "FloatingToolbar polish."

8 years agoRemove merge markers from preloaded-classes
Przemyslaw Szczepaniak [Wed, 2 Dec 2015 11:32:22 +0000 (11:32 +0000)]
Remove merge markers from preloaded-classes

Change-Id: I8267fc4cd41868f406e32a64ee750c0e5ca6098d

8 years agoFloatingToolbar polish.
Abodunrinwa Toki [Fri, 30 Oct 2015 16:41:45 +0000 (16:41 +0000)]
FloatingToolbar polish.

This patch updates the FloatingToolbar to look and transition
exactly as described in the UX spec.

It includes an animating (VectorDrawable) overflow button and
menu item buttons that sit in place during transitions.

Bug: 24257588
Change-Id: I2b3f84ba451800830878667ce1abd7a99b4f9fea

8 years agoMerge "More inline reply goodness"
Adrian Roos [Wed, 2 Dec 2015 07:09:12 +0000 (07:09 +0000)]
Merge "More inline reply goodness"

8 years agoMerge changes I9bf21cc6,Iee45a465
Deepanshu Gupta [Wed, 2 Dec 2015 06:08:06 +0000 (06:08 +0000)]
Merge changes I9bf21cc6,Iee45a465

* changes:
  Revert "Revert "Add support for Choreographer animations""
  Add ability to promote fields.

8 years agoMerge "Fixed typos: when when"
Sungsoo Lim [Wed, 2 Dec 2015 06:01:26 +0000 (06:01 +0000)]
Merge "Fixed typos: when when"

8 years agoRevert "Revert "Add support for Choreographer animations""
Deepanshu Gupta [Wed, 2 Dec 2015 05:55:58 +0000 (21:55 -0800)]
Revert "Revert "Add support for Choreographer animations""

This reverts commit 8390b2ac85765e768d4b685077a96e6395d208b4.

The build break should now be fixed by
cbb1ba7f493116882b79578ec68646366f29cde4

Change-Id: I9bf21cc6dbdb5d515a665384dc6dfa464c3e6e2e

8 years agoFixed typos: when when
Sungsoo Lim [Wed, 2 Dec 2015 05:47:59 +0000 (14:47 +0900)]
Fixed typos: when when

Change-Id: I80c0b8817dcbed45071e42d9ffa88bae52a93a81

8 years agoAdd ability to promote fields.
Deepanshu Gupta [Wed, 2 Dec 2015 05:44:56 +0000 (21:44 -0800)]
Add ability to promote fields.

This adds the ability to promote private fields to public ones to
enable layoutlib to access them. This was first added in change
b556decf75b2b084e1aed54ac7fa23a141eedb7f, but reverted in
847b0d3ad22a47e0bca3d8bc8168fea7a0ba2f80. This is essentially a revert
of the change again, but without the SimpleMonthView related stuff.

Also, promote the Choreographer's field as is needed to support
animations.

Change-Id: Iee45a465c7a1cadd362c1841385941e6232e4900

8 years agoAdd optional permission review for legacy apps - framework
Svet Ganov [Wed, 2 Dec 2015 03:52:26 +0000 (19:52 -0800)]
Add optional permission review for legacy apps - framework

For some markets we have to allow the user to review permissions
for legacy apps at runtime despite them not supporting the new
permission model. This is achieved by showing a review UI before
launching any app component. If an update is installed the user
should see a permission review UI for the newly requested
permissions.

To allow distinguishing which permissions need a review we set
a special flag in the permission flags that a review is required.
This flag is set if a runtime permission is granted to a legacy
app and the system does not launch any app components until this
flag is cleared. Since install permissions are shared across all
users the dangerous permissions for legacy apps in review mode
are represented as always granted runtime permissions since the
reivew requirement is on a per user basis.

Whether the build supports permission review for legacy apps is
determined by a build constant allowing us to compile away the
unnecessary code for markets that do not require a permissions
review.

If an app launches an activity in another app that has some
permissions needing review, we launch the permissions review
UI and pass it a pending intent to launch the activity after
the review is completed.

If an app sends a broadcast to another app that has some permissions
needing review, we do not deliver the broadcast and if the sending
app is in the foreground plus the broadcast is explicit (has a
component) we launch the review UI giving it a pending intent to
send the broadcast after the review is completed.

If an app starts a service in another app that has some permissions
needing review, we do not start the service and if the calling app
is in the foreground we launch the review UI and pass it a pending
intent to start the service after the review is completed.

If an app binds to a service in another app that has some permissions
needing review, we schedule the binding but do not spin the target
service's process and we launch the review UI and pass it a callback
to invoke after the review is completed which spins the service
process and completes the binding.

If an app requests a content provider in another app that has some
permissions needing review we do not return the provider and if
the calling app is in the foreground we show the review UI.

Change-Id: I550f5ff6cadc46a98a1d1a7b8415eca551203acf

8 years agoRevert "Add support for Choreographer animations"
Diego Perez [Wed, 2 Dec 2015 04:10:22 +0000 (04:10 +0000)]
Revert "Add support for Choreographer animations"

This reverts commit 29ed07524ce0fc2e5950f5340d306247145d0efa.

8 years agoMerge "Extract test utility class."
Daichi Hirono [Wed, 2 Dec 2015 03:53:46 +0000 (03:53 +0000)]
Merge "Extract test utility class."

8 years agoMerge "Add storage icon for MTP roots."
Daichi Hirono [Wed, 2 Dec 2015 03:53:08 +0000 (03:53 +0000)]
Merge "Add storage icon for MTP roots."

8 years agoExtract test utility class.
Daichi Hirono [Wed, 2 Dec 2015 03:20:25 +0000 (12:20 +0900)]
Extract test utility class.

Change-Id: I8505ab13ceccf32e7a9b6817f84a66766098b09e

8 years agoMerge "Don't try to compress .webm resources"
Marco Nelissen [Wed, 2 Dec 2015 03:01:21 +0000 (03:01 +0000)]
Merge "Don't try to compress .webm resources"

8 years agoAdd storage icon for MTP roots.
Daichi Hirono [Wed, 2 Dec 2015 01:56:44 +0000 (10:56 +0900)]
Add storage icon for MTP roots.

BUG=22545807

Change-Id: I714b26d52e00b0f9a5c95dea1508be0d617482e3

8 years agoMerge "Charging speed based on voltage" into mnc-dr2-dev am: 0ede75507c
Adrian Roos [Wed, 2 Dec 2015 01:58:50 +0000 (01:58 +0000)]
Merge "Charging speed based on voltage" into mnc-dr2-dev am: 0ede75507c
am: 82cfaa813b

* commit '82cfaa813b994ff1e5aaedbdfeeb4ced6e5dfcdb':
  Charging speed based on voltage

8 years agoMerge "Charging speed based on voltage" into mnc-dr2-dev
Adrian Roos [Wed, 2 Dec 2015 01:50:10 +0000 (01:50 +0000)]
Merge "Charging speed based on voltage" into mnc-dr2-dev
am: 0ede75507c

* commit '0ede75507c43819d0417efe1f1ab5c626a608fc5':
  Charging speed based on voltage

8 years agoMerge "Charging speed based on voltage" into mnc-dr2-dev
Adrian Roos [Wed, 2 Dec 2015 01:44:21 +0000 (01:44 +0000)]
Merge "Charging speed based on voltage" into mnc-dr2-dev

8 years agoMore inline reply goodness
Adrian Roos [Wed, 2 Dec 2015 01:37:14 +0000 (17:37 -0800)]
More inline reply goodness

- Use expanded view instead of HUN when possible
- Remember partial replies
- Back properly closes IME without closing shade
- Fix broken reorder animation

Bug: 22452379
Change-Id: Idb6ca8aed27cfb1f3d9b46f59e148b1b3b112fa7

8 years agoMerge "Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"...
Ben Fennema [Wed, 2 Dec 2015 01:36:13 +0000 (01:36 +0000)]
Merge "Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"" into cw-e-dev am: 4d70e6a3c0  -s ours am: 8780f07b5c  -s ours am: ceec3dab7c  -s ours
am: 7154bbf2d4  -s ours

* commit '7154bbf2d40dcdb86160781991d77573d173e976':
  Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"

8 years agoMerge "Add input method to the tap detection exclude area."
Filip Gruszczynski [Wed, 2 Dec 2015 01:31:47 +0000 (01:31 +0000)]
Merge "Add input method to the tap detection exclude area."

8 years agoAdd input method to the tap detection exclude area.
Filip Gruszczynski [Wed, 2 Dec 2015 00:14:04 +0000 (16:14 -0800)]
Add input method to the tap detection exclude area.

Without this touch events on the input method will trigger focus change
if there is a window underneath the input. When focus changes, the input
method will go away too.

Bug: 25930832
Change-Id: I532cb9e78f6fe37b1ddfada75594fc695898a090

8 years agoRefactoring: SelectionHandleView.
Keisuke Kuroyanagi [Thu, 26 Nov 2015 04:59:05 +0000 (13:59 +0900)]
Refactoring: SelectionHandleView.

Remove code duplication in SelectionStartHandleView and
SelectionEndHandleView by introducing SelectionHandleView.

Change-Id: I4486019714b13d184a72cf7ee60c346c4d8b5f5a

8 years agoMerge "Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"...
Ben Fennema [Wed, 2 Dec 2015 01:27:25 +0000 (01:27 +0000)]
Merge "Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"" into cw-e-dev am: 4d70e6a3c0  -s ours am: 8780f07b5c  -s ours
am: ceec3dab7c  -s ours

* commit 'ceec3dab7cb7fcee6d367382fae11c9855263474':
  Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"

8 years agoMerge "AMS: add API to IProcessInfoServive for retrieving oom scores"
Chong Zhang [Wed, 2 Dec 2015 01:25:58 +0000 (01:25 +0000)]
Merge "AMS: add API to IProcessInfoServive for retrieving oom scores"

8 years agoMerge "Add TextView mouse tests for long click and double click."
Keisuke Kuroyanagi [Wed, 2 Dec 2015 01:23:17 +0000 (01:23 +0000)]
Merge "Add TextView mouse tests for long click and double click."

8 years agoAMS: add API to IProcessInfoServive for retrieving oom scores
Chong Zhang [Tue, 1 Dec 2015 22:06:42 +0000 (14:06 -0800)]
AMS: add API to IProcessInfoServive for retrieving oom scores

bug: 25853091
Change-Id: Ic915191b959afd34d31e8731a7e4aa631a78e45e

8 years agoMerge "Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"...
Ben Fennema [Wed, 2 Dec 2015 01:20:15 +0000 (01:20 +0000)]
Merge "Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"" into cw-e-dev am: 4d70e6a3c0  -s ours
am: 8780f07b5c  -s ours

* commit '8780f07b5c2a318cb28c172f9eac47b975793c90':
  Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"

8 years agoMerge "Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"...
Ben Fennema [Wed, 2 Dec 2015 01:12:04 +0000 (01:12 +0000)]
Merge "Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"" into cw-e-dev
am: 4d70e6a3c0  -s ours

* commit '4d70e6a3c044c4e29d84835a026b3e70b44b66e8':
  Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"

8 years agoMerge "Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"...
Ben Fennema [Wed, 2 Dec 2015 01:06:12 +0000 (01:06 +0000)]
Merge "Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"" into cw-e-dev

8 years agoRevert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"
Ben Fennema [Wed, 2 Dec 2015 01:05:25 +0000 (01:05 +0000)]
Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"

This reverts commit ad75169628589a275fb869a813ea697336e0c0aa.

Change-Id: Ic2f003fc200c077391d18bef9d5b79a98601769c

8 years agoAdd TextView mouse tests for long click and double click.
Keisuke Kuroyanagi [Wed, 2 Dec 2015 00:58:53 +0000 (16:58 -0800)]
Add TextView mouse tests for long click and double click.

Bug: 19544351
Change-Id: I4f3fe633c01c443441ff0ef1617bad34c17ab508

8 years agoCopy into ASEC container
Todd Kennedy [Wed, 2 Dec 2015 00:55:06 +0000 (16:55 -0800)]
Copy into ASEC container

Even when staged, copy into an ASEC container if the package is
forward locked.

Bug: 25812587
Change-Id: I385f7a441f3c6dc76fb076b4505bc9f43b10bd93

8 years agoMerge "DO NOT MERGE ANYWHERE Add new interface for sensor physical data" into cw...
Ben Fennema [Wed, 2 Dec 2015 00:49:57 +0000 (00:49 +0000)]
Merge "DO NOT MERGE ANYWHERE Add new interface for sensor physical data" into cw-e-dev am: ec7180f733  -s ours am: b98383291f  -s ours am: e90efd9153  -s ours
am: 1b574b3d45  -s ours

* commit '1b574b3d452969fef215495086e6f82aeadf4c8c':
  DO NOT MERGE ANYWHERE Add new interface for sensor physical data

8 years agoMerge "DO NOT MERGE ANYWHERE Add new interface for sensor physical data" into cw...
Ben Fennema [Wed, 2 Dec 2015 00:41:56 +0000 (00:41 +0000)]
Merge "DO NOT MERGE ANYWHERE Add new interface for sensor physical data" into cw-e-dev am: ec7180f733  -s ours am: b98383291f  -s ours
am: e90efd9153  -s ours

* commit 'e90efd91536b5bf7904336f78f258d63ba2cc904':
  DO NOT MERGE ANYWHERE Add new interface for sensor physical data

8 years agoMerge "DO NOT MERGE ANYWHERE Add new interface for sensor physical data" into cw...
Ben Fennema [Wed, 2 Dec 2015 00:34:14 +0000 (00:34 +0000)]
Merge "DO NOT MERGE ANYWHERE Add new interface for sensor physical data" into cw-e-dev am: ec7180f733  -s ours
am: b98383291f  -s ours

* commit 'b98383291f32d0152cb291855aa00f016d526a4a':
  DO NOT MERGE ANYWHERE Add new interface for sensor physical data

8 years agoMerge "DO NOT MERGE ANYWHERE Add new interface for sensor physical data" into cw...
Ben Fennema [Wed, 2 Dec 2015 00:26:19 +0000 (00:26 +0000)]
Merge "DO NOT MERGE ANYWHERE Add new interface for sensor physical data" into cw-e-dev
am: ec7180f733  -s ours

* commit 'ec7180f7333777582e642fc54f7106d500b7da33':
  DO NOT MERGE ANYWHERE Add new interface for sensor physical data

8 years agoShow share button in downloads.
Steve McKay [Wed, 2 Dec 2015 00:20:41 +0000 (16:20 -0800)]
Show share button in downloads.

Also, rename "ManagerRootActivity" to "DownloadsActivity"
    since because...well, it is almost always Downloads
    and is specialized for this case.

Bug: 25809806
Change-Id: I496d34393d269d2120c8e214413cb87df8bf171d

8 years agoMerge "Fix cts ApplicationTest#testApplication failing."
Filip Gruszczynski [Wed, 2 Dec 2015 00:20:18 +0000 (00:20 +0000)]
Merge "Fix cts ApplicationTest#testApplication failing."

8 years agoFix cts ApplicationTest#testApplication failing.
Filip Gruszczynski [Tue, 1 Dec 2015 20:49:29 +0000 (12:49 -0800)]
Fix cts ApplicationTest#testApplication failing.

We should ignore orientation change requests only when a resizeable
activity is not in a full screen mode.

Bug: 25935368
Change-Id: I53bada8bbf0b429b1d48707f65da488e0edeb799

8 years agoresolve merge conflicts of 956cad8870 to master.
Diego Perez [Wed, 2 Dec 2015 00:04:08 +0000 (00:04 +0000)]
resolve merge conflicts of 956cad8870 to master.

Change-Id: Iebad149b2768bcd7a52ee2c7c8c260a9279d1742

8 years agoMerge "DO NOT MERGE ANYWHERE Add new interface for sensor physical data" into cw...
Ben Fennema [Wed, 2 Dec 2015 00:01:55 +0000 (00:01 +0000)]
Merge "DO NOT MERGE ANYWHERE Add new interface for sensor physical data" into cw-e-dev

8 years agoFix tests
Todd Kennedy [Tue, 1 Dec 2015 00:55:04 +0000 (16:55 -0800)]
Fix tests

The majority of the test failures were around the method assertInstall()
failing a check for a symlink between the data directory in /data/data/
to the application directory in /mnt/asec/. There are a handful of other
failures that will be dealt with separately; those have all been suppressed
from running.

Also took the opportunity of adjusting some of the tests to ensure the
device is properly cleaned up. Packages remained installed after a failure.

Bug: 18048725
Change-Id: Id8f6ac53cfe17de43b5d527993d57812b1a63bef

8 years agoMerge "MediaPlayer: Disable acquiring wakelocks based on property." into cw-e-dev...
Chris Elliott [Tue, 1 Dec 2015 23:47:45 +0000 (23:47 +0000)]
Merge "MediaPlayer: Disable acquiring wakelocks based on property." into cw-e-dev am: 50276adde2 am: c54aa0c3f7 am: 767e2b39db
am: 1709832d47

* commit '1709832d474a7be85d46e55fab5773e399cd7086':
  MediaPlayer: Disable acquiring wakelocks based on property.

8 years agoAllow print service to specify progress of print and status
Philip P. Moltmann [Tue, 24 Nov 2015 00:12:39 +0000 (16:12 -0800)]
Allow print service to specify progress of print and status

The status has always been there in error cases, it is now also visible
in non-error cases.

If the progress is not set, no progress bar is shown.

Bug: 24135025
Change-Id: Iea23f45d236365433c6f6739597833d236ed6d19

8 years agoMerge "MediaPlayer: Disable acquiring wakelocks based on property." into cw-e-dev...
Chris Elliott [Tue, 1 Dec 2015 23:37:28 +0000 (23:37 +0000)]
Merge "MediaPlayer: Disable acquiring wakelocks based on property." into cw-e-dev am: 50276adde2 am: c54aa0c3f7
am: 767e2b39db

* commit '767e2b39db78e41241998b7b3941a15d68c6b4f2':
  MediaPlayer: Disable acquiring wakelocks based on property.

8 years agoMerge "Guard against null key events...which can happen."
Steve McKay [Tue, 1 Dec 2015 23:26:57 +0000 (23:26 +0000)]
Merge "Guard against null key events...which can happen."

8 years agoMerge "Don't copy a directory into itself...doesn't go well."
Steve McKay [Tue, 1 Dec 2015 23:07:37 +0000 (23:07 +0000)]
Merge "Don't copy a directory into itself...doesn't go well."

8 years agoGuard against null key events...which can happen.
Steve McKay [Tue, 1 Dec 2015 23:00:43 +0000 (15:00 -0800)]
Guard against null key events...which can happen.

Bug: 25772143
Change-Id: I0c2665aea25c65b92e6f6c0b1454f1e07112fc9c

8 years agoSoundPool: add lock for findSample access from SoundPoolThread
Andy Hung [Tue, 1 Dec 2015 00:09:55 +0000 (16:09 -0800)]
SoundPool: add lock for findSample access from SoundPoolThread

Sample decoding still occurs in SoundPoolThread
without holding the SoundPool lock.

Bug: 25781119
Change-Id: I11fde005aa9cf5438e0390a0d2dfe0ec1dd282e8

8 years agoDon't copy a directory into itself...doesn't go well.
Steve McKay [Fri, 20 Nov 2015 01:27:12 +0000 (17:27 -0800)]
Don't copy a directory into itself...doesn't go well.

Minimally deform CopyService such that we can listen
    to the completion of operations in the test.
Add test coverage.
Add equals and hashcode to DocumentInfo...so we can compare
    the heck out of 'em. + a test.
WIP: Expose (@hide style) DocumentsProvider.isChildDocument via
    DocumentsContract. Use that to check for recusive copies.

Bug: 25794511

Change-Id: I05bb329eb10b43540c6806d634e5b96a753e8178

8 years agoMerge "MediaPlayer: Disable acquiring wakelocks based on property." into cw-e-dev...
Chris Elliott [Tue, 1 Dec 2015 21:27:33 +0000 (21:27 +0000)]
Merge "MediaPlayer: Disable acquiring wakelocks based on property." into cw-e-dev am: 50276adde2
am: c54aa0c3f7

* commit 'c54aa0c3f7660a6a35c5ea396ef89f95eefb7c13':
  MediaPlayer: Disable acquiring wakelocks based on property.

8 years agoMerge "MediaPlayer: Disable acquiring wakelocks based on property." into cw-e-dev
Chris Elliott [Tue, 1 Dec 2015 21:19:54 +0000 (21:19 +0000)]
Merge "MediaPlayer: Disable acquiring wakelocks based on property." into cw-e-dev
am: 50276adde2

* commit '50276adde24c55394c0023ef49d01f054303dc87':
  MediaPlayer: Disable acquiring wakelocks based on property.

8 years agoMerge "MediaPlayer: Disable acquiring wakelocks based on property." into cw-e-dev
Chris Elliott [Tue, 1 Dec 2015 21:12:15 +0000 (21:12 +0000)]
Merge "MediaPlayer: Disable acquiring wakelocks based on property." into cw-e-dev

8 years agoDon't use IntegralToString
Chad Brubaker [Tue, 1 Dec 2015 21:03:27 +0000 (13:03 -0800)]
Don't use IntegralToString

Fix master build

Change-Id: I084ada7ccf54ab1708306ad2a412d8a09f78dec4

8 years agoMerge "Expose findTrustAnchorBySubjectAndPublicKey" am: 6fea66116c am: 3c096b3a88
Chad Brubaker [Tue, 1 Dec 2015 20:36:22 +0000 (20:36 +0000)]
Merge "Expose findTrustAnchorBySubjectAndPublicKey" am: 6fea66116c am: 3c096b3a88
am: bb670fc3ea

* commit 'bb670fc3ea65aa2e129227562769ee296e552f59':
  Expose findTrustAnchorBySubjectAndPublicKey

8 years agoMerge "Make NetworkSecurityConfigProvider.install lazy" am: 73c06b1dbe am: a2388beca1
Chad Brubaker [Tue, 1 Dec 2015 20:35:02 +0000 (20:35 +0000)]
Merge "Make NetworkSecurityConfigProvider.install lazy" am: 73c06b1dbe am: a2388beca1
am: e83b773bf5

* commit 'e83b773bf579caa97aae47e7a929dba42905980a':
  Make NetworkSecurityConfigProvider.install lazy

8 years agoMerge "Expose findTrustAnchorBySubjectAndPublicKey" am: 6fea66116c
Chad Brubaker [Tue, 1 Dec 2015 20:27:47 +0000 (20:27 +0000)]
Merge "Expose findTrustAnchorBySubjectAndPublicKey" am: 6fea66116c
am: 3c096b3a88

* commit '3c096b3a88617aa21bcb5cd1e496760f5898dd34':
  Expose findTrustAnchorBySubjectAndPublicKey

8 years agoMerge "Make NetworkSecurityConfigProvider.install lazy" am: 73c06b1dbe
Chad Brubaker [Tue, 1 Dec 2015 20:26:21 +0000 (20:26 +0000)]
Merge "Make NetworkSecurityConfigProvider.install lazy" am: 73c06b1dbe
am: a2388beca1

* commit 'a2388beca16898a1928fbf61a28aee2ff88ab46c':
  Make NetworkSecurityConfigProvider.install lazy

8 years agoMerge "Expose findTrustAnchorBySubjectAndPublicKey"
Chad Brubaker [Tue, 1 Dec 2015 20:21:35 +0000 (20:21 +0000)]
Merge "Expose findTrustAnchorBySubjectAndPublicKey"
am: 6fea66116c

* commit '6fea66116c79ecb5232a1c7ae66ae2a6e62c1c12':
  Expose findTrustAnchorBySubjectAndPublicKey

8 years agoMerge "Make NetworkSecurityConfigProvider.install lazy"
Chad Brubaker [Tue, 1 Dec 2015 20:20:11 +0000 (20:20 +0000)]
Merge "Make NetworkSecurityConfigProvider.install lazy"
am: 73c06b1dbe

* commit '73c06b1dbe08b3fc3786a3fab007f26398111f6a':
  Make NetworkSecurityConfigProvider.install lazy

8 years agoMerge "Expose findTrustAnchorBySubjectAndPublicKey"
Chad Brubaker [Tue, 1 Dec 2015 20:13:40 +0000 (20:13 +0000)]
Merge "Expose findTrustAnchorBySubjectAndPublicKey"

8 years agoMerge "Make NetworkSecurityConfigProvider.install lazy"
Chad Brubaker [Tue, 1 Dec 2015 20:13:23 +0000 (20:13 +0000)]
Merge "Make NetworkSecurityConfigProvider.install lazy"

8 years agoMerge "Correctly set default restrictions when creating guest"
Fyodor Kupolov [Tue, 1 Dec 2015 20:08:15 +0000 (20:08 +0000)]
Merge "Correctly set default restrictions when creating guest"

8 years agoFixing regression in drag view
Winson [Tue, 1 Dec 2015 18:43:02 +0000 (10:43 -0800)]
Fixing regression in drag view

- We should be removing the dragged task view after it is dropped on a
  drag target
- Also fixing issue with ViewPropertyAnimator listeners not being reset
  causing callbacks to be called in later animations

Change-Id: Ib9815d77f4e427c575f5a77fa58ea5a22f39f10f

8 years agoMerge "Plumb IME subtype change from IMMS to IMS."
Yohei Yukawa [Tue, 1 Dec 2015 18:47:17 +0000 (18:47 +0000)]
Merge "Plumb IME subtype change from IMMS to IMS."

8 years agoMerge "Fixing issue where the configuration can have stale docked state."
Winson Chung [Tue, 1 Dec 2015 18:44:23 +0000 (18:44 +0000)]
Merge "Fixing issue where the configuration can have stale docked state."

8 years agoPlumb IME subtype change from IMMS to IMS.
Yohei Yukawa [Tue, 1 Dec 2015 18:43:08 +0000 (10:43 -0800)]
Plumb IME subtype change from IMMS to IMS.

This is a plumbing CL from IMMS to IMS to notify when the current input
method subtype is changed.  Those events are supposed to be used to
change physical keyboard layout depending on input method subtype, which
is to be implemented in subsequent CLs.

Bug: 25753054
Change-Id: I58e71ffce9ac9131551a00dd35e24235dadfef87

8 years agoMerge "Show toast for non-resizeble docked task under the task itself"
Chong Zhang [Tue, 1 Dec 2015 18:41:48 +0000 (18:41 +0000)]
Merge "Show toast for non-resizeble docked task under the task itself"

8 years agoDon't try to compress .webm resources
Marco Nelissen [Tue, 1 Dec 2015 18:34:37 +0000 (10:34 -0800)]
Don't try to compress .webm resources

Bug: 25822610
Change-Id: I40a93c9daac258a8e9a41668c0040353e44ed5bb

8 years agoShow toast for non-resizeble docked task under the task itself
Chong Zhang [Mon, 30 Nov 2015 17:44:27 +0000 (09:44 -0800)]
Show toast for non-resizeble docked task under the task itself

Move the show toast code to WM, so that we can schedule to show the
toast when the app becomes visible. Otherwise the toast always shows
up a long time before the app itself.

bug: 25433902
bug: 25873338

Change-Id: I879f8e0570829934fac806c2861bda9f65e08969

8 years agoMerge "TRON: log changes to the default SMS app"
Tom Taylor [Tue, 1 Dec 2015 18:00:39 +0000 (18:00 +0000)]
Merge "TRON: log changes to the default SMS app"

8 years agoFixing issue where the configuration can have stale docked state.
Winson [Tue, 1 Dec 2015 02:43:43 +0000 (18:43 -0800)]
Fixing issue where the configuration can have stale docked state.

- Fixing issue where you could not drag after undocking a task while
  Overview is open, since we did not update the docked state.  We can
  just read the state directly in that case.

Change-Id: I5d2844edf024ba379e13be1a625bda8579d971b1

8 years agoMerge "Fix RippleDrawable exit animation"
John Reck [Tue, 1 Dec 2015 17:17:24 +0000 (17:17 +0000)]
Merge "Fix RippleDrawable exit animation"

8 years agoMerge "Tweak AsyncTask#THREAD_POOL_EXECUTOR settings"
John Reck [Tue, 1 Dec 2015 17:13:18 +0000 (17:13 +0000)]
Merge "Tweak AsyncTask#THREAD_POOL_EXECUTOR settings"

8 years agoMerge "DO NOT MERGE ANYWHERE" into cw-e-dev am: 085796bdf5 -s ours am: 4ecf963e77...
Bryce Lee [Tue, 1 Dec 2015 16:04:21 +0000 (16:04 +0000)]
Merge "DO NOT MERGE ANYWHERE" into cw-e-dev am: 085796bdf5  -s ours am: 4ecf963e77  -s ours am: 8f95fe4b71  -s ours
am: 155a44cee0  -s ours

* commit '155a44cee0130c5a9a92268583bb3a7cd55607ae':
  DO NOT MERGE ANYWHERE

8 years agoMerge "DO NOT MERGE ANYWHERE" into cw-e-dev am: 085796bdf5 -s ours am: 4ecf963e77...
Bryce Lee [Tue, 1 Dec 2015 15:57:07 +0000 (15:57 +0000)]
Merge "DO NOT MERGE ANYWHERE" into cw-e-dev am: 085796bdf5  -s ours am: 4ecf963e77  -s ours
am: 8f95fe4b71  -s ours

* commit '8f95fe4b71b54ee920d71b6b689b0e7f53994f00':
  DO NOT MERGE ANYWHERE