52447 Commits

Author SHA1 Message Date
Yin-Chia Yeh
ffff217134 Merge "Camera2: Do not hide TonemapCurve construtor" into lmp-preview-dev 2014-06-05 23:33:38 +00:00
Zhijun He
169a149d55 am b67beb8e: Merge "Camera2: Hide input stream related key and enum" into lmp-preview-dev
* commit 'b67beb8e8b9115c1ba796a57f1bb59822e6a1ce1':
  Camera2: Hide input stream related key and enum
2014-06-05 23:21:03 +00:00
Zhijun He
f98a3c020d Merge "Camera2: Hide input stream related key and enum" into lmp-preview-dev 2014-06-05 23:15:17 +00:00
Alan Viverette
4294202648 Merge "DO NOT MERGE Change preference category text color for quantum" into lmp-preview-dev 2014-06-05 23:09:57 +00:00
ztenghui
537d7ea039 am 42decb1b: Merge "API Review: move the CreateRevealAnimator to ViewAnimationUtils" into lmp-preview-dev
* commit '42decb1bfe354923205a7cdf856f395f9070b64f':
  API Review: move the CreateRevealAnimator to ViewAnimationUtils
2014-06-05 22:39:11 +00:00
ztenghui
2050d39e08 Merge "API Review: move the CreateRevealAnimator to ViewAnimationUtils" into lmp-preview-dev 2014-06-05 22:32:41 +00:00
Raph Levien
e1c4a0d299 Make elegantTextHeight xml attribute public
The elegantTextHeight attribute of TextView was made public through
Java code, but the corresponding attribute wasn't public. This patch
makes it so.

This is a fix for bug 15428791 "elegantTextHeight is hidden (not in
android.R.attr)"

Change-Id: I7011f10ae58fd2e212da9cbaca4a484f011d8fed
2014-06-05 22:30:37 +00:00
Vinod Krishnan
b0e5bbb657 Adding a way to stub Vpn ConfirmDialog
- This is needed to pass CTS tests on the wear devices
- Related CL: http://ar/479486

Bug: 15087985

Change-Id: I56673ff6085618a03ec61031e3af0f6631cb3425
2014-06-05 15:28:50 -07:00
Aravind Akella
5271e0b890 Hide Sensor.getRequiredPermission API.
Bug: 15089664
Change-Id: Ia0f4e64a563ca409849cf53721b4836abbb0be68
(cherry picked from commit e7213150abbe33c71dbdc3295a1fa1feaafb069d)
2014-06-05 22:24:25 +00:00
Kristian Monsen
3dba0546c4 Merge "Remove unused function from the WebView statics" 2014-06-05 21:51:00 +00:00
Alan Viverette
1a81cca8ea DO NOT MERGE Change preference category text color for quantum
Use the colorAccent theme attribute.

Bug: 15384941
Change-Id: I9f98868313caf30a9658eadede23687f2eca5c9c
2014-06-05 14:34:29 -07:00
Eric Laurent
5edb85c17d Merge "add sound trigger JNI" 2014-06-05 21:04:50 +00:00
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
Florin Malita
1dc14ba388 Implement SkCanvasGlue::clipRegion() using clipPath().
(Canvas clipRegion() public API is scheduled for deprecation)

The SkCanvas clip stack does not support clipRegion() ops. Implementing
these in terms of clipPath() makes persisting clips for SaveFlags
emulation purposes a whole lot simpler.

Change-Id: I41d1eb9e292ce370fba224338f9071d5e4068621
2014-06-05 16:51:35 -04:00
ztenghui
62f30e0bb1 API Review: move the CreateRevealAnimator to ViewAnimationUtils
b/15451650

Change-Id: If270bbf757047ce7847cab457d3836d756830124
2014-06-05 13:45:15 -07: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
Zhijun He
6593acd95d Camera2: Hide input stream related key and enum
Bug: 14622091
Change-Id: Id8fc20b752da876f00a94d0262cd9468951bb36d
2014-06-05 12:49:56 -07:00
George Mount
dc21d3b280 API review: Constants to Gravity and Epicenter.
Bug 15432037

Constants for LEFT, RIGHT, TOP, BOTTOM moved to using Gravity.
Epicenter method name changed.

Change-Id: If226613794623fd50fdaf8fc61b0020d17628f68
2014-06-05 12:47:33 -07: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
Yin-Chia Yeh
83a9e4d864 Camera2: Do not hide TonemapCurve construtor
Do not @hide TonemapCurve constructor since it's also a
control key.

bug: 14628001
Change-Id: I17384f42f5c2db2371d1c09030d04a1b9637045e
2014-06-05 11:34:48 -07: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
Craig Mautner
ffcfcaadfe Implement maxRecents and fix TaskPersister bug
Activities can now set the maximum number of times that they will
appear in the recent task lists when using DocCentric mode. The
default number is 15, the min 1, and the max 100.

Also a bug in TaskPersister that deleted files because it did not
properly parse their task ids is fixed.

Fixes bug 13736052.

Change-Id: I7ccb4e6f89d6202ff31c8577bb7b9d8d1b7e5e8d
2014-06-05 10:18:48 -07:00
Kristian Monsen
638c078c87 Remove unused function from the WebView statics
Change-Id: I47c47c44d4b5b6f4a4f366affa9d110de440ade5
2014-06-05 10:14:23 -07: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
Kenny Guy
8a0101bade Badge notification from managed profiles.
Add a method to the UserManager to provide access
to bitmap of badge for managed profile.
Overlay the icon view in notification templates with
the badge from the UserManager.
Notifications with custom views won't be badged.

Bug: 12641490

Change-Id: I1f2aae927e75fc8a955e4d5bbc3cc81127d87069
(cherry picked from commit 0f4ab980227e8c298bfcd34dd85aad0febad528c)
2014-06-05 16:58:52 +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