Commit Graph

42773 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
Fabrice Di Meglio
504d44bc41 am 17b4d928: am 6b64ac48: am 3a4701fa: Revert "Fix LocalePicker background"
* commit '17b4d92850ea036577ab71e17909d7a14e7f6042':
  Revert "Fix LocalePicker background"
2014-07-21 18:24:00 +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
Narayan Kamath
53777b58f3 Merge "Fix broken locale related assumptions in TextServicesManager." into lmp-dev 2014-07-17 19:51:18 +00:00
Narayan Kamath
6648dded69 Fix broken locale related assumptions in TextServicesManager.
startsWith is a bogus check unless languages match. Also, don't
assume 2 letter languages.

bug: 10090157
Change-Id: I8adda61bddc465aac261c0ce2023fa9606affe1b
2014-07-18 15:02:34 +01:00
Niels Egberts
6e7c8995dd New TtsSpan builders for types measure, time, date, digits and verbatim.
Change-Id: I60022aa72c64f454261a0b69c21c45ce6351b9e7
2014-07-18 16:36:11 +01:00
Niels Egberts
f976abe700 Merge "Add builders for TtsSpans of type ordinal, decimal and fraction." into lmp-dev 2014-07-17 19:45:26 +00:00
Niels Egberts
a896363400 Add builders for TtsSpans of type ordinal, decimal and fraction.
Also document the possibility to give phone numbers in parts.

Change-Id: Ie1cdf56cc3b6c221c9410fb02dcba2568ea337b7
2014-07-18 13:43:22 +01: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
Yorke Lee
158c5e41d4 Add call log entries to all currently running users
When a call log entry is inserted by Telecomm as the primary user,
insert the entry for all other currently running users as well.

Bug: 16298776
Change-Id: Ie48049d7e1847bff03d4f96eb644d27b8dd0c1cd
2014-07-21 09:54:34 -07: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
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
John Spurlock
9bc41d44d6 Merge "Add audioAttributes to Notification." into lmp-dev 2014-07-17 19:13:40 +00:00
John Spurlock
c0650f02b8 Add audioAttributes to Notification.
@deprecate the old audioStreamType-based metadata in favor
of attribute-based replacements.

Bug:16401631
Change-Id: I2c140f87dd4ad2141c6c0a6f391877c295973866
2014-07-19 13:22:39 -04:00
Adam Powell
b72be59a6a Add nested pre-fling for nested scrolling
Nested pre-fling allows a nested scrolling parent to consume a fling
operation before the child view does. If a parent has been consuming
nested pre-scroll events in a particular direction, this is generally
a good indication that it should also consume the resulting fling at
the end.

Bug 15538504

Change-Id: I88e8753a96c9b41815c3be530cafab8345164e64
2014-07-17 11:37:59 -07: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
Ben Murdoch
dc00a84af1 Update WebViewUpdateService to receive PACKAGE_REPLACED broadcast.
This allows the WebViewUpdateService to receive notifications that
an update has been installed and we need to trigger recreation of
the relro file.

bug: 16329377
Change-Id: I088e61487416add997995db304beca0cde71390c
2014-07-17 21:18:40 +00:00
destradaa
6ccb5f894e Merge "Fix exceptions in ActivityRecognition platform stack." into lmp-dev 2014-07-17 18:11:21 +00:00
Zhijun He
83159151f6 Camera2: replace partial quirks with normal partial result
Change-Id: I56550748478bf0aa1a7bf9a350b4fdc7bbd6af86
2014-07-17 20:08:32 +00:00
destradaa
3b0224dc3c Fix exceptions in ActivityRecognition platform stack.
b/16348349

Change-Id: I1f85283c86130b86389a1be7da49904658b0558c
2014-07-17 11:09:46 -07:00
Chris Craik
6712495297 Merge "Simplify ViewRootImpl's AttachInfo usage" into lmp-dev 2014-07-17 18:05:14 +00:00
Chris Craik
d36a81f392 Simplify ViewRootImpl's AttachInfo usage
Change-Id: I4230e95ed5a52c8c5fae7d7b8d58827925db13ba
2014-07-17 11:14:15 -07:00
Ruben Brunk
40001f5dac camera2: Fix swapped Face detection commands.
Bug: 16343647
Change-Id: I06186b1d6a2ef5d73d2e22759e947156d43cab3f
2014-07-17 18:04:42 +00:00
Dianne Hackborn
8ca1fdc10b Merge "Fix issue #16400873: Apps that show ads as new tasks stay in recents..." into lmp-dev 2014-07-17 17:59:02 +00:00
Dianne Hackborn
13420f2311 Fix issue #16400873: Apps that show ads as new tasks stay in recents...
...even when I hit back or close the activity in UI

Change the semantics of NEW_DOCUMENT to have the recents entry be
removed by default when its activity is finished, with various ways
to explicitly turn off this behavior.

Change-Id: Idc717706d27de80f28b53ad76f9e375d85118d71
2014-07-20 15:58:11 -07:00
Jean-Michel Trivi
89c3b29a9b Rename USAGE_NOTIFICATION_TELEPHONY_RINGTONE
AudioAttributes: rename USAGE_NOTIFICATION_TELEPHONY_RINGTONE to
  USAGE_NOTIFICATION_RINGTONE in the list of usage values.
Temporarily keep the old definition to prevent transient build
  breakages, will be removed after telephony packages have been
  updated.

Bug 16401631

Change-Id: I9398443fd7ba3c30e9d371c5c5a2934b9ea6f30a
2014-07-20 20:58:47 +00:00
Jeff Brown
f6d466895b Allow dreams to wake up gently.
This change adds a new DreamService.wakeUp() method to allow a
dream to wake itself up gently and perform a transition before
finally finishing.  The power manager will ask a dream to wake
up gently in most cases but may force it to happen immediately
when necessary.

If the dream takes too long to finish itself then the dream
controller will douse it with water summarily after 5 seconds.

Change-Id: Ib0564c5650cd5a454e1acc5aa91fe46995eecfa7
2014-07-18 21:56:08 -07:00
Brian Attwell
891f5b2638 Merge "Mark social APIs stream APIs as deprecated" into lmp-dev 2014-07-17 17:59:02 +00:00
Brian Attwell
bdb13c8c07 Mark social APIs stream APIs as deprecated
Bug: 14490632
Change-Id: I6b54613514e52f34cfcc37d25493a7ea7d636a86
2014-07-18 10:43:31 -07:00
Jeff Brown
a37900658b Merge "Add glance sensor for doze mode." into lmp-dev 2014-07-17 17:59:02 +00:00
Jeff Brown
241e70d607 Add glance sensor for doze mode.
Change-Id: I66d11a1f032017b16d3f57fa60699a02d67ad5f1
2014-07-17 18:19:53 -07:00