52319 Commits

Author SHA1 Message Date
Eric Laurent
7de8c849d7 Merge "Add SoundTrigger native service interface" 2014-06-05 21:04:09 +00:00
Alan Viverette
c954e61cd7 am 3966c960: Merge "Add defaults for caption colors and edge type" into lmp-preview-dev
* commit '3966c9604e55c9183a6d1ba8b3540add3be4434f':
  Add defaults for caption colors and edge type
2014-06-05 21:00:32 +00:00
Alan Viverette
4586b0da63 Merge "Add defaults for caption colors and edge type" into lmp-preview-dev 2014-06-05 20:37:22 +00:00
Raph Levien
2400476943 am e0ebf19c: Merge "Support for context in Minikin shaping" into lmp-preview-dev
* commit 'e0ebf19cbfa60ba3eb0891d5e8416b70b212bc36':
  Support for context in Minikin shaping
2014-06-05 20:08:57 +00:00
Raph Levien
4c25e5a1f9 am 79fbad97: Merge "Support for scaleX and skewX in Minikin" into lmp-preview-dev
* commit '79fbad97705d191f80d7af7e494ca4a5fed3a783':
  Support for scaleX and skewX in Minikin
2014-06-05 20:08:56 +00:00
Matthew Williams
38b200fe6c am 1a2f47d4: Merge "Add persistence of tasks for TaskManager & BatteryController" into lmp-preview-dev
* commit '1a2f47d4cdc0ea40dff1b88f7976d64c19d687b1':
  Add persistence of tasks for TaskManager & BatteryController
2014-06-05 20:08:54 +00:00
Raph Levien
0ead890d1c Merge "Support for context in Minikin shaping" into lmp-preview-dev 2014-06-05 19:37:08 +00:00
Raph Levien
30d3c97f29 Merge "Support for scaleX and skewX in Minikin" into lmp-preview-dev 2014-06-05 19:26:33 +00:00
Matthew Williams
3d86fd2bb9 Add persistence of tasks for TaskManager & BatteryController
Tasks are persisted only if the client has the RECEIVE_BOOT_COMPLETED
permission. This applies to both periodic and one-off tasks.
Write out task as xml, using PersistableBundle for the extras data.
Todo: Add persistable bundle to xml when ag/468207 is merged.

Also added BatteryController logic.

Change-Id: I23eeeb8b3bc6ba155e7fa4ec25857a68ee8b1567
2014-06-05 18:28:43 +00:00
Raph Levien
6bfd7e7df3 Support for context in Minikin shaping
This patch uses the Minikin's new doLayout API that supports context,
and has some simple refactoring (pass css as string rather than setting
on the Layout object) to use this api.

Change-Id: I899474f81d377f3106e95ee3eb8d0fcc44c23ac2
2014-06-05 11:01:21 -07:00
Chris Wren
38f650818a am 413edd50: Merge "Disable the attention light on devices that do not have it." into lmp-preview-dev
* commit '413edd50540a7890949c5370d18f293f2e6f8841':
  Disable the attention light on devices that do not have it.
2014-06-05 18:00:02 +00:00
Raph Levien
e95b5850ac Support for scaleX and skewX in Minikin
Passes textScaleX and textSkewX parameters, as well as paint flags from
the paint to Minikin, to support nontrivial scale and stretch of text.
Passing paint flags should minimize kerning artifacts arising from
mismatch of glyph rendering in layout and drawing.

Also, replaces unsafe snprintf to a fixed size buffer with a safe
version, which still avoids an allocation per layout operation.

This is part of the fix for bug 15186705 "Usability of the suggestion
strip in recent OTA's is severely reduced"

Change-Id: I79788383135836f4c21fb84405f36382627bf959
2014-06-05 10:57:18 -07:00
Robin Lee
d450a3a995 am 7f993419: am 3c189e02: am 271251d7: Merge "Add Environment call: get config dir for some user"
* commit '7f99341950273f5284186ea2e59a22ac71241c30':
  Add Environment call: get config dir for some user
2014-06-05 17:56:58 +00:00
Robin Lee
7f99341950 am 3c189e02: am 271251d7: Merge "Add Environment call: get config dir for some user"
* commit '3c189e02e42fba9d5be2c4f68f76620bae33618e':
  Add Environment call: get config dir for some user
2014-06-05 17:53:25 +00:00
Hui Lu
1ce7f79ddd am 26f40cc3: am 61c0f547: Merge "Add interface name for proxy network type." into klp-modular-dev
* commit '26f40cc36dc869fc8de3bf4c97de57aae0d626ca':
  Add interface name for proxy network type.
2014-06-05 17:42:17 +00:00
Hui Lu
26f40cc36d am 61c0f547: Merge "Add interface name for proxy network type." into klp-modular-dev
* commit '61c0f547339ec870d42b15e84f9628631308f22f':
  Add interface name for proxy network type.
2014-06-05 17:39:09 +00:00
Hui Lu
61c0f54733 Merge "Add interface name for proxy network type." into klp-modular-dev 2014-06-05 17:36:02 +00:00
Hui Lu
c80fa71e88 Add interface name for proxy network type.
This will make test
android.net.cts.ConnectivityManagerTest#testRequestRouteToHost pass.
Change-Id: I5a14b6d705e87018e1e2c031aaacee533536a50b

Bug: 15320910
2014-06-05 17:06:13 +00:00
Chris Wren
3af4edf572 Merge "Disable the attention light on devices that do not have it." into lmp-preview-dev 2014-06-05 16:49:13 +00:00
Chris Wren
5116a821b9 Disable the attention light on devices that do not have it.
If the attention and notificaiton light are mapped to the same
physical LED, then pulsing the attention light can turn off the
notification light. See bug for detailed discussion.

Bug: 12900389
Change-Id: I2703af23f50ecc3e92140b9843aaf340d520bce5
2014-06-05 12:38:13 -04:00
Yorke Lee
b68bf447f6 am d6138017: Merge "API changes per API review for contacts" into lmp-preview-dev
* commit 'd6138017d9d435b176dff424ff75c8e8ea298d06':
  API changes per API review for contacts
2014-06-05 15:21:22 +00:00
Yohei Yukawa
bd12056154 Merge "Trivial method renaming for notifyTextCommitted" 2014-06-05 15:20:53 +00:00
Robin Lee
6959133d84 Add Environment call: get config dir for some user
This returns a read-only directory accessible to any app running as the
same user, containing various configuration files written by the system.

Change-Id: I635de184fc285b8fef166b782bbc1ac79f8f0687
2014-06-05 14:34:23 +00:00
Kenny Guy
d0969135aa Merge "Badge notification from managed profiles." 2014-06-05 14:20:35 +00:00
Yohei Yukawa
0297051162 Trivial method renaming for notifyTextCommitted
This CL does not change existing behavior but only renames
notifyTextCommitted with notifyUserAction so that we can use
not only text commit but also other actions such as just typing
a character will be used as a trigger to update the IME
rotation order for better IME switching experience.

BUG: 7043015
Change-Id: I7f3e13a7226ef0dceee82b67e8a0d8536f7e9807
2014-06-05 23:07:05 +09:00
Selim Cinek
d467c9e543 am 995006df: Merge "Changed the default success color of the lockpatternview to white." into lmp-preview-dev
* commit '995006dfe6e41c8d986c7c7af5bb02ff23e4429a':
  Changed the default success color of the lockpatternview to white.
2014-06-05 13:45:59 +00:00
Selim Cinek
63c8b6c325 am 71ea5814: Merge "Changed the LockPatternView assets to quantum" into lmp-preview-dev
* commit '71ea5814716a191b3ab2bc9045007865cbad3e34':
  Changed the LockPatternView assets to quantum
2014-06-05 13:45:58 +00:00
Yorke Lee
8089ce7cbc Merge "API changes per API review for contacts" into lmp-preview-dev 2014-06-05 13:43:35 +00:00
Adam Connors
7283f963d3 Merge "API Review: rename FEATURE_MANAGEDPROFILES" 2014-06-05 13:07:12 +00:00
Adam Connors
551c0789bc API Review: rename FEATURE_MANAGEDPROFILES
To be FEATURE_MANAGED_PROFILES

Bug: 15025371
Change-Id: I2f818b4d8488fe7943fe5ff6051d6b1f84ca9e8c
2014-06-05 12:13:03 +01:00
Dan Sandler
138a7aea27 am 8c2079c2: Merge "Platlogo: The icon now matches the activity." into lmp-preview-dev
* commit '8c2079c2ce89bb7311f6db08f5f0d09e262d650f':
  Platlogo: The icon now matches the activity.
2014-06-05 09:47:47 +00:00
Selim Cinek
7256a852ce Merge "Changed the default success color of the lockpatternview to white." into lmp-preview-dev 2014-06-05 05:36:22 +00:00
Selim Cinek
bd8deb0e3b Changed the default success color of the lockpatternview to white.
Since it was distracting when unlocking

Bug: 13735707
Change-Id: I6b9c5baa22dc5c102f36bdf9a99390c5dd1690ba
2014-06-05 07:25:01 +02:00
Selim Cinek
35066c385f Merge "Changed the LockPatternView assets to quantum" into lmp-preview-dev 2014-06-05 05:03:11 +00:00
Selim Cinek
2cb687e7b9 Changed the LockPatternView assets to quantum
Bug: 13735707
Change-Id: Id999adbd8a4aeb3ca91fcb9957ec38ec75ff91b0
2014-06-05 06:59:08 +02:00
Craig Mautner
b6011c1c2a Merge commit '21483b9f' into manualmerge
Change-Id: If9261cc1625f9f492697fe16c21d2b71c0cc0e11
2014-06-04 20:59:13 -07:00
Craig Mautner
21483b9f0b am e34fcf8f: Merge "Add callback when ActivityView activities complete" into klp-modular-dev
* commit 'e34fcf8ff9a023641505a8decdeb1b77232d8a16':
  Add callback when ActivityView activities complete
2014-06-05 03:31:06 +00:00
Craig Mautner
e34fcf8ff9 Merge "Add callback when ActivityView activities complete" into klp-modular-dev 2014-06-05 03:28:21 +00:00
Eino-Ville Talvala
85e5f85f2e am 4b1b33ef: Merge "Camera2: Invoke onError callbacks for failure to open" into lmp-preview-dev
* commit '4b1b33eff0eabd17f1078d55188b40e9a27d047a':
  Camera2: Invoke onError callbacks for failure to open
2014-06-05 02:30:08 +00:00
Dan Sandler
c03f429b9f Merge "Platlogo: The icon now matches the activity." into lmp-preview-dev 2014-06-05 02:26:40 +00:00
Alan Viverette
e88aee8ad8 Add defaults for caption colors and edge type
BUG: 8151470
Change-Id: I4d7b75bf647aeded77b4000cdcd37e9ace46a374
2014-06-04 18:35:42 -07:00
Yorke Lee
1ca440b38f API changes per API review for contacts
* Improve documentation for REMOVE_DUPLICATE_ENTRIES
* Hide android.provider.ContactsContract.PinnedPositions, it will be
reworked and improved for L.
* Hide android.provider.ContactsContract.Preferences - we will rework
the various apps that are relying on this to use their own preferences
instead
* Remove inheritance of hidden interfaces in android.provider.Contacts

Bug: 15430304
Change-Id: I0f96e8a506083df21023f9b95655f0ce5244bdce
2014-06-04 18:16:26 -07:00
Eric Laurent
e48188ce35 Add SoundTrigger native service interface
Add JAVA framework interface for native sound trigger service.
The interface allows for:
- enumeration of sound trigger hardware modules and their properties
- load/unload sound models
- start, stop and receive recognition events on sound models.

Change-Id: I51542f38f5359ffbbf79d2cbd7c9ea1ee10c9c18
2014-06-04 17:58:56 -07:00
Craig Mautner
d94b47f3b6 Add callback when ActivityView activities complete
Users of ActivityViews can now be informed when there are no more
active activities in ActivityView by registering a callback.

Fixes bug 15330616.

Change-Id: I39d55bdb0db8b0a12ee751cdcb039b7fbb899c85
2014-06-04 17:25:49 -07:00
Eino-Ville Talvala
7fcb357811 Camera2: Invoke onError callbacks for failure to open
When the initial attempt to connect to the remote camera device fails,
fire the onError callback as documented, instead of throwing an
exception from open().

Also ensure the correct exception is sent when methods are called
while in the error state, and make sure onClosed() is called correctly
if closing the device after an initial startup error.

Bug: 14413756
Bug: 14413363
Change-Id: I0822261dad52bcd428a0c4556202f00032499990
2014-06-04 16:52:00 -07:00
Amith Yamasani
f12d4afb85 Merge "Change preference category text color for quantum" 2014-06-04 23:44:30 +00:00
Igor Murashkin
2ac6c43312 am 97b2bc9a: Merge "camera2: Change CaptureListener callbacks to include the session (api)" into lmp-preview-dev
* commit '97b2bc9a05a56dad609360f8fec1e5a51059e656':
  camera2: Change CaptureListener callbacks to include the session (api)
2014-06-04 23:42:58 +00:00
Raph Levien
47b24f9c93 am 424f369a: Merge "Turn off elegantTextHeight in quantum theme" into lmp-preview-dev
* commit '424f369a38371294fdf3fc8d769ae9ca1e790807':
  Turn off elegantTextHeight in quantum theme
2014-06-04 23:42:57 +00:00
Igor Murashkin
6e9c5cc617 Merge "camera2: Change CaptureListener callbacks to include the session (api)" into lmp-preview-dev 2014-06-04 23:31:54 +00:00
Raph Levien
cbc9a679d8 Merge "Turn off elegantTextHeight in quantum theme" into lmp-preview-dev 2014-06-04 23:28:47 +00:00