138514 Commits

Author SHA1 Message Date
Robin Lee
3c189e02e4 am 271251d7: Merge "Add Environment call: get config dir for some user"
* commit '271251d739db12838d1521bcf885b4943e9b00b1':
  Add Environment call: get config dir for some user
2014-06-05 17:26:29 +00:00
Raph Levien
d40f746b70 Fix broken macStyle flags on Roboto-MediumItalic
This is a fix for bug 15432929 "Seeing italics instead of bold"

The Roboto-MediumItalic font had macStyle of 3 (bold italic), which
caused it to be selected as a best match for a request of just bold.
This patch changes it to 2 (italic), leaving all else unchanged.

Change-Id: Ic28934904e11ca34cfede8429520d2d87aaf84cd
2014-06-05 10:24:33 -07: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
Robin Lee
271251d739 Merge "Add Environment call: get config dir for some user" 2014-06-05 17:16:52 +00:00
Kristian Monsen
638c078c87 Remove unused function from the WebView statics
Change-Id: I47c47c44d4b5b6f4a4f366affa9d110de440ade5
2014-06-05 10:14:23 -07:00
Kenny Guy
73a41d2c4e Fix bug with sending intents to correct user for device admin.
Password change intents etc. were always being sent to
owner rather than user the device admin was installed for.
Also add TODO to not assume profile parent is OWNER.

Bug: 15442331
Change-Id: I7e58069bc4a6ab94f038ae1b80c044d666986318
2014-06-05 18:10:43 +01: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
b5acfc6c4a am 89dcfe66: Merge "A notification that emerges from Zen Mode interception should beep." into lmp-preview-dev
* commit '89dcfe66c9101a4124d121d1c8df98e5cd8b7798':
  A notification that emerges from Zen Mode interception should beep.
2014-06-05 16:51:29 +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
Eric Laurent
42cdf48b2f am e637e614: Merge "remove debug log in AudioPortEventHandler." into lmp-preview-dev
* commit 'e637e614b95eb8bb5b4d69ad5ab89ce92e4b5a29':
  remove debug log in AudioPortEventHandler.
2014-06-05 16:47:45 +00:00
Chris Wren
2d6b2f9be3 Merge "A notification that emerges from Zen Mode interception should beep." into lmp-preview-dev 2014-06-05 16:44:50 +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
Chris Wren
a344656a01 A notification that emerges from Zen Mode interception should beep.
If a notificaiton emerges from Zen Mode due to a ranking
reconsideration (possibly because a long-running query resolved an
important person) then it should get the oportunity buzz, beep, blink,
and send accessibility events.

Save what we need to know about the old notificaiton record on the new
record so we don't have to hold onto it.

Bug: 15383458
Change-Id: I15c7834fef03ff6a676e78e9d2caae24f00720ef
2014-06-05 12:38:13 -04:00
Mike Lockwood
585fc71ea7 Merge "UsbDebuggingManager: remove log spam when disconnecting USB" 2014-06-05 15:34:48 +00:00
Mike Lockwood
2471e02c19 UsbDebuggingManager: remove log spam when disconnecting USB
Bug: 15112047
Change-Id: Ia07895ee166fa87c88d0443f0745bc9384dac10c
2014-06-05 08:24:16 -07: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
Eric Laurent
a335e14b6b Merge "remove debug log in AudioPortEventHandler." into lmp-preview-dev 2014-06-05 15:18:35 +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
Adam Connors
78b245bfea Merge "Fix build break (include current.txt)" 2014-06-05 14:10:25 +00:00
Adam Connors
f9c98a7008 Fix build break (include current.txt)
I forgot to commit this... sorry.

Change-Id: I5efca4d9447f1792a095dd64210a124c29e6a917
2014-06-05 15:07:53 +01: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
Ihab Awad
8c43a55929 am 4c0c5cf9: (-s ours) Merge "DO NOT MERGE. Implement connection error dialogs (1/4)" into lmp-preview-dev
* commit '4c0c5cf919dac4708f631a29d7e7537b316e970f':
  DO NOT MERGE. Implement connection error dialogs (1/4)
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 Skory
0212c563c8 Squash unreachable catch
The compiler warning distracts me often.

Change-Id: Ia96e6c82ce1c0f1ae58f7faadbf8769b36d1f810
2014-06-05 14:38:30 +01:00
Adam Connors
7283f963d3 Merge "API Review: rename FEATURE_MANAGEDPROFILES" 2014-06-05 13:07:12 +00:00
Adam Connors
d5259c8ea5 Merge "Allow system process to call getApplicationBlockedAsUser" 2014-06-05 11:20:16 +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
Adam Connors
1a910ef2b4 Allow system process to call getApplicationBlockedAsUser
MDMs in the managed profile needs to be able to call
DPM.isApplicationBlocked without the INTERACT_ACROSS_USERS
permission. DevicePolicyManager checks for appropriate
PROFILE_OWNER permission and then removes callerId, so this
change is needed to prevent a spurious security exception.

Change-Id: Idd1bda6bb234f6cb7cb78a885ae2d7cc5cca4890
2014-06-05 12:02:04 +01:00
Jae Seo
782f734547 TIF: Address the feedback from the API review - 1/3
This change addresses the following comments from the council:
- Change TvView.setVolume() --> setStreamVolume()
- Surface only TvInputInfo.getServiceInfo() instead of the separate
  getPackage/getService/getComponent calls.  However, keep loadLabel()
  at the top level.
- @hide register/unregisterListener() for the preview, since it binds
  out to each service.
- TvInputService should document which permission it should protect
  itself with.
- Remove TvInputService.setAvailable() for third-party developers.
- Change class name TvInputSessionImpl --> Session
- Change callback name to onSetStreamVolume() to match earlier change

Bug: 15345342
Change-Id: I3ce5cba7dad2622b78d16c408f81c4b0eba837a4
2014-06-05 19:22:18 +09:00
Alexandra Gherghina
22745f4c9a Clean up deleted users in DevicePolicyManagerService
Bug: 15405715
Change-Id: Icd958fe9378deb92f25622b341e0502d865b742f
2014-06-05 11:19:29 +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
Dan Sandler
4b22bdfa84 Don't show private notifications if a secure lockscreen is merely occluded.
Bug: 15430088
Change-Id: I27187216462b5bb7d52c3f85b9444348138fd9ea
2014-06-05 03:04:34 -04: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
Ihab Awad
f73b23e7a1 Merge "DO NOT MERGE. Implement connection error dialogs (1/4)" into lmp-preview-dev 2014-06-05 05:24:38 +00: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
Justin Koh
2dbd36fc7f Add check to allow notification listener packages to post >50 notifications
Bug: 13433398
Change-Id: I77abf19982add240e1bbe8196fbe148d32884f68
2014-06-04 21:14:26 -07: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
Eric Laurent
e94379beba remove debug log in AudioPortEventHandler.
Bug: 14815883.
Change-Id: Ib5076fcfe8a36d1dd772b072fdf3400e57acc61c
2014-06-04 20:09:13 -07: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
Jungshik Jang
0f8b4b770c Implement hotplug detection sequence.
Hotplug detection is periodic operation to detect new/removed device.
In case of directly connected device fires hotplug devices
but remote devices which are plugged in hdmi switch may not
report their existence.
Hotplug action polls all devices in regular base; 5s for
system audio (only when it's active) 15s for others.

Change-Id: I77c308ecfd5d6bf92f306923fa5ac9eabdad4127
2014-06-05 10:36:35 +09:00