Commit Graph

51469 Commits

Author SHA1 Message Date
Jose Lima
5551aca2b8 Merge "Move ContentInfoExtender from Notification.java to a support library" into mnc-dev 2015-05-04 16:29:30 +00:00
John Reck
05dc201ff6 Merge "Remove Bitmap#getSkBitmap" into mnc-dev 2015-05-04 14:34:52 +00:00
John Reck
1641c0cb0b Merge "Move AssetAtlas off of SkBitmap*" into mnc-dev 2015-05-04 14:34:39 +00:00
Tor Norbye
335f043bdb Merge "Add permission annotations on the AccountManager" into mnc-dev 2015-05-04 14:19:20 +00:00
Tor Norbye
80b530afdb Add permission annotations on the AccountManager
Also add some @NonNull and @Nullable annotations.

Change-Id: Ia42b1af21ed14691b2268ea8b0f55d1b8b5ea2a3
2015-05-04 06:29:55 -07:00
Matthew Williams
303650c9cd Add full backup criteria to android manifest
BUG: 20010079
Api change: ApplicationInfo now has a fullBackupContent int
where -1 is (off) 0 is (on) and >0 indicates an xml
resource that should be parsed in order for a developer
to indicate exactly which files they want to include/exclude
from the backup set.
dd: https://docs.google.com/document/d/1dnNctwhWOI-_qtZ7I3iNRtrbShmERj2GFTzwV4xXtOk/edit#heading=h.wcfw1q2pbmae

Change-Id: I90273dc0aef5e9a3230c6b074a45e8f5409ed5ce
2015-05-03 16:19:27 -07:00
Svet Ganov
ca030f8ed5 Merge "Add read cell broadcast app op - framework" into mnc-dev 2015-05-03 00:44:14 +00:00
Svet Ganov
ede431678e Add read cell broadcast app op - framework
Change-Id: Icecc9d918db55493ada7a0faa6bfcc41d4114bbd
2015-05-02 17:42:44 -07:00
Svetoslav
e9fc4cda50 Merge "Add camera app op - framework" into mnc-dev 2015-05-03 00:41:50 +00:00
Svetoslav
fbf0ecabac Add camera app op - framework
Change-Id: I17736a8abe2c6775e990b88fb3eab963f47167d0
2015-05-02 16:23:19 -07:00
Mike Lockwood
5ba44affe6 Merge "BluetoothMidiService: Add support for sending SysEx messages that span multiple Bluetooth packets" into mnc-dev 2015-05-02 16:09:47 +00:00
Jose Lima
4fdcc184e6 Move ContentInfoExtender from Notification.java to a support library
Bug: 20643107

Change-Id: Idabd8b0ceb4b3c63584296736e0a5015511659e7
2015-05-01 18:32:26 -07:00
Raph Levien
5c26876304 Merge "Expose StaticLayout.Builder publicly" into mnc-dev 2015-05-02 00:42:18 +00:00
Raph Levien
4bf4e4c801 Merge "Make Paint a required field of StaticLayout Builder" into mnc-dev 2015-05-02 00:41:51 +00:00
Yohei Yukawa
b6bec1a403 Remove unused methods/variables/fields from Editor.java.
This CL does nothing but remove unused code.

Change-Id: Ibe7c7aa1b9bdfd4117e27cb198082e307f4d68a4
2015-05-01 23:30:35 +00:00
Mike Lockwood
8c26d843a7 BluetoothMidiService: Add support for sending SysEx messages that span multiple Bluetooth packets
Change-Id: Id56f7c82ec97b6a46258111bbfd46ab1dc14dfe9
2015-05-01 16:16:42 -07:00
Svet Ganov
574f53793d Merge "Add body sensors app op - framework base" into mnc-dev 2015-05-01 23:09:52 +00:00
Raph Levien
531c30c62b Expose StaticLayout.Builder publicly
Expose the new Builder pattern for creating StaticLayout. This allows
access to a number of features that have been available to TextView
through a hidden constructor. Some of these features have existed
for a while (mostly maxLines), while others are new (breakStrategy,
indents).

The builder is cleaner and has a better upgrade path than the old
pattern of lots of constructors with varying numbers of arguments.

Bug: 20190561
Change-Id: Ia3cd124825ab0cb469d22d1fc576ad26454545b8
2015-05-01 15:15:48 -07:00
John Reck
7c103a36f6 Remove Bitmap#getSkBitmap
Change-Id: Ifb9047b426122d3e5a445eb7a0eb3fce38dedf27
2015-05-01 14:38:44 -07:00
John Reck
c6e2e8ff47 Move AssetAtlas off of SkBitmap*
Switched to SkPixelRef*

Change-Id: I4a1d9dc6c55c1ebcce6b0b8c585e69559e523898
2015-05-01 14:30:21 -07:00
Chris Craik
31a2d063df Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty""
Fixes breakage from HwAccelerationTest

This reverts commit b2847afde2.

Change-Id: I762b3c9020fc1d06bac61ffa8b956049147515b1
2015-05-01 14:30:15 -07:00
Chris Craik
5c705c595d Merge "Fix build." into mnc-dev 2015-05-01 21:01:14 +00:00
Chris Craik
b2847afde2 Fix build.
Revert "Merge getDisplayList and updateDisplayListIfDirty"

This reverts commit f85d064b53.

Change-Id: I8b1566aba67c385d72759ea2aea16edcd8477813
2015-05-01 21:01:01 +00:00
Svet Ganov
b9d71a6f89 Add body sensors app op - framework base
Change-Id: Idd5cd573fab3405e5b2a6e51d2d9d115650826e9
2015-05-01 13:56:04 -07:00
Chris Craik
f4ff8f701f Merge "Merge getDisplayList and updateDisplayListIfDirty" into mnc-dev 2015-05-01 20:36:22 +00:00
Chris Craik
04c0f415b5 Merge "Update alpha documentation" into mnc-dev 2015-05-01 20:36:03 +00:00
Jorim Jaggi
0629a5d524 Merge "Rename supportsAssistGesture to supportsAssist" into mnc-dev 2015-05-01 20:34:22 +00:00
Jorim Jaggi
5f560d0562 Rename supportsAssistGesture to supportsAssist
Bug: 20642759
Change-Id: Idddc786980244cc94570d04fd414540bbad60448
2015-05-01 13:33:38 -07:00
Chris Wren
b1ad8e9ea0 Merge changes from topic 'tron' into mnc-dev
* changes:
  remove unused edge border dimension.
  log clear all button
2015-05-01 18:46:42 +00:00
Alan Viverette
da0d6a6b8a Merge "Correctly handle intercepted touch events in FastScroller" into mnc-dev 2015-05-01 18:30:26 +00:00
Ruben Brunk
0f2be13dc6 camera: Update Camera2 API for arbitration.
- Update documentation for new arbitration behavior.
- Ensure an appropriate error is thrown when calling
  open while an existing, higher-priority user holds
  the camera device.

Bug: 19186859
Change-Id: I486193c14b7fd5dc6ce30c1b7471669c009d64b3
2015-05-01 18:28:13 +00:00
Fabrice Di Meglio
83bb765b04 Merge "Add IntentFilter auto verification - part 7" into mnc-dev 2015-05-01 18:27:32 +00:00
Yohei Yukawa
097d5f1073 Merge "Suggestions popup must be dismissed before device rotation." into mnc-dev 2015-05-01 18:27:05 +00:00
Fabrice Di Meglio
1de3f0dcaf Add IntentFilter auto verification - part 7
- update packages priming so that it effectively save its data
- use ArraySet instead of ArrayList for list of domains (a set
is preferable as we dont want duplicates)

See bug #19628909

Change-Id: I52085f4bc28dcbc7fbc02ba0898abcd4ae9cf1e2
2015-05-01 11:24:44 -07:00
Amith Yamasani
92d420579b Merge "Exclude bound app widgets from idle app list" into mnc-dev 2015-05-01 18:21:43 +00:00
Amith Yamasani
e4a8da8ea2 Exclude bound app widgets from idle app list
Track package names of bound app widgets and use the list when
querying for idle apps.

Bug: 20066058
Change-Id: If8039397a061ef04bb13aa38d57cd7f0221f5fc7
2015-05-01 11:17:27 -07:00
Dan Sandler
9fc943d1a6 Merge "Icon: a clean, parcelable place for images." into mnc-dev 2015-05-01 17:57:14 +00:00
Doris Liu
27cfed7ba5 Merge "Make sure transform matrix is applied when hardware layer is re-created" into mnc-dev 2015-05-01 17:54:44 +00:00
Dan Sandler
b9f7aac348 Icon: a clean, parcelable place for images.
Binder APIs which wish to consume Bitmaps *and* drawable
resources can now do so by using Icon, a kind of union type
that accommodates each of these. Icon also accepts byte
arrays holding compressed Bitmaps (PNG, JPEG, etc), which
saves clients the additional memory cost of decoding and
sending full uncompressed bitmaps through Binder interfaces.
Receiving clients can call loadDrawable{,Async} and then
getDrawable to start immediately using the image in an
ImageView or other Drawable-hosting container.

Bug: 19609468
Change-Id: Ic1343711c2ac0b15876b46f0b6008b0108a49470
2015-05-01 13:44:42 -04:00
Alan Viverette
fb99ba895e Correctly handle intercepted touch events in FastScroller
Previously we'd return true from onIntercept and assume the DOWN event
was handled, then onTouch would return false and the host view would
receive the DOWN event. Now we consume the event in onTouch.

Bug: 19080751
Change-Id: I1bd35b4c25a0760f4248ade443d09b8ca4b71e7c
2015-05-01 10:10:15 -07:00
Jeff Sharkey
a320505f3a Merge "Move both app code and data together." into mnc-dev 2015-05-01 16:22:46 +00:00
Chris Wren
9763d42c7b log clear all button
Bug: 20089768
Change-Id: I96d64c387b6085025df76c4aaf7ff9d7bdf51799
2015-05-01 11:09:26 -04:00
John Reck
78760b4ae4 Merge "A bunch more cleanups" into mnc-dev 2015-05-01 14:42:51 +00:00
Robin Lee
6e761c5d6b Merge "Device policy: use owner label instead of name" into mnc-dev 2015-05-01 12:57:37 +00:00
Narayan Kamath
a78240ba5f AlarmManager: Reject non-olson timezones for targetSdk >= M
This has caused a lot of grief, confusion and outright broken
behaviour due to the fact that the Posix spec and the Java spec
define conflicting interpretations of "custom" timezones like
GMT+5:30 (eastern hemisphere for java, western for posix).

bug: 19987403
bug: 19106773
Change-Id: Ia9b007067bb175b0805d4262f17390a0bd98d927
2015-05-01 09:39:25 +00:00
Wei Wang
f2cfe6c0a9 Merge "Fix a bug in ScanSettings constructor." into mnc-dev 2015-05-01 07:51:40 +00:00
Wei Wang
c5065ee98d Fix a bug in ScanSettings constructor.
Change-Id: I36e6effe8063bacddd61fe2c47c0360d7ffaee71
2015-05-01 00:50:32 -07:00
Gus Prevas
043d7a94ab am 12b1b8ed: am 026e204e: Fixes velocity tracking bug in SwipeDismissLayout.
* commit '12b1b8ed3b5bfe623cd69d3cdafd8b6b5dfe68d8':
  Fixes velocity tracking bug in SwipeDismissLayout.
2015-05-01 07:36:43 +00:00
Wei Wang
c90c760431 Merge "Honor Ble scanning settings from Settings UI." into mnc-dev 2015-05-01 05:10:18 +00:00
Lorenzo Colitti
b57f236e30 Merge changes Icf7d67e2,Ia914ec88,I2490ad75,Ie79f2d28 into mnc-dev
* changes:
  Add a hidden method to clear NetworkCapabilities.
  Fix javadoc error for requestNetwork.
  Simplify network callback handling code.
  Document and unhide CALLBACK_PRECHECK.
2015-05-01 03:45:14 +00:00