Commit Graph

38675 Commits

Author SHA1 Message Date
Jeff Brown
e53b1eb276 am 5fbc6cae: am 958361e9: am 25892fe6: Merge "Allow dreams to wake up gently." into lmp-dev
* commit '5fbc6cae0c643be46de3c7c720c8e26a182514fa':
  Allow dreams to wake up gently.
2014-07-21 18:24:33 +00:00
Jeff Brown
1d95978423 am 22193893: am 610014e6: am 03fb5270: Add new Display.STATE_DOZE_SUSPEND power state.
* commit '22193893f7a79f1351caf157a8d6932e7ec3c825':
  Add new Display.STATE_DOZE_SUSPEND power state.
2014-07-21 18:24:21 +00:00
John Reck
f206ef5a58 am e5469d04: am 761e298b: am b09a6670: Return Animator instead of ValueAnimator
* commit 'e5469d0478c4319b05f569c24e21c2f0821390e4':
  Return Animator instead of ValueAnimator
2014-07-21 18:24:07 +00:00
Wei Wang
399212445e am 9d2698b3: am 6e065374: am 5cb5ae18: More API modification of BLE APIs (1/2).
* commit '9d2698b3a34618852bd88a30a54f6e608b18f14d':
  More API modification of BLE APIs (1/2).
2014-07-21 18:23:56 +00:00
Chris Craik
d5a3e217bd am 0a3bcdcc: am 7339d993: am e25d7792: Merge "Tweaks to outline API" into lmp-dev
* commit '0a3bcdccb14aa7247463aa91de1cc7e3e1ea148f':
  Tweaks to outline API
2014-07-21 18:22:53 +00:00
Adam Powell
91d67f9c7d am bd90f0ce: am 186802ac: am d0cb5fd8: Merge "Add EXTRA_REPLACEMENT_EXTRAS for ACTION_CHOOSER" into lmp-dev
* commit 'bd90f0ce2d052d2e0d753e0cc7b10a1f658b496e':
  Add EXTRA_REPLACEMENT_EXTRAS for ACTION_CHOOSER
2014-07-21 18:22:48 +00:00
Sreeram Ramachandran
5854dfed88 am 35de9295: am 5e23de19: am 4000b01f: Merge "Allow VPN interfaces to be put into blocking mode." into lmp-dev
* commit '35de92955536b6f050e4657ece2028fab67d7f7e':
  Allow VPN interfaces to be put into blocking mode.
2014-07-21 18:22:28 +00:00
Winson Chung
7bb0933698 am 01eca811: am c655f3a4: am 51b044a2: Merge "Add setting to guard the lock-to-app recents icon" into lmp-dev
* commit '01eca811404a02bcbfe01231d88fe8fa9ac57df3':
  Add setting to guard the lock-to-app recents icon
2014-07-20 02:27:30 +00:00
Amith Yamasani
f4399a0bf5 am 63ddc256: am 3d160098: am 65d3279b: Merge "Add a hidden API to expose cross profile caller id check" into lmp-dev
* commit '63ddc256dd126b11f7e6bba473c44e826ac38451':
  Add a hidden API to expose cross profile caller id check
2014-07-20 02:26:58 +00:00
Yin-Chia Yeh
76f28e03ad am ff06075b: am 372461a1: am 861dd642: Merge "Camera2: add highSpeedVideoConfig wrapper and APIs" into lmp-dev
* commit 'ff06075b8820715e62c9edbd73d13eeb4ed1095e':
  Camera2: add highSpeedVideoConfig wrapper and APIs
2014-07-20 02:26:49 +00:00
Dake Gu
60524f429e am b075ffe2: am f31b6a29: am bd497879: ActivityTransition: fix wrong width/height applied to sharedelement.
* commit 'b075ffe25fb65e037eb5c5d39298d7659e07c18d':
  ActivityTransition: fix wrong width/height applied to sharedelement.
2014-07-20 02:26:44 +00:00
Andre Eisenbach
14bfd19867 am 59d547a8: am 1f961f2c: am decb3109: Merge "Reduce GATT logging output" into lmp-dev
* commit '59d547a81c262ab8d56938b33d02ffc3442febdc':
  Reduce GATT logging output
2014-07-20 02:26:40 +00:00
Niels Egberts
0665d26aff am 8acfe168: am 860e2f9f: am 40268fc5: Merge "Add money as a new TtsSpan type." into lmp-dev
* commit '8acfe168f249073a327c835eb6d42d2b8a6b0314':
  Add money as a new TtsSpan type.
2014-07-20 02:26:35 +00:00
Adam Lesinski
78ee481583 am 30bf2ec8: am b11e7d48: am e0b92a6b: First iteration of a public UsageStats API
* commit '30bf2ec83da4cdcafabbdb46c89647a82aa1b857':
  First iteration of a public UsageStats API
2014-07-20 02:26:30 +00:00
John Reck
5f772bb2de am 5bed5cc9: am 0572b33d: am 3406fe19: Add RT-enabled reveal animator
* commit '5bed5cc982a975ba2080d719911da1758e511d2d':
  Add RT-enabled reveal animator
2014-07-20 02:26:25 +00:00
Zhijun He
4dfc7dda58 am d6d41238: am b6236012: am 3ea4b9d0: Camera2: send the partial result with onCaptureProgressed
* commit 'd6d412387d8fed4b21e177104901dd22cbd63c28':
  Camera2: send the partial result with onCaptureProgressed
2014-07-20 02:26:21 +00:00
Jim Miller
0827369def am 327d056d: am 656d09ed: am 0f6db1e8: Merge "Add DevicePolicyManager flag for fingerprint." into lmp-dev
* commit '327d056dca4cc804db27ae9591e20c7026cf1bd2':
  Add DevicePolicyManager flag for fingerprint.
2014-07-20 02:26:01 +00:00
Jeff Brown
5dc219142a Add new Display.STATE_DOZE_SUSPEND power state.
Change-Id: Ia62f4f0d25234281dc600d0b7f08b3c6a312db7a
2014-07-18 21:28:18 -07:00
John Reck
c01bd1167a Return Animator instead of ValueAnimator
Change-Id: I29a7cfdc7ffbb3a4d33f9e64f9d7ca791f5c947c
2014-07-19 02:00:15 +00:00
Wei Wang
685c175890 More API modification of BLE APIs (1/2).
Changed include:

1) Add serviceDataUuid to filter so it matches sanRecord and
AdvertiseData.
2) Add raw bytes to ScanRecord and make ScanResult take a ScanRecord
instead of raw bytes.
3) Change from setServiceUuid(List) to addServiceUuid(ParcelUuid).
4) Added include device name
5) Removed service not registered and added ADVERTISE_DATA_TOO_LARGE.
6) Fixed a few comments.

Change-Id: Ibbe07183b1293835c4a84728d1cd2d61e5d627d3
2014-07-18 18:31:00 -07:00
Dake Gu
7bf379c8af ActivityTransition: fix wrong width/height applied to sharedelement.
transform screen position/size to position/size in parent of sharedelement.
fixed bug of transformMatirxToLocal() and transformMatrixToGlobal() that gets

Change-Id: I4c7b12f1ada7004ab7594961df4079be4ca4c909
2014-07-18 22:49:57 +00:00
Adam Lesinski
0debc9aff4 First iteration of a public UsageStats API
UsageStats API that allows apps to get a list of packages that have been
recently used, along with basic stats like how long they have been in
the foreground and the most recent time they were running.

Bug: 15165667

Change-Id: I2a2d1ff69bd0b5703ac3d9de1780df42ad90d439
2014-07-18 15:24:20 -07:00
John Reck
d3de42cae8 Add RT-enabled reveal animator
Bug: 16161431

 Also re-writes RevealAnimator to avoid using any listeners internally,
 removing the logic around shadowing the update listeners.

Change-Id: I6ed8126398eed971a87f20bccb7584c9acafbb6c
2014-07-18 22:10:22 +00:00
Zhijun He
fac77c46fe Camera2: send the partial result with onCaptureProgressed
When partial results are receieved, call onCaptureProgressed instead of
onCapturePartial.

Change-Id: If97233d7b980f490821bca0a722d527f19034cd9
2014-07-18 22:01:48 +00:00
Yin-Chia Yeh
8f8141e24f Merge "Camera2: add highSpeedVideoConfig wrapper and APIs" into lmp-dev 2014-07-18 18:24:25 +00:00
Yin-Chia Yeh
12da140082 Camera2: add highSpeedVideoConfig wrapper and APIs
- Add wrapper class for highSpeedVideoConfiguration.
- Add APIs to query high speed video recording configurations in
  StreamConfigurationMap
- Fix ColorSpaceTransform unit test in CameraMetadataTest
- Fix a bug in HashCodeHelper

Change-Id: I192e57f6ab5dfbba6d958571352f067a9eaec7b2
2014-07-18 16:00:53 -07:00
Andre Eisenbach
b3db5eb4f0 Merge "Reduce GATT logging output" into lmp-dev 2014-07-18 18:24:25 +00:00
Andre Eisenbach
55d19e495e Reduce GATT logging output
Change-Id: Iefdf101ac849e45bf50c55ce5999364f5fbd24a4
2014-07-18 14:38:36 -07:00
Andre Eisenbach
6ce4db0acf LE: Add connection parameter update request API (4/4)
Change-Id: Ifb531a1b7ab05888817b96fcc89f85e17df7ffe2
2014-07-18 12:13:46 -07:00
Chris Craik
f251bde890 Merge "Tweaks to outline API" into lmp-dev 2014-07-17 21:58:28 +00:00
Chris Craik
31ba192dd2 Tweaks to outline API
b/15283203
b/16142564

Remove boolean return value chaining, as it's redundant with
the data in the Outline itself.

Change-Id: I3116e57cd1b35c98b74e95195117edd7e39fb2df
2014-07-19 00:13:59 +00:00
Adam Powell
b7fae17a03 Merge "Add EXTRA_REPLACEMENT_EXTRAS for ACTION_CHOOSER" into lmp-dev 2014-07-17 21:58:28 +00:00
Adam Powell
e49d939378 Add EXTRA_REPLACEMENT_EXTRAS for ACTION_CHOOSER
This allows the calling app to supply a set of alternative extras to
be sent along with the target intent if the user chooses specific
items from the full set available on the device. When replacement
extras have the same key as extras in the initial intent, the
replacement extras dominate.

Change-Id: I5d64c80447386f22402b71291bb289a74015d619
2014-07-18 16:27:11 -07:00
Sreeram Ramachandran
64126bc3c3 Merge "Allow VPN interfaces to be put into blocking mode." into lmp-dev 2014-07-17 21:58:28 +00:00
Sreeram Ramachandran
cc26b4cc09 Allow VPN interfaces to be put into blocking mode.
New API with stub implementation to be filled out later.

Bug: 12879610
Change-Id: Iff711994dec4598c74fe11447c8c670004c1188c
2014-07-18 16:46:13 -07:00
Winson Chung
57eea0f788 Merge "Add setting to guard the lock-to-app recents icon" into lmp-dev 2014-07-17 21:58:28 +00:00
Jason Monk
56e09b42a0 Add setting to guard the lock-to-app recents icon
Lock-to-app (soon to be screen-pinning) will now only show up once
it has been enabled in settings.

Bug: 16378448
Change-Id: Ide333463f86310eacb7a1d8b6dc7b1aea8722713
2014-07-18 16:45:34 -07:00
Jim Miller
06e345089a Add DevicePolicyManager flag for fingerprint.
Change-Id: Icb3e4b98d97487179acefabc7a3b747d3d0fa23a
2014-07-18 20:48:34 +00:00
Amith Yamasani
6bce0f739b Merge "Add a hidden API to expose cross profile caller id check" into lmp-dev 2014-07-17 21:09:48 +00:00
Amith Yamasani
570002ffd4 Add a hidden API to expose cross profile caller id check
To be used by telephony/contacts.

Change-Id: If8e06c20a708ce5e8f7d717d8758c19a78efa46d
2014-07-18 22:51:04 +00:00
Niels Egberts
5e413470e5 Merge "Add money as a new TtsSpan type." into lmp-dev 2014-07-17 19:55:10 +00:00
Niels Egberts
b1a092c772 Add money as a new TtsSpan type.
Added ARG_QUANTITY to decimal so money and measure can 'inherit' it.

Change-Id: I0f9f464d198a9875df4a01e8a5c95a3d19ed6f7f
2014-07-18 18:46:20 +01:00
Dan Sandler
5598216931 Merge "Deprecate and stop generating tickerViews." into lmp-dev 2014-07-17 19:20:15 +00:00
Dan Sandler
5fcdf6e81d Deprecate and stop generating tickerViews.
Tickers have been replaced in the UI by heads-up
notifications (and not creating the tickerView will save
memory, almost 150k if you have an xhdpi largeIcon).

Update docs to explain that tickers are just for
accessibility now.

Bug: 16395266
Change-Id: Ib1372b34c1c261f64228bbe705d174675cd007dc
2014-07-18 12:11:58 -04:00
Dan Sandler
2083deb8f9 Merge "Actually show secret notifications sometimes." into lmp-dev 2014-07-17 19:26:18 +00:00
Dan Sandler
1b71878e4e Actually show secret notifications sometimes.
Factor out the "should we be hiding sensitive data"
predicate so we get it right everywhere.

Show visibility stuff in Notification.toString().

Bug: 16307122
Change-Id: Ifd16d073c4595add2ac3582ffc0d0179e55246e5
2014-07-18 13:37:33 -04:00
Bryan Mawhinney
8a97d9dfc5 Merge "Default MediaStyled notifications to CATEGORY_TRANSPORT" into lmp-dev 2014-07-17 19:45:26 +00:00
Bryan Mawhinney
6be8de36e6 Default MediaStyled notifications to CATEGORY_TRANSPORT
This makes it easier to identify them later (e.g., for filtering).
The developer can always specify a different category if preferred.

Also fixed some javadoc related to setMediaSession()

Change-Id: I5f28514758218ff66fdbaa9fd37ccb19f12d4852
2014-07-18 10:35:12 +01:00
Jae Seo
54a4634983 Merge "TIF: Add TvParentalControlManager" into lmp-dev 2014-07-17 18:11:21 +00:00
Jae Seo
6057102dbb TIF: Add TvParentalControlManager
Each TV input service is now required to query the system whether the
user is allowed to watch the current program before showing it to the
user if the parental control is turned on, which can be checked by
calling TvParentalControlManager.isEnabled(). Whether the TV input
service should block the content or not is determined by invoking
TvParentalControlManager.isRatingBlocked() with the content rating for
the current program. Then the TvParentalControlManager makes a judgment
based on the user blocked ratings stored in the secure settings and
returns the result. If the rating in question turns out to be blocked,
the TV input service must immediately block the content and call this
method with the content rating of the current program to prompt the PIN
verification screen.

Each TV input service also needs to continuously listen to any changes
made to the parental control settings by registering a
TvParentalControlManager.ParentalControlCallback() to the manager and
immediately reevaluate the current program with the new parental control
settings.

Bug: 13172379
Change-Id: I8e1900d4b8d28c56798986d5c3906bd418ab97ac
2014-07-17 16:29:36 -07:00