138963 Commits

Author SHA1 Message Date
Robert Phillips
b59508fce5 Changes to framework for ToT Skia.
Consists of 3 cherry-pick from changes by robertphillips@google.com
in master-skia:

-----------------------------------------------------------------------

New AndroidPicture wrapper class

Address code review comments & use new SkPictureRecorder::partialReplay
entry point

Addressing code review issues

Switch MakePartialCopy to makePartialCopy

Conflicts:
	core/jni/android/graphics/Picture.cpp

Ie530ab15b3d549f0ecfb0ecc131f9144a7b72a91

Remove AndroidPicture from GraphicsJNI and split into .h and .cpp

-----------------------------------------------------------------------

Fix lingering legacy picture recording behavior
Address code review issues

Iaf870c2c400dbe70dc32d6d445574904f5ea718f

-----------------------------------------------------------------------

Update Android to new SkCanvas::drawPicture interface

As of Skia 9b14f26d (Alter SkCanvas::drawPicture (devirtualize,
take const SkPicture, take pointer) -
https://codereview.chromium.org/313613004) SkCanvas::drawPicture
has an alternate signature. The old entry point is deprecated.

I63395da61ecc3b58bfd2bc094752081f4b2f7535

-----------------------------------------------------------------------

Change-Id: I041133aeb5639abd853370e512acf93870f82aea
2014-06-11 18:27:48 -04:00
Jorim Jaggi
85a7bb169b am 331b598b: Merge "Fix blank lockscreen." into lmp-preview-dev
* commit '331b598b261c6e531095b37185739b16bfefdd68':
  Fix blank lockscreen.
2014-06-11 22:16:53 +00:00
Chris Wren
85fa7722fe am 9abea7a7: Merge "Only post interrupting notifications to the Heads Up." into lmp-preview-dev
* commit '9abea7a7764e6735c1a37ab5ce45342bbfe56eed':
  Only post interrupting notifications to the Heads Up.
2014-06-11 22:16:47 +00:00
George Mount
93aa858b7f am f3e9a19c: (-s ours) Merge "DO NOT MERGE Allow enter activity transitions to be delayed until data is ready." into lmp-preview-dev
* commit 'f3e9a19c53522d478257f2d83255c8878707745e':
  DO NOT MERGE Allow enter activity transitions to be delayed until data is ready.
2014-06-11 22:16:41 +00:00
Selim Cinek
9f7c624a32 am 634a15af: Merge "Fixed a racecondition which could lead to invisible backgrounds" into lmp-preview-dev
* commit '634a15aff1d106ae549984e26113f734c016760d':
  Fixed a racecondition which could lead to invisible backgrounds
2014-06-11 22:16:35 +00:00
Daniel Sandler
1a762874fa am 26bd8885: Clean up progress bars for media & other notifications.
* commit '26bd8885f044181654bff60acdd1013d254feec7':
  Clean up progress bars for media & other notifications.
2014-06-11 22:16:30 +00:00
Sandeep Siddhartha
dcdb8df2d7 Merge "Add SoundTriggerManager to handle calls to SoundTrigger" 2014-06-10 22:12:51 +00:00
Sandeep Siddhartha
f7a13df899 Add SoundTriggerManager to handle calls to SoundTrigger
- We are abstracting out the nitty-gritty details of the code that talks
  to the SoundTrigger APIs as the
  VoiceInteractionService is mostly interested in the "voice" related
  aspects of the sound trigger APIs

Change-Id: I4a450033040280f2e67d06785d2b05a0e5cdc192
2014-06-11 15:41:23 -07:00
Sandeep Siddhartha
22968950b8 Activity for enrollment
- Make the enrollment attrs public
- Add a dummy activity for enrollment

- Manually tested that the meta-data is correctly read by the
  VoiceInteractionService when the enrollment application is under
  /system/priv-app

Change-Id: I36676ed8ffc919109031c26bac047d0c51a77e13
2014-06-11 15:34:39 -07:00
Sandeep Siddhartha
e912ac012e Add capability APIs to VoiceInteractionService
The only API we currently need is one that tells us whether the system
is capable of running hotword detection for a given keyphrase+locale on
the hardware.

Also adds support in the KeyphraseEnrollmentInfo to provide an intent
for enrollment.

Change-Id: Iec102a4a94e7b161087b8d19785d761346e927c2
2014-06-11 15:34:26 -07:00
Sandeep Siddhartha
e570678759 Initial support for reading the enrollment metadata
- Defines schema for enrollment apps to publish metadata for the search
  keyphrase. This metadata consists of an ID, a user visible keyphrase,
  and the target package to handle the keyphrase, when it triggers.
- Reads the metadata and populates the KeyphraseInfo object for access via
  the VoiceInteractionService
- Adds permission and intent action for the enrollment app.
  The enrollment app needs to be a system app protected with the
  MANAGE_VOICE_KEYPHRASES permission and the activity performing the
  enrollment needs to handle the ACTION_MANAGE_VOICE_KEYPHRASES
- The keyphrase info currently stores an ID - that's for internal
  bookkeeping only, a keyphrase text - that's used by the public APIs,
  and a list of supported locales, which isn't exposed but is used while
  indicating if hardware hotword is available for a particular keyphrase
  in a language or not.

Change-Id: Ibe6c52a5a3eecfd74c4a8382713a35eb88d38df9
2014-06-11 15:33:58 -07:00
Sandeep Siddhartha
297c2daabd Merge "Activity for enrollment" 2014-06-11 21:23:31 +00:00
Sandeep Siddhartha
4af3c7cf02 Merge "Add capability APIs to VoiceInteractionService" 2014-06-10 22:18:15 +00:00
Sandeep Siddhartha
5833bbe2d6 Merge "Initial support for reading the enrollment metadata" 2014-06-10 22:18:15 +00:00
Jean-Michel Trivi
5052e78949 Merge "AudioManager: add ability to allocate a new session ID" 2014-06-10 21:49:59 +00:00
Robert Greenwalt
a8580b5fe0 Merge "resolved conflicts for merge of 5192ea2b to master" 2014-06-10 21:49:59 +00:00
Robert Greenwalt
673c910ddd resolved conflicts for merge of 5192ea2b to master
Change-Id: I011b18d19749cdadfa39fa3b5a41ca9d588d0506
2014-06-11 13:29:41 -07:00
Selim Cinek
1c9c717f1b am f1187ac8: Merge "Added card elevation when card is clicked on the lockscreen" into lmp-preview-dev
* commit 'f1187ac8e8d2c8927caf322a12de8c32ee3f919f':
  Added card elevation when card is clicked on the lockscreen
2014-06-10 21:41:46 +00:00
Julia Reynolds
1b8aef2be7 Merge "Material-ize the restrictions pin challenge." 2014-06-10 21:32:31 +00:00
Adrian Roos
e74b853d9f resolved conflict for merge of 3ca33b70 to master
Change-Id: I5226015ca7cef030586349cc698a46e458ac788e
2014-06-11 15:02:55 +02:00
Jorim Jaggi
e6cad8027c am 5eb62efd: Merge "Do not override mColor with default color if none set" into lmp-preview-dev
* commit '5eb62efd935399335ee2504a483900c69a45494a':
  Do not override mColor with default color if none set
2014-06-11 12:41:45 +00:00
Sreeram Ramachandran
cc91c7b804 Add a new IpPrefix class and use it in RouteInfo.
This change uses IpPrefix only in the public API and continues
to use LinkAddress for everything else. It does not change the
callers to use the new APIs, with the exception of changing
all current uses of getDestination to getDestinationLinkAddress
to make room for the new getDestination method that returns an
IpPrefix.

Based on Sreeram's earlier change:
https://googleplex-android-review.git.corp.google.com/#/c/477874/
but a bit simplified and with a bit more documentation.

Bug: 15142362
Bug: 13885501
Change-Id: Ib4cd96b22cbff4ea31bb26a7853989f50da8de4e
2014-06-10 14:30:15 -07:00
Christopher Tate
e9ed3707b2 Merge "Out with the old; in with the new" into lmp-preview-dev 2014-06-10 21:27:54 +00:00
Calin Juravle
16719591f4 Merge "Shrink profiler.start-immediately to fit in the maximum property size" 2014-06-10 21:26:11 +00:00
Calin Juravle
994cd28e72 Shrink profiler.start-immediately to fit in the maximum property size
Change-Id: I25f24f5e5b128aa6a300bdc1008427451bd9cecf
2014-06-11 18:21:41 +01:00
Jose Lima
583b6f782c Merge "Make convertToTranslucent a public method in Activity" into lmp-preview-dev 2014-06-10 21:25:11 +00:00
John Spurlock
6ab89e28cd Merge "Saver: Shared resource update and new settings." into lmp-preview-dev 2014-06-10 21:22:41 +00:00
Jorim Jaggi
ce3d6c4c02 Merge "DO NOT MERGE: Fix paddings for user switch and status bar icons." into lmp-preview-dev 2014-06-10 21:21:32 +00:00
Adrian Roos
2643de55d3 Merge "Update security method after switching user" 2014-06-10 21:21:32 +00:00
Jorim Jaggi
a5c1506313 am dc61882e: Merge "Fix black background for auto-redacted legacy notifications" into lmp-preview-dev
* commit 'dc61882ef03a25f7861aff838577ef124a8f40e7':
  Fix black background for auto-redacted legacy notifications
2014-06-11 11:25:07 +00:00
Adrian Roos
1ab15ca80b am c77c504e: Merge "Fix broken tablet layout of QS on lockscreen" into lmp-preview-dev
* commit 'c77c504ed7a155a80291f8b54c8e3db6f5303d30':
  Fix broken tablet layout of QS on lockscreen
2014-06-11 11:25:00 +00:00
Doug Zongker
f27c27c20c am 68adbeb1: (-s ours) Merge "hide RECOVERY permission from L preview -- DO NOT MERGE" into lmp-preview-dev
* commit '68adbeb1348501dfd7677bf6c04e317127f5f851':
  hide RECOVERY permission from L preview -- DO NOT MERGE
2014-06-11 11:24:54 +00:00
Selim Cinek
1352ef562f am 02f94e07: Merge "Fixed several bugs with redaction." into lmp-preview-dev
* commit '02f94e073838c4b58b01d4dbba7b8f60ce01b49c':
  Fixed several bugs with redaction.
2014-06-11 11:24:49 +00:00
Selim Cinek
9e5ed535a4 am 0f700f8c: Merge "Fixed an issue where holes in the notification shade could appear." into lmp-preview-dev
* commit '0f700f8c65979609242d3a18db412a0ce561eccb':
  Fixed an issue where holes in the notification shade could appear.
2014-06-11 11:24:44 +00:00
Nicolas Prevot
0cc9c1e9d3 Merge "Changing the value of the user consent extra in DevicePolicyManager." 2014-06-10 21:31:35 +00:00
Jessica Hummel
fe1de89fe9 am 3d5066de: Merge "Add different resolutions of afw icons" into lmp-preview-dev
* commit '3d5066de154193cc3a08a7be168aa5e31bfe0359':
  Add different resolutions of afw icons
2014-06-11 09:55:17 +00:00
Jessica Hummel
9c9fc7e536 am f65d5b41: Merge "Updating the pictures and labels for cross-profile intents." into lmp-preview-dev
* commit 'f65d5b41bb382a93be752076a2c0d8bd8a2cb012':
  Updating the pictures and labels for cross-profile intents.
2014-06-11 09:55:11 +00:00
Selim Cinek
45f904a529 resolved conflicts for merge of b38fd3d4 to master
Change-Id: Iaa87cdad76e1fa08d93185fd537f3d2783346c8e
2014-06-11 11:45:24 +02:00
Nicolas Prevot
eeaf164bea Merge "Correcting a bug related to Uri permissions." into lmp-preview-dev 2014-06-10 21:18:16 +00:00
Nicolas Prevot
f233a7b8b2 Correcting a bug related to Uri permissions.
Making sure that an app cannot hold a permission for a uri on another user.
We were allowing apps to hold permissions for a different user, which should not be the case for privacy reasons (an app could just access apps on another profile)

As a consequence some of the cross profile share intents were not working because a check for the permission returned true so we did not separately grant permissions for uris. Granting permission for uris is required for accessing the content providers across users.

BUG: 15559256

Change-Id: I70765eb659151ce0c5af06075a844143c09429e8
(cherry picked from commit e55e0a1741b9258af77e23e16aa95a6d9e6a5c6f)
2014-06-11 17:46:43 +00:00
Selim Cinek
bbd2909d52 Merge "Fixed a racecondition which could lead to invisible backgrounds" into lmp-preview-dev 2014-06-10 21:18:16 +00:00
Selim Cinek
a32ab60bb0 Fixed a racecondition which could lead to invisible backgrounds
Notification backgrounds could become invisible when doubletapping
a permanent notification.

Bug: 15545215
Change-Id: I799439a368701042b39ca47bcac6fcce281349a7
2014-06-11 15:46:59 +02:00
Calin Juravle
2f84b69bf5 Merge "Improved profile.start-immediately comment" 2014-06-10 21:16:15 +00:00
Jonathan Dixon
3a5cf3876c Add WebChromeClient.showFileChooser
Bug: 6930981

This replaces the never-published openFileChooser, and is more future
extensible.
Currently hidden; will unhide once working end to end and tested.

Change-Id: Ie66750be37e5b90e4a411cec76278369dc8dabe8
2014-06-10 13:58:07 -07:00
Florin Malita
b85056018b Pass full matrix + clip save flags to the native SkCanvas.
With granular state flags being deprecated, always pass full
save flags to the native canvas.

Legacy behavior is emulated in NativeCanvasWrapper, with a focus
on minimizing the overhead when there are no side effects to be
persisted.

Change-Id: Ifdad2ff9bb3a1f9736c6c41afc9ec6c07f62320e
2014-06-10 16:55:00 -04:00
Jose Lima
5517ea78eb Make convertToTranslucent a public method in Activity
- Changed the access level for convertToTranslucent in Activity
   to public.
   - Still keeping convertToTranslucent as a hidden method.

Bug: 15492979
Change-Id: I7d013541e8ed7708ce208cd4cf5d1c1d20d50e50
2014-06-10 13:40:09 -07:00
Adrian Roos
c42d33004d Update security method after switching user
Bug: 15445037
Change-Id: If296dd3ab6510c335aba7ffdce5cdd923ceada6b
2014-06-10 22:39:15 +02:00
Jorim Jaggi
80f5e3c08d DO NOT MERGE: Fix paddings for user switch and status bar icons.
Paddings approved by allysont@ for preview build.

Bug: 15540707
Change-Id: If7288d032b9625e0fbb5b657afcf680d178e63ee
2014-06-10 20:31:58 +00:00
Craig Mautner
e6d80f4ce4 Add NO_ANIMATION flag to ActivityView Intents.
Add Intent.FLAG_ACTIVITY_NO_AMINATION to all Intents passed into
ActivityView.

Fixes bug 15393526.

Change-Id: I1899a5019416109e982f0254aaba410bb1f4a38d
2014-06-10 13:31:02 -07:00
Alan Viverette
eb29d330c3 Merge "Change ripple tint to color, remove tintMode" into lmp-preview-dev 2014-06-10 20:14:30 +00:00