3150 Commits

Author SHA1 Message Date
RoboErik
df26651ff4 Merge "Allow null queues to be set in MediaSession" into lmp-dev 2014-09-25 18:28:21 +00:00
ztenghui
f06355712a am e7b9e3c6: am 72e1f678: am 0ecbcd00: am 64816d53: am a00457a6: Merge "Add one more test and update old tests" into lmp-dev
* commit 'e7b9e3c6a36f0f88b345204249c0848cc4cfb2d9':
  Add one more test and update old tests
2014-09-25 17:18:26 +00:00
ztenghui
9d23862bfd Merge "Add one more test and update old tests" into lmp-dev 2014-09-24 23:07:35 +00:00
RoboErik
03fce072ca Allow null queues to be set in MediaSession
Also add some test code for it to OneMedia.

bug:17593962
Change-Id: I074e2bb0329d9a97f623e4309bb7dada157b8324
2014-09-24 14:35:32 -07:00
Dianne Hackborn
0e3ba836c8 am 1dbd1440: am 2129bb01: am 657bd7ec: am fa3089f8: am 0d18d08d: Merge "Work on issue #17628623: Need to update default preferred activities for YouTube" into lmp-dev
* commit '1dbd14405618f8645a9873c5d904bad549197edb':
  Work on issue #17628623: Need to update default preferred activities for YouTube
2014-09-24 17:17:42 +00:00
Dianne Hackborn
58817f502c Merge "Work on issue #17628623: Need to update default preferred activities for YouTube" into lmp-dev 2014-09-24 01:00:03 +00:00
Dianne Hackborn
eeb2c7e712 Work on issue #17628623: Need to update default preferred activities for YouTube
Improve the warning logs when setting up preferred activities
to help identify when there are issues and what they are.  Also
improve the algorithm a little to still apply permissions when
resetting them and there are additional third party apps, as long
as the additional app is something like another browser and the
preferred activity being set is more specific (has a better match).

And add an example of using manifest-based preferred activities
in to ActivityTest -- and yes it DOES work! :p

Change-Id: I1ff39e03a5df6526206e0c3882085396b355d814
2014-09-23 16:45:39 -07:00
ztenghui
80f44408a1 Add one more test and update old tests
This is just updating the internal test app.
No real functionality changed.

b/17631551

Change-Id: Icc01e017ea4fbf97712214e6ac02691d29ea5e96
2014-09-23 16:35:53 -07:00
ztenghui
ec9d2fc09c am e15e5958: am 2b7813c6: am 065502cb: am 892412af: am 8518c090: Merge "Fix animation on the some properties" into lmp-dev
* commit 'e15e595801caf1d2d2165d356b3951d753b3d56e':
  Fix animation on the some properties
2014-09-23 20:57:10 +00:00
ztenghui
dbcccffc37 Fix animation on the some properties
The risk is low since most of them are just matching the naming to xml.
And this update won't cause build breakage.

b/17623982

Change-Id: I1eda0b8314ec7b94bc03976cdc365a7dc1039f4c
2014-09-23 11:22:26 -07:00
wsmlby
3b1ca632e3 am 462f7a65: am 5ef3b577: am d357ec8b: am 4746e825: am fa3fb593: Merge "Add leanback support to AppCompatiblityTest" into lmp-dev
* commit '462f7a658d359d1e9ad825f8db949e29b4a1aacc':
  Add leanback support to AppCompatiblityTest
2014-09-19 08:31:35 +00:00
wsmlby
e87cc9a2f2 Add leanback support to AppCompatiblityTest
Change-Id: Ia9da14b8551c4ec5834a047f0792a5a213a3ac04
2014-09-18 14:09:17 -07:00
ztenghui
f1139a0450 am 75145fd6: am 8207e209: am 2bb77b5a: Merge "Add root alpha and animation to (Animated)VectorDrawable" into lmp-dev
* commit '75145fd66c1cd7a92cb871333391fa8b88e1108b':
  Add root alpha and animation to (Animated)VectorDrawable
2014-09-13 02:27:20 +00:00
ztenghui
74cc5c39ae Merge "Add root alpha and animation to (Animated)VectorDrawable" into lmp-dev 2014-09-12 22:12:03 +00:00
ztenghui
8490354dc6 Add root alpha and animation to (Animated)VectorDrawable
b/17393626

Change-Id: If6a28b072f7d4bcb2b57022d86ec784f4c0d78f1
2014-09-12 15:11:10 -07:00
Adam Lesinski
a67b2ec07a am 0f169c8a: am d02321d5: am 2e35ab0a: Merge "UsageStats should deal with changing time" into lmp-dev
* commit '0f169c8a268c6b3d72a49ab1b2f792b388374db7':
  UsageStats should deal with changing time
2014-09-12 19:25:57 +00:00
Michael Wright
93f120b6ee am f015309d: am 79870899: am 44c97df3: Change constant to PowerManager.RELEAES_FLAG_WAIT_FOR_NO_PROXIMITY
* commit 'f015309d6df6647732d35e01133d278cd2b59e69':
  Change constant to PowerManager.RELEAES_FLAG_WAIT_FOR_NO_PROXIMITY
2014-09-12 19:24:52 +00:00
Matthew Williams
b0b0b7fd30 am f94a6a7c: am 04f538e8: am 3812a38b: Merge "Add flag to JobParameters for job expired" into lmp-dev
* commit 'f94a6a7c55682d634b4d0f9a1184afe57d18f3c4':
  Add flag to JobParameters for job expired
2014-09-12 19:18:50 +00:00
ztenghui
0421e5f947 am 85c9f80a: am 548b9294: am 8738c8db: Merge "Bring back the fillAlpha and strokeAlpha." into lmp-dev
* commit '85c9f80a2ce712891fec9411562bd0cb48249586':
  Bring back the fillAlpha and strokeAlpha.
2014-09-12 19:18:25 +00:00
Adam Lesinski
3bab7c188d Merge "UsageStats should deal with changing time" into lmp-dev 2014-09-12 01:42:21 +00:00
Adam Lesinski
66143fa5b3 UsageStats should deal with changing time
When the system time is changed, the UsageStats API
will modify all existing entries to correspond with the
new time change. If the time changed when the device was
off, stats in the future will be deleted.

Change-Id: Ica3e9917d4d1a180f97700e52ab390e3673e1e82
2014-09-11 18:39:01 -07:00
Michael Wright
1208e2718d Change constant to PowerManager.RELEAES_FLAG_WAIT_FOR_NO_PROXIMITY
Bug: 17290118
Change-Id: Iae3866bf3f7ac24f756ec4c183e848a79d1f779b
2014-09-12 00:23:14 +00:00
Matthew Williams
91911fd952 Merge "Add flag to JobParameters for job expired" into lmp-dev 2014-09-11 17:27:58 +00:00
Matthew Williams
03a4da6e8e Add flag to JobParameters for job expired
BUG: 17424511
Introduce an "isOverrideDeadlineExpired" which will allow clients
to know when they are being run due to an expiry.
Nb that we check deadline expiry by checking that the constraints on
the job are not satisfied at execution time. Really this is the same
thing, as a job will not be run without its constraints being met,
unless the job has expired.

Change-Id: I4b91e5b5eadccabd91296d5a5ca66b859dbfaf5c
2014-09-10 17:32:18 -07:00
ztenghui
2e17d2b232 Bring back the fillAlpha and strokeAlpha.
At the same time, remove the group alpha since we did not follow the convention
that group's alpha should apply together, not separately to each elements.

b/17393626

Change-Id: Idfc071414213583924961dc8ea760d6fb317873c
2014-09-10 16:26:48 -07:00
wsmlby
c7aada1eff am 55a572be: am 3e27567c: am d1ed1e81: Merge "Fix AppCompatibility test for different process name of one package." into lmp-dev
* commit '55a572befd7fca0d4377fb36509594fb469a34b5':
  Fix AppCompatibility test for different process name of one package.
2014-09-10 01:10:33 +00:00
wsmlby
e12c6f7d54 Merge "Fix AppCompatibility test for different process name of one package." into lmp-dev 2014-09-10 00:21:27 +00:00
wsmlby
dd806b0ed3 Fix AppCompatibility test for different process name of one package.
Change-Id: Ic30e5ee81fe6ea82e88d2c5541dc9fa9eba71043
2014-09-09 16:10:12 -07:00
Craig Mautner
cb9bbc7f77 am 37af2b51: am 2297d88d: am 77e1dc74: Merge "Remove deprecated (and now unused) API method." into lmp-dev
* commit '37af2b51c5f3198392de94acbf2ec13ed9563be4':
  Remove deprecated (and now unused) API method.
2014-09-09 18:08:20 +00:00
Craig Mautner
345d4f4f14 Merge "Remove deprecated (and now unused) API method." into lmp-dev 2014-09-09 17:05:04 +00:00
Dianne Hackborn
0b95125d99 am 1420cfbf: am 2146dc79: am 0ad9e247: Merge "Add new wallpaper features for insets and offsets." into lmp-dev
* commit '1420cfbf788fa9272f43231c15be29f7febdcde3':
  Add new wallpaper features for insets and offsets.
2014-09-09 17:00:07 +00:00
Craig Mautner
0321573fa7 Remove deprecated (and now unused) API method.
Removes ActivityOptions.makeLaunchTaskBehindAnimation().

Fixes bug 16958544.

Change-Id: I2d58f4235994fe01d55b3309d0ec6f8449c5d5b8
2014-09-09 08:53:56 -07:00
Dianne Hackborn
067e5f68b9 Add new wallpaper features for insets and offsets.
Issue #17394151: WallpaperService / Engines need to get notified
of WindowInsets

Issue #17394203 Wallpapers need a system API to be shifted in order
to support burn in protection

Adds a new API on WallpaperManager to set additional offsets to
make wallpapers extend beyond the display size.

Insets are now reported to wallpapers, to use as they may.  This
includes information about the above offsets, so they can place
their content within the visible area.  And to help with this, also
expose the stable offsets APIs in WindowInsets which is also very
useful information for the wallpaper.

Another new API on WallpaperManager to set a raw offset to apply
to the wallpaper window, forcing it to move on the screen regardless
of what the wallpaper is drawing.

Fix wallpapers when used with overscan enabled, so they still extend
out across the entire screen.  Conveniently, the above new window
insets information is very useful for this case as well!

And a new wallpaper test app for all this stuff.

Change-Id: I287ee36581283dd34607609fcd3170d99d120d8e
2014-09-08 18:02:18 -07:00
Dianne Hackborn
432fa09116 am 7c021a1b: am 8c7be259: am 6a83e4d1: Merge "Work on issue #17357238: Recents is often slow if not used in a while" into lmp-dev
* commit '7c021a1b46ca076ec911daf7d515101fa7d61453':
  Work on issue #17357238: Recents is often slow if not used in a while
2014-09-07 19:30:57 +00:00
Dianne Hackborn
a4e102ee58 Work on issue #17357238: Recents is often slow if not used in a while
Add a new activity attribute, resumeWhilePausing, that allows an
activity specifying it to immediately start running without waiting
for the previous activity to pause.  The recents activity is updated
to use this.

The implementation of this is ultimately fairly simple -- if we are
in the path of resuming such an activity, and find that we first need
to pause the existing activity, then within the activity manager we
do the regular pause flow but act like it has immediately finished
pausing right then so that we can immediately go on to the resume.
To make this clean, we tell the activity when asking it to pause that
it should not come back and tell us it is done, because we aren't in
any way waiting for it.

One potentially important change I needed to make here is the pause
callback no longer provides the saved persistent state, because we
now can't count on that callback happening.  I don't think there was
really any utility in this anyway -- all modern apps will have their
save state flow happen as part of stopping, not pausing, so we'll
only capture that saved state when the stop is reported back anyway.
And since we do send the saved state back when stopping, it would
always blow away whatever we had gotten at the pause.

Finally, update the documentation for AppTask.startActivity(), and
fix the implementation handling that to be cleaner -- we need to
deal with inTask first before getting in to "oh noes add NEW_TASK
if this isn't coming from a calling activity" flow.

Change-Id: Ia1da0fac90d7bdbaafdda2e34850d795ce17a39f
2014-09-05 18:43:43 -07:00
John Reck
739136002f am ce7e1c41: am bf6afec1: am fd289c1c: Merge "Disable RT-anim for AnimatorSet" into lmp-dev
* commit 'ce7e1c41485cbc5dfdb6a11bde01d0d3aa5d15e6':
  Disable RT-anim for AnimatorSet
2014-09-06 00:49:41 +00:00
John Reck
3207ffe120 Merge "Disable RT-anim for AnimatorSet" into lmp-dev 2014-09-06 00:22:25 +00:00
John Reck
f5945a0c8b Disable RT-anim for AnimatorSet
Bug: 17317184

 Unfortunately this will disable *all* RT animations in a scene,
 but we don't have more selective targetting currently

Change-Id: I57e1c0ae43957f45229473bdcdaf34c05825fab7
2014-09-05 15:58:26 -07:00
Eino-Ville Talvala
76bc0395b6 am 4b570b11: am a42873d6: am 8a52744d: Merge "Camera2: Final API revisions" into lmp-dev
* commit '4b570b11d7835ea1e71e6134a932ecc6f4c15e70':
  Camera2: Final API revisions
2014-09-05 22:09:42 +00:00
RoboErik
b59eacf5fe resolved conflicts for merge of a41f48f8 to master
Change-Id: Ida37d1eacf32a391cd1963e31f8fd76d97e9869a
2014-09-05 14:29:31 -07:00
Eino-Ville Talvala
71aa8ab5d7 Merge "Camera2: Final API revisions" into lmp-dev 2014-09-05 20:43:52 +00:00
RoboErik
7d0db3c364 am 8fe00fb8: am a21df8dd: am 52dcc8a1: Merge "rename add/removeCallback to register/unregisterCallback" into lmp-dev
* commit '8fe00fb8658c49a4bfd6e5bb4665d91f3879fcf6':
  rename add/removeCallback to register/unregisterCallback
2014-09-05 20:32:32 +00:00
RoboErik
88d98d3aab am 8fe56085: am 8c47737f: am fa8c8c3a: Merge "rename SERVICE_ACTION to SERVICE_INTERFACE" into lmp-dev
* commit '8fe5608598eefe7213fb978cad77981011773a26':
  rename SERVICE_ACTION to SERVICE_INTERFACE
2014-09-05 20:32:22 +00:00
RoboErik
d89025f505 Merge "Minor tweaks to MediaBrowser" into lmp-dev 2014-09-05 19:49:46 +00:00
RoboErik
dfafca7691 Merge "rename add/removeCallback to register/unregisterCallback" into lmp-dev 2014-09-05 19:49:36 +00:00
RoboErik
845755d6e7 Merge "rename SERVICE_ACTION to SERVICE_INTERFACE" into lmp-dev 2014-09-05 19:45:44 +00:00
Eino-Ville Talvala
fd887436bd Camera2: Final API revisions
- Rename listeners to callbacks. Listeners are single-method and are interfaces,
  while callbacks are abstract may get more methods in the future.
- Use register/unregister for registering callbacks, not add/remove.

Bug: 17389922
Change-Id: Ic6b46ad79cb43a43a85e2a4b63f059d3af99798b
2014-09-05 12:43:11 -07:00
RoboErik
5dfa0a5f7a Minor tweaks to MediaBrowser
-A swapped the param order on MediaBrowser.MediaItem constructor
-Added a missing aidl file for MediaItem

bug:17205016
Change-Id: I61538d76f76a993ed5a47b881e0d291fef1d8db3
2014-09-05 11:40:34 -07:00
RoboErik
14f717a506 rename add/removeCallback to register/unregisterCallback
bug:17390821
Change-Id: Id610b481083686dba2a28b6c7c47b747f89eef4f
2014-09-05 11:40:33 -07:00
Dharmesh Mokani
140616a89c am 6feba6b6: am 0b230ea6: am efd4ea01: Merge "Address API review comment:AlwaysOnHotwordDetector" into lmp-dev
* commit '6feba6b61ecddcb93a2b33a2ea52daad6cf70bd5':
  Address API review comment:AlwaysOnHotwordDetector
2014-09-05 17:18:26 +00:00