188509 Commits

Author SHA1 Message Date
Joe Fernandez
110020229e am 5b6e91a6: am af5f2000: Merge "docs: Add Cross-References to Material Design Spec" into lmp-docs
* commit '5b6e91a6717c4d6aa34adbbb2f2b5d6625c0802d':
  docs: Add Cross-References to Material Design Spec
2015-04-14 20:14:32 +00:00
Joe Fernandez
5b6e91a671 am af5f2000: Merge "docs: Add Cross-References to Material Design Spec" into lmp-docs
* commit 'af5f200038d377033a5c22e6f93bc49a9e67444d':
  docs: Add Cross-References to Material Design Spec
2015-04-14 20:04:56 +00:00
John Spurlock
1740c625c6 Merge "Zen: Enter alarms only on volume down from vibrate." 2015-04-14 20:00:42 +00:00
John Spurlock
691ae9dc25 Merge "Zen: Add new user introduction msg for "Priority only"." 2015-04-14 20:00:22 +00:00
Alex Klyubin
ecfda06461 Merge "Make specifying self-signed cert parameters optional." 2015-04-14 19:59:03 +00:00
Alex Klyubin
67d21aef98 Make specifying self-signed cert parameters optional.
This removes the need to specify the three parameters of the
self-signed certificate (serial number, subject, validity range) when
generating key pairs in AndroidKeyStore. This is achieved by
providing sensible defaults for these parameters:
* serial number: 1
* subject: CN=fake
* validity range: Jan 1 1970 to Jan 1 2048.

Bug: 18088752
Change-Id: I5df918b1ef8b26ed3ddd43828c4c78c9fa58cd43
2015-04-14 12:56:17 -07:00
Joe Fernandez
af5f200038 Merge "docs: Add Cross-References to Material Design Spec" into lmp-docs 2015-04-14 19:55:36 +00:00
Joe Fernandez
49ca2de88a docs: Add Cross-References to Material Design Spec
Change-Id: I6945f2234beb21b368a64ecad7a1680447310d5c
2015-04-14 12:53:12 -07:00
Hiroshi Yamauchi
f8a713309a am d9e0abdf: am 04143fdd: am e38ee9df: Merge "Add Debug.getRuntimeStat()."
* commit 'd9e0abdf85ad11a9689d3ded79745fe318e82971':
  Add Debug.getRuntimeStat().
2015-04-14 19:48:19 +00:00
Svetoslav
a3756407a6 Merge "Mark the SUBSCRIBED_FEEDS_READ/WRITE permissions removed." 2015-04-14 19:39:01 +00:00
Hiroshi Yamauchi
d9e0abdf85 am 04143fdd: am e38ee9df: Merge "Add Debug.getRuntimeStat()."
* commit '04143fdd55196886e5dbf1a1c7fe334115e81a42':
  Add Debug.getRuntimeStat().
2015-04-14 19:37:56 +00:00
Svetoslav
1441fc73e8 Mark the SUBSCRIBED_FEEDS_READ/WRITE permissions removed.
These permissions are definded by the platform to protect the
subscribed feeds provider which is not in the system, neither
is its contract specified in the system. Both the contract and
the implementation of the provider are in GmsCore. Hence, this
permissions shuld be declared by GmsCore, not the system. Until
GmsCore adds the permissions we have to keep this as removed
but present in the implementation to keep apps that use the
provider working.

bug:20192150

Change-Id: I3f38b01a159bb430c30948b14de7cdaf5cb50772
2015-04-14 12:37:04 -07:00
Zheng Fu
5929b7b8f0 Merge "Add setting flag to enable new contact aggregator" 2015-04-14 19:36:43 +00:00
Yorke Lee
22244d0577 Hide Phone proximity sensor methods
Has to be done in master and not m-wireless-dev, because
m-wireless-dev doesn't contain system-api/23.txt.

Bug: 20160495
Change-Id: I910b3ecafd78c31081b38325b436b4f2b5a54c8d
2015-04-14 12:34:28 -07:00
Hiroshi Yamauchi
04143fdd55 am e38ee9df: Merge "Add Debug.getRuntimeStat()."
* commit 'e38ee9df26c93415303152ec3f6ed50d847557c8':
  Add Debug.getRuntimeStat().
2015-04-14 19:26:51 +00:00
David Christie
cfc9b6d6ab Add versioning to FLP HAL.
Retain compatibility with implementations compiled
against old headers or left unchanged from LMP.

Change-Id: I3f7cfaaf0cba8697c312940a805b053c6040caa6
2015-04-14 12:14:03 -07:00
Hiroshi Yamauchi
e38ee9df26 Merge "Add Debug.getRuntimeStat()." 2015-04-14 19:08:30 +00:00
Dianne Hackborn
ca25b8768d Merge "Fixes to idle alarm scheduling, package importance." 2015-04-14 18:43:47 +00:00
Fyodor Kupolov
a08c444d1d Merge "Display a notification for a new guest" 2015-04-14 17:43:45 +00:00
Roozbeh Pournader
80003c6e9e Merge "Add more firstStrong alternatives for textDirection." 2015-04-14 17:41:18 +00:00
Fyodor Kupolov
f4d6ad2663 Display a notification for a new guest
Display a notification for a new guest, which includes information that they
are using the device as a guest and how to remove guest.

Bug: 16956833
Change-Id: I21711949d3a80eaca47251faa6ee0cf04b5bf3e6
2015-04-14 10:36:53 -07:00
Hiroshi Yamauchi
8b5a293d09 Add Debug.getRuntimeStat().
Export runtime stats (currently GC stats) through this method.

Bug: 19825248
Change-Id: I147a0e9bc6bdfe4dc29d74e44f0af6349c51d9f8
2015-04-14 10:33:10 -07:00
Chien-Yu Chen
7681fbb98e Merge "camera2: add reprocess support" 2015-04-14 17:29:46 +00:00
Benjamin Franz
3223106dab Fix a SecurityException in setKeyguardEnabledState
A SecurityException is currently thrown when calling this API as
LockPatternUtils.isSecure requires a permission that the DO does not
have.

Bug: 19533026
Change-Id: I28bebb647e46bb631cc4fa1a7c9571eadda69086
2015-04-14 18:19:49 +01:00
Roozbeh Pournader
452d6acb80 Merge "Support more smaller scripts of Asia and Africa." 2015-04-14 17:19:24 +00:00
Yang Ni
5024f20a85 am 09339053: am 6ca1e45a: am 8704ae46: Merge "Add name to ScriptGroup2.Builder.create() method"
* commit '0933905375790eb850334b53fd6d0981bd40e007':
  Add name to ScriptGroup2.Builder.create() method
2015-04-14 17:02:33 +00:00
Dianne Hackborn
1e38382b54 Fixes to idle alarm scheduling, package importance.
- Add new API to ask the activity manager what the current
  importance of a particular package name is (along with a few
  new useful importance levels).

- Fix my last alarm manager change to actually execute the
  alarms we have now decided should run even while we are idle.

Change-Id: I1f14712b4e390770d53b185c96a1b36f6aadd687
2015-04-14 10:01:24 -07:00
Mady Mellor
b3a0660eab Merge "Use HandleView's previous offset for text selection handles" 2015-04-14 16:52:06 +00:00
Yang Ni
0933905375 am 6ca1e45a: am 8704ae46: Merge "Add name to ScriptGroup2.Builder.create() method"
* commit '6ca1e45aab5b4a1b229c6493780a04976db12817':
  Add name to ScriptGroup2.Builder.create() method
2015-04-14 16:50:22 +00:00
Yang Ni
6ca1e45aab am 8704ae46: Merge "Add name to ScriptGroup2.Builder.create() method"
* commit '8704ae464a001e17275257d19eae688ff3a28892':
  Add name to ScriptGroup2.Builder.create() method
2015-04-14 16:36:36 +00:00
Yang Ni
8704ae464a Merge "Add name to ScriptGroup2.Builder.create() method" 2015-04-14 16:15:54 +00:00
Andres Morales
317918e206 Merge changes from topic 'lss-update'
* changes:
  Add challenge to IGateKeeperService
  Wire up GateKeeper to LockSettingsService
2015-04-14 16:12:55 +00:00
Tom Hudson
34e79c1e57 Convert from glyph count to byte length
Canvas drawText* APIs are inconsistent, and this mismatch snuck through
our tests.

BUG=skia:3636
R=djsollen@google.com

Change-Id: Ibaab512c3f19df8445d582633b2748f1ec4d2902
2015-04-14 11:34:39 -04:00
Kenny Guy
4fc266bbef Merge "Display toast when screen is unlocked to a work app." 2015-04-14 14:20:45 +00:00
John Spurlock
f55b7f2fb6 Zen: Add new user introduction msg for "Priority only".
Bug: 19260237
Change-Id: I3b5785befc05685c7f676e918710fb7500221172
2015-04-14 10:18:34 -04:00
Chet Haase
575217fc3d Make ActionBar animations work correctly
Previous ActionBar animations didn't handle configuration changes
or other situations in which the view would get detached. listeners
would stay on the view and would attempt to do something nonsensical
in the new window. This new approach removes listeners on window
detach to avoid this problem.

Issue #20125407 Settings Crashes when changing orientation of device

Change-Id: I0b3bbd0f6fc23cdb4cbd646b0d2772d72d3d795d
2015-04-14 14:09:26 +00:00
John Spurlock
b02c744f05 Zen: Enter alarms only on volume down from vibrate.
And vice versa (when dialog is showing).

Also make alarms only the default mode when DND is switched on
via the switch.

Bug: 19260237
Change-Id: I16e4a27944bc8245bb2beed84c0421d493b0b876
2015-04-14 09:36:28 -04:00
Kenny Guy
de77be6311 Merge "Show a status bar icon for managed profile activities." 2015-04-14 11:53:00 +00:00
Benjamin Franz
12fdfa43ce Merge "Introduce device owner API to disable the keyguard" 2015-04-14 11:12:32 +00:00
Gustav Sennton
1b4edc9068 Merge "Revert "Load WebView from one out of a list of packages."" 2015-04-14 10:59:35 +00:00
Gustav Sennton
9915eb56fe Revert "Load WebView from one out of a list of packages."
This reverts commit fe320b2fe95fc3a7aa95ca4171f8703369a54867.
We need to check in a new Webview APK first.

Change-Id: Ica6adef7a1e68c06b4c6a6a3c851f40f56b006ef
2015-04-14 10:48:05 +00:00
Erik Kline
172cf02435 am 73e056d3: am 402f2501: am 3312c6b9: Merge "Add android.net.IpPrefix#contains()"
* commit '73e056d3931b419c2653eb7365fb72b50a9a36c3':
  Add android.net.IpPrefix#contains()
2015-04-14 09:58:38 +00:00
Benjamin Franz
e36087e5b6 Introduce device owner API to disable the keyguard
Let the device owner disable the keyguard to achieve undisturbed single
use mode with multiple apps. Calling this API has no effect if a
password
has been set for the calling user.

Bug: 19533026
Change-Id: I6b726b7f36efb669359e9da4b7e3db1f8031dad5
2015-04-14 10:58:36 +01:00
Gustav Sennton
75f4b76638 Merge "Load WebView from one out of a list of packages." 2015-04-14 09:46:10 +00:00
Erik Kline
73e056d393 am 402f2501: am 3312c6b9: Merge "Add android.net.IpPrefix#contains()"
* commit '402f2501ac73adba86ec3973ef81e6911fbcd564':
  Add android.net.IpPrefix#contains()
2015-04-14 09:44:25 +00:00
Chris Banes
36344a90c2 Unhide PopupWindow window layout type calls
BUG: 20172711

Change-Id: I31bacf840908f77d2be96a6b10df495e30f0af07
2015-04-14 10:44:14 +01:00
Erik Kline
402f2501ac am 3312c6b9: Merge "Add android.net.IpPrefix#contains()"
* commit '3312c6b9f3e9c83865eeec2af609338ce74a0a10':
  Add android.net.IpPrefix#contains()
2015-04-14 09:29:56 +00:00
Keisuke Kuroyanagi
ed2eea1bfc Fix crash when ellipsize="start" is applied to short line.
Bug: 19833548
Change-Id: I05a36f00f5c7aa6f0ce1993337585f6cfc64649a
2015-04-14 18:18:35 +09:00
Rubin Xu
c9c9f7b40e Merge "Add setOtaPolicy/getOtaPolicy API in DPMS" 2015-04-14 09:16:28 +00:00
Ricky Wai
0c606812c5 Merge "Add Bluetooth Contacts Sharing policy in DevicePolicyManager" 2015-04-14 08:59:18 +00:00