188751 Commits

Author SHA1 Message Date
Miao Wang
133911095c am 2b300a99: am 782b4339: Merge "[RenderScript] typo fix in Allocation.java"
* commit '2b300a99bbb133090b7ec39e64dd65ba2bb8f18d':
  [RenderScript] typo fix in Allocation.java
2015-04-16 02:32:59 +00:00
Miao Wang
2b300a99bb am 782b4339: Merge "[RenderScript] typo fix in Allocation.java"
* commit '782b43394ef48e7cf8e75404c534a46074d42d4e':
  [RenderScript] typo fix in Allocation.java
2015-04-16 02:21:37 +00:00
Miao Wang
782b43394e Merge "[RenderScript] typo fix in Allocation.java" 2015-04-16 02:03:32 +00:00
Raph Levien
7400df9487 Merge "Add left and right indent arrays to TextView" 2015-04-16 02:00:03 +00:00
Raph Levien
e319d5a362 Add left and right indent arrays to TextView
In support of layout of paragraphs to non-rectangular regions, add
arrays for left and right indents to TextView, along with supporting
StaticLayout builder setters.

Bug: 20182243
Change-Id: I015bcef8f258c89001fcf8a54c179d2dfc0d7943
2015-04-15 18:57:53 -07:00
Adrian Roos
81af4733b5 Merge "Fix lockscreen bugs with SHOW_WHEN_LOCKED" 2015-04-16 01:50:22 +00:00
Adrian Roos
f253eeb9d3 Fix lockscreen bugs with SHOW_WHEN_LOCKED
When unlocking to a SHOW_WHEN_LOCKED activity by clicking
a notification, we don't get a the startKeyguardExitAnimation
because Keyguard is not actually going away. Instead, we start
it ourselves.

Also fixes the bug where restarting Keyguard while it's occluded
lead to an inconsistent state where the user got stuck on the
lockscreen.

Bug: 16481924
Change-Id: Iebc5bdd1287bbb81415ae01c7428850acc16c53f
2015-04-16 01:49:25 +00:00
Zheng Fu
01ea304ff0 Merge "Add setting flag to enable contact metadata syncing in CP2" 2015-04-16 01:35:40 +00:00
Deepanshu Gupta
54862febaf Update golden image for tests.
Change-Id: If07edcbfb7016a6b80f4bd00cffab494f74bfc03
2015-04-15 18:20:57 -07:00
Deepanshu Gupta
37dbb8b7f3 Update to using LayoutlibCallback.
Change-Id: Ia89d418b0d40ca8efef8968a4a2a635616b945ac
2015-04-15 18:20:56 -07:00
Deepanshu Gupta
49ce36e175 Remove implementation of deprecated method.
BridgeResources.getDrawable(int) is not needed anymore, since the super
method is deprecated and it calls the alternative
getDrawable(int, Theme), which we override.

Change-Id: I00c0bfaef6c4167a787bb74990b91cebb951c847
2015-04-15 18:20:55 -07:00
Deepanshu Gupta
9ca9774726 Add @empty support.
Bug: http://b.android.com/162428
Change-Id: Id7a981de2fce21213e12cdabcce4104f146fd4d3
2015-04-15 18:20:47 -07:00
John Spurlock
a419dd1616 Merge "Zen: Add notification policy management api." 2015-04-16 01:19:27 +00:00
Wale Ogunwale
4ff26a7de4 Merge "Updated javadoc for persistRootOnly attribute." 2015-04-16 01:18:00 +00:00
Andres Morales
4062c69d9a Merge "Make CryptoObject constructor public" 2015-04-16 01:08:44 +00:00
Wei Jia
0feab71799 MediaSync: pass the error code of setPlaybackRate from native code to JAVA.
Bug: 19666434
Change-Id: I9c892b1e487b3bcdce49ff067e42995194cf6585
2015-04-15 18:06:08 -07:00
Ronghua Wu
a05b54ff8f Merge "media: add reason to CodecException ctor." 2015-04-16 01:04:33 +00:00
Ronghua Wu
9e9ec943ce media: add reason to CodecException ctor.
Bug: 19620911
Change-Id: I3e9d1824c438253e9a7c303478f3cb75d0bb5c75
2015-04-15 18:00:52 -07:00
Miao Wang
179e8b5351 [RenderScript] typo fix in Allocation.java
Change-Id: Id0eae76387d18c5bfed6cdbb52781b0dc3e4ae90
2015-04-15 17:44:32 -07:00
Craig Mautner
556a4d2397 Merge "Fix build." 2015-04-16 00:37:38 +00:00
Jason Sams
a217d69d05 Merge "Hide array allocation" 2015-04-16 00:35:23 +00:00
Jorim Jaggi
9e682ee383 Make CryptoObject constructor public
Change-Id: I9bfedd5113af7b4717194d99c7c9898753ea2ebd
2015-04-15 17:32:42 -07:00
Alex Klyubin
a0d2dddc55 Remove IV auto-generation workaround.
This workaround prevents use of keys with randomized encryption
(IND-CPA). Since randomized encryption is on by default, it's better
to keep it working and break non-randomized encryption (until
Keymaster is fixed).

Bug: 18088752
Change-Id: I4b11ce72cff705be41d3e66f28b507d6ddc1da79
2015-04-15 17:20:23 -07:00
Yoshiki Iguchi
b1a3946712 Merge "TextView.extractText should not crash with null arguments" 2015-04-16 00:19:03 +00:00
Alex Klyubin
37d81d035c Add IV-related Keymaster error codes.
Bug: 18088752
Change-Id: I08daede713f945ad7dd0b21cc41ee12c15d94bad
2015-04-15 17:18:19 -07:00
Jason Sams
d016266de2 Hide array allocation
Not done for feature complete

Change-Id: I79c8da2c7e64d6feb660c9652688f971535c1f92
2015-04-15 17:18:10 -07:00
Jay Shrauner
596b8899af Merge "Hide getUserSelectedOutgoingPhoneAccount" 2015-04-16 00:16:46 +00:00
Craig Mautner
a8af4ab2b2 Fix build.
Change-Id: I46173df41fcfe44e44e030893bf60a8398c2c7f0
2015-04-15 17:15:35 -07:00
Wale Ogunwale
d4172f7739 Updated javadoc for persistRootOnly attribute.
To include information about task relinquishing identity.

Bug: 17618255
Change-Id: I94965fc213769b21ad70a22f3d3b603084054357
2015-04-15 17:05:58 -07:00
Zheng Fu
31ce78c62e Add setting flag to enable contact metadata syncing in CP2
Bug:20269816
Change-Id: Ie0906c03d888f57bb0a09a2bebd7b161c797792e
2015-04-15 17:05:52 -07:00
Chris Watkins
4eaa293808 Unhide the android.media.[Media]DataSource interface.
This allows apps to implement MediaDataSource, which is modeled on
stagefright's DataSource, to supply media data to the framework. This
was already implemented for MediaExtractor, but it was renamed from
DataSource.

MediaExtractor, MediaPlayer and MediaMetadataRetriever each have a new
overload: #setDataSource(android.media.MediaDataSource)

Only NuPlayer supports this new data source.

The change introduces:
 * IDataSource:        The binder interface for DataSource.
 * JMediaDataSource:   The native counterpart to the java interface. It
                       implements IDataSource.
 * CallbackDataSource: A stagefright DataSource that wraps an IDataSource.

Change-Id: I6d9c1167b4a7384c469b1e928f31791a7ebed716
2015-04-15 16:33:15 -07:00
Tim Murray
ef532f8435 am 3d9c9093: am 91d2f27b: am 7f72f747: Merge "Add BNNM intrinsic."
* commit '3d9c9093d1d76d4aeb5f99b1746b65788c72736e':
  Add BNNM intrinsic.
2015-04-15 23:15:13 +00:00
Jorim Jaggi
1058d6328a Merge "Fix VoiceInteraction permission issues" 2015-04-15 23:09:21 +00:00
Tim Murray
3d9c9093d1 am 91d2f27b: am 7f72f747: Merge "Add BNNM intrinsic."
* commit '91d2f27bc7dad2232d3f59c71f1402b86cb9f514':
  Add BNNM intrinsic.
2015-04-15 23:04:41 +00:00
John Reck
4bd981ec53 Remove Bitmap#getSkBitmap
Change-Id: Ifb9047b426122d3e5a445eb7a0eb3fce38dedf27
2015-04-15 15:56:12 -07:00
Jorim Jaggi
053dee7928 Merge "More fingerprint API's for 3rd party apps" 2015-04-15 22:56:09 +00:00
Jay Shrauner
225ccadc03 Hide getUserSelectedOutgoingPhoneAccount
Bug:20224972
Change-Id: I21528788e38817f77fc68b56e26a33ac726d39e2
2015-04-15 15:51:15 -07:00
Tim Murray
91d2f27bc7 am 7f72f747: Merge "Add BNNM intrinsic."
* commit '7f72f74766fed73ae9816fec6031a199f70d1428':
  Add BNNM intrinsic.
2015-04-15 22:50:11 +00:00
Craig Mautner
7a18d08252 Merge "Add tests for android:lockTaskMode." 2015-04-15 22:46:36 +00:00
Craig Mautner
41014801d1 Merge "Introduce android:lockTaskMode" 2015-04-15 22:45:46 +00:00
Jorim Jaggi
b09f8e29dd Fix VoiceInteraction permission issues
Change-Id: Id3796066353a6d7799ae983d18e6adc38c8cef52
2015-04-15 15:41:07 -07:00
Tim Murray
7f72f74766 Merge "Add BNNM intrinsic." 2015-04-15 22:30:14 +00:00
Jorim Jaggi
2aad7ee245 More fingerprint API's for 3rd party apps
- Make isHardwareAvailable public
- Add hasEnrolledFingerprints so apps can check whether to show
fingerprint UI or not.

Change-Id: Iaefd5e9e68bf3bee8305574dc1477ea9bc72b30a
2015-04-15 14:55:43 -07:00
Selim Cinek
dc3e29c390 Merge changes from topic 'headsup'
* changes:
  Finishing up heads up changes
  Added the heads up scrim back
  Fixed a bug where a notification could not be collapsed
  Made ranking consistent with heads Up manager
  Fixed a bug where the intrinsic height was not updated
  Fixed more heads up bugs
  More Heads Up bug fixes
  Adapted the interpolator of the heads up appear motion
  Treating headsUpViews now as real notification citizen
  Handling a few more border cases with HUNs
  Integrate Heads-up notifications into the shade
  Fixed a bug with notification clipping
2015-04-15 21:44:03 +00:00
Alex Klyubin
e35cefbf23 Document usesCleartextTraffic app-level attribute.
This updates the documentation of the application element of
AndroidManifest.xml to mention the new android:usesCleartextTraffic
attribute.

This also updates the Javadoc of
android.security.NetworkSecurityPolicy and ApplicationInfo to match.

Bug: 19215516
Change-Id: I5c221b56addae8988b4db51994d18ae379d0fbe3
2015-04-15 14:37:05 -07:00
Christopher Tate
95729c1398 Merge "Remember to skip the no-backup dir during recursions" 2015-04-15 21:36:36 +00:00
Roozbeh Pournader
4736010139 Fix various conformance issues with TextDirectionHeuristics.
1. The algorithms no longer consider directional embeddings and
overrides as strong characters.

2. The algorithms are updated to Unicode 7.0, and consider the
directional isolates in determining the direction of input.

3. Codepoints are used instead of code units for looking up bidi
properties.

4. The bidi direction of unassigned characters is considered.

Bug: 20142480
Change-Id: I9be161c112b8f23565ed8961bb7d44ced234f67a
2015-04-15 14:34:59 -07:00
Christopher Tate
e32da05d94 Remember to skip the no-backup dir during recursions
Change-Id: I34c46f9b23cd0ddfa2392e953d8d8cc03bcea5a8
2015-04-15 14:32:34 -07:00
Craig Mautner
2ad0bb46a4 Add tests for android:lockTaskMode.
Android app to exercise the new attribute.

For bug 19995702.

Change-Id: I0794301a6b677ec6367dd3ad99a40b5d3f9f1d7c
2015-04-15 14:27:56 -07:00
Craig Mautner
15df08abd8 Introduce android:lockTaskMode
The ability for tasks to be started in locktask mode or pinned is
dependent on the value of android:lockTaskMode for the root activity
of the task.

For bug 19995702

Change-Id: I514a144a3a0ff7dbdd4987da5361b94bdfe9a437
2015-04-15 14:27:56 -07:00