Commit Graph

54705 Commits

Author SHA1 Message Date
Dianne Hackborn
9d3a0efaef am b492ced8: Merge "Fix issue #22802782: APR: NPE in package manager with bad intent data" into mnc-dev
* commit 'b492ced89eaf38b2b9962dbfae2435dd242abf19':
  Fix issue #22802782: APR: NPE in package manager with bad intent data
2015-07-29 01:01:36 +00:00
Dianne Hackborn
b492ced89e Merge "Fix issue #22802782: APR: NPE in package manager with bad intent data" into mnc-dev 2015-07-29 00:45:18 +00:00
Adam Lesinski
9466fa27b1 am c96e6f19: Merge "BatteryStats: Use proper power calculator when energy data is received" into mnc-dev
* commit 'c96e6f19937ac36c8147a52863a43b35895aeb0b':
  BatteryStats: Use proper power calculator when energy data is received
2015-07-29 00:44:05 +00:00
Adam Lesinski
c96e6f1993 Merge "BatteryStats: Use proper power calculator when energy data is received" into mnc-dev 2015-07-29 00:34:38 +00:00
Dianne Hackborn
9dc6c61a80 Fix issue #22802782: APR: NPE in package manager with bad intent data
If they pass in a null data for the intent matching, don't throw up
on it, just consider it to not match.

Change-Id: I30b6af49989eb8b5c2e585ce5d96416f0daff3a8
2015-07-28 17:30:59 -07:00
Adam Lesinski
c691d3ccf4 BatteryStats: Use proper power calculator when energy data is received
We check for the presence of energy data when determining whether to use
the WiFiPowerCalculator or WiFiPowerEstimator. Since we can receive this data
later, we need to switch to the WiFiPowerCalculator if we weren't using it before.

We can't ask the hardware if it supports energy data because that would involve a call into
WiFiManagerService, which can cause a deadlock if we are holding the BatteryStatsService lock
while using this class.

Bug:22776010
Change-Id: Id685d487c56595eab1d382f49da9417a423bb517
2015-07-28 17:11:29 -07:00
Jorim Jaggi
66c3fc3854 am 0d210f63: Animation for touch, wake and unlock
* commit '0d210f6395072db4a4c53d4cb8fac4a59a3965b4':
  Animation for touch, wake and unlock
2015-07-28 23:22:59 +00:00
Jorim Jaggi
0d210f6395 Animation for touch, wake and unlock
- Add callback to inform SysUI when the screen has been unblocked
and turned on.
- Cleanup inconsistent messaging about device interactive/screen on
and off.
- Add callbacks to inform SysUI about screen states
- Implement a quick fade for the scrim after touch, wake, and unlock.
  First, start with a black scrim on top of everything, and then fade
  it out.
- Make sure we play the normal unlock animation when device is pulsing
- Override navigation bar animations for touch, wake and unlock: Fade
  in the same manner as the scrim.

Bug: 22571198
Bug: 21855614
Change-Id: I8ff08d72cced1e0f03c78d71ff710d8a4f6b848c
2015-07-28 23:02:54 +00:00
Dianne Hackborn
8b679bfa36 am 3551a59b: Merge "Work on issue #21516866: Implement voice interaction in ResolverActivity" into mnc-dev
* commit '3551a59b277fd4dc924f48116c153a50fb0913eb':
  Work on issue #21516866: Implement voice interaction in ResolverActivity
2015-07-28 19:58:52 +00:00
Robert Greenwalt
1bf3bec726 am b3c93c5f: Merge "Un-remove legacy ConnectivityManager API." into mnc-dev
* commit 'b3c93c5f4256a1da1a8020abe5812a841b67667a':
  Un-remove legacy ConnectivityManager API.
2015-07-28 19:58:36 +00:00
Dianne Hackborn
3551a59b27 Merge "Work on issue #21516866: Implement voice interaction in ResolverActivity" into mnc-dev 2015-07-28 19:52:53 +00:00
Dianne Hackborn
57dd737443 Work on issue #21516866: Implement voice interaction in ResolverActivity
The main change here is to not allow the dialog to go in to its "focus
on the last app the user selected" when running in voice interaction mode,
instead just always giving a simple list.

This also fixes some problems with cleaning up active commands when
an activity finishes and not forcing the current session to go away
when the screen is turned off.

Also added some debug help, having activity print the state of the
voice interactor.

Change-Id: Ifebee9c74d78398a730a280bb4970f47789dadf5
2015-07-28 12:52:11 -07:00
Robert Greenwalt
b3c93c5f42 Merge "Un-remove legacy ConnectivityManager API." into mnc-dev 2015-07-28 19:39:48 +00:00
Robert Greenwalt
a36c074052 Un-remove legacy ConnectivityManager API.
These were @removed too soon.  We need to keep them @deprecated until
the bulk of devices support the new API and then we can remove them.

bug:22728205
Change-Id: If1b46ff1878f1778517624112b195c461645ddd1
2015-07-28 11:41:31 -07:00
Lorenzo Colitti
8f4787e615 am e288b3af: Merge changes I5c994de5,I6cb0dd84 into mnc-dev
* commit 'e288b3af14421731d8f477b97e8d77588f20498b':
  Add a test for public bugs 2111 and 2136.
  Always check off-link connectivity in NetworkDiagnostics.
2015-07-28 01:21:36 +00:00
Lorenzo Colitti
e288b3af14 Merge changes I5c994de5,I6cb0dd84 into mnc-dev
* changes:
  Add a test for public bugs 2111 and 2136.
  Always check off-link connectivity in NetworkDiagnostics.
2015-07-28 01:03:44 +00:00
Mady Mellor
506424fc99 am beb6e668: Merge "Allow text selection handles to scroll horizontally" into mnc-dev
* commit 'beb6e66817e084c8a1ac92ecaeb6f0c73d11cc49':
  Allow text selection handles to scroll horizontally
2015-07-28 00:36:07 +00:00
Filip Gruszczynski
089f65ed1e am f63800dd: Merge "Remove unnecessary relayout call from traversals." into mnc-dev
* commit 'f63800ddcc68944532f7842b6ebf80898147ed4d':
  Remove unnecessary relayout call from traversals.
2015-07-28 00:35:39 +00:00
Mady Mellor
beb6e66817 Merge "Allow text selection handles to scroll horizontally" into mnc-dev 2015-07-28 00:16:49 +00:00
Filip Gruszczynski
f63800ddcc Merge "Remove unnecessary relayout call from traversals." into mnc-dev 2015-07-28 00:04:44 +00:00
Raph Levien
199c0b3f0e am e827c252: Merge "Allow soft hyphens in languages without patterns" into mnc-dev
* commit 'e827c2525a6b76c130d2b877fbcdcf62b0ce42eb':
  Allow soft hyphens in languages without patterns
2015-07-27 21:57:31 +00:00
Raph Levien
e827c2525a Merge "Allow soft hyphens in languages without patterns" into mnc-dev 2015-07-27 21:50:16 +00:00
Raph Levien
a00896198d Allow soft hyphens in languages without patterns
This patch sets up an "empty" hyphenator, which it uses by default
for locales in which there is no hyphenation pattern data. This has
the effect of enabling soft hyphens (U+00AD), which were otherwise
disabled, because the "no-hyphen" code path didn't consider them.

Bug: 19605972
Change-Id: I4dcb95cee8edc48495f7c38736f5abf26fa04935
2015-07-27 13:06:24 -07:00
Jorim Jaggi
d315926aec am 9e49b5d6: Merge "Move PIN/Pattern appear animation to RenderThread (1/2)" into mnc-dev
* commit '9e49b5d679672ea4a64382f9a36663c73603961b':
  Move PIN/Pattern appear animation to RenderThread (1/2)
2015-07-27 19:22:02 +00:00
Jorim Jaggi
9e49b5d679 Merge "Move PIN/Pattern appear animation to RenderThread (1/2)" into mnc-dev 2015-07-27 18:55:29 +00:00
Filip Gruszczynski
9b621a72e2 Remove unnecessary relayout call from traversals.
All the necessary information (most importantly outsets) arrives in
addWindowToDisplay that is happening a few lines earlier.

Bug: 22073222
Change-Id: I483e98808877f32812c0e959cdfc14b4e0ca5e62
2015-07-27 11:44:31 -07:00
Phil Burk
a37a1b006e am fef1b289: Merge "MIDI: fix running status parser" into mnc-dev
* commit 'fef1b28917df9a23b28ec5e5e7f83097b8574550':
  MIDI: fix running status parser
2015-07-27 17:57:01 +00:00
Phil Burk
fef1b28917 Merge "MIDI: fix running status parser" into mnc-dev 2015-07-27 17:15:04 +00:00
Tim Volodine
6c1e099146 am 91b31b53: Merge "Revert "Invoke geolocation permissions callback with denied state by default."" into mnc-dev
* commit '91b31b53127aafbf3ed34b98f405d6e750627050':
  Revert "Invoke geolocation permissions callback with denied state by default."
2015-07-27 16:57:05 +00:00
Tim Volodine
91b31b5312 Merge "Revert "Invoke geolocation permissions callback with denied state by default."" into mnc-dev 2015-07-27 16:37:57 +00:00
Tim Volodine
4961105a7d Revert "Invoke geolocation permissions callback with denied state by default."
This reverts commit 954d1333c4.

The revert is due to apps calling super.onGeolocationPermissionsShowPrompt see b/22685046

Bug: 22685046
Change-Id: I2a9f42b432a010828a0cafaee064480bb0f91cbe
(cherry picked from commit 0bb7d2e467)
2015-07-27 16:20:29 +00:00
Chris Wren
aaa2335476 am 45a0bb18: Merge "add ticker to enqueue message for easier debugging" into mnc-dev
* commit '45a0bb18fec5b137a540e160cecd4ffd091098d9':
  add ticker to enqueue message for easier debugging
2015-07-27 13:22:29 +00:00
Chris Wren
45a0bb18fe Merge "add ticker to enqueue message for easier debugging" into mnc-dev 2015-07-27 13:09:15 +00:00
Lorenzo Colitti
87cfc70b73 Always check off-link connectivity in NetworkDiagnostics.
Currently, NetworkDiagnostics only checks off-link connectivity if
one of the DNS servers is off-link. Make it check off-link
connectivity in all cases by sending probes to Google Public DNS
if off-link DNS servers are not specified.

Bug: 22569331
Bug: 22641669
Bug: 22748900
Change-Id: I6cb0dd8491bc0c1a488631deca56722b9c1d2b3f
2015-07-27 16:41:44 +09:00
Jeff Sharkey
fdda1ec30b am 8be305dd: Merge "Also check app-ops on path-permissions." into mnc-dev
* commit '8be305dd6582f154c5a5894034a35fc8ec225b71':
  Also check app-ops on path-permissions.
2015-07-25 02:21:47 +00:00
Jeff Sharkey
8be305dd65 Merge "Also check app-ops on path-permissions." into mnc-dev 2015-07-25 02:05:56 +00:00
Jeff Sharkey
0e621c3921 Also check app-ops on path-permissions.
Any place that we check permissions we also need to check any
app-ops associated with those permissions.  In the case of providers
with both <provider> and <path-permission> permissions, track and
report the strongest app-ops denial.

Bug: 22718722
Change-Id: I45e62de39b04d16d071558ad980b701667cfcb9a
2015-07-24 15:16:11 -07:00
Phil Burk
98e94aead7 MIDI: fix running status parser
Running status was being parsed incorrectly.
This could cause stuck notes or exceptions when sending running
status messages to a Bluetooth MIDI device.

Bug: 22689606
Change-Id: I9f7abce9758927be587eead9614617d5b0076353
Signed-off-by: Phil Burk <philburk@google.com>
2015-07-24 14:11:01 -07:00
Mady Mellor
42390aab46 Allow text selection handles to scroll horizontally
When selecting text and expanding the selection, the handles snap
to the end (or start) of words. The handles don't snap until the
user has moved halfway through the word.

In horizontally scrolling text views, where some of the text is
cut off, the user cannot be halfway through the word, this causes
the selection to get stuck unless the user scrolls the view and then
continues selecting.

This CL does two things:

1) Checks if the user is close to the edge of the view when the
view can scroll horizontally, and places the cursor at next offset
if available.

2) Moves the code to check if handles are crossing into own method
this should be done each time the cursor is placed and avoids the
need to duplicate the check throughout updatePosition code.

Bug: 22657879
Change-Id: Ic14cb0994cd202a897bf6532f3832bb93ed49bfb
2015-07-24 13:08:42 -07:00
Robert Greenwalt
59ddd576eb am f0bead28: Merge "DO NOT MERGE Enhance local log." into mnc-dev
* commit 'f0bead280154fd9a5d2c07b1186e10fcfeed55fc':
  DO NOT MERGE Enhance local log.
2015-07-24 20:06:24 +00:00
Robert Greenwalt
f0bead2801 Merge "DO NOT MERGE Enhance local log." into mnc-dev 2015-07-24 19:54:07 +00:00
Robert Greenwalt
dd6f844129 DO NOT MERGE Enhance local log.
to be reverted with ag/733658
bug:22632129

Change-Id: Id3899ee8e987ccc469394dd4d0c41465c48dc37e
2015-07-24 12:44:03 -07:00
Andrei Stingaceanu
da90571750 am 45794910: Merge "Disallow dragging text in extracted mode" into mnc-dev
* commit '45794910031ce2a0e2df3d1694783da7e3c4352b':
  Disallow dragging text in extracted mode
2015-07-24 14:47:50 +00:00
Andrei Stingaceanu
4579491003 Merge "Disallow dragging text in extracted mode" into mnc-dev 2015-07-24 14:35:48 +00:00
Jim Miller
a8bc790a60 am abd35bfc: Merge "Add FEATURE_FINGERPRINT to PackageManager\'s feature list" into mnc-dev
* commit 'abd35bfc81ae231656c6fba67d43cfbb76f3db0d':
  Add FEATURE_FINGERPRINT to PackageManager's feature list
2015-07-24 02:50:12 +00:00
Jim Miller
abd35bfc81 Merge "Add FEATURE_FINGERPRINT to PackageManager's feature list" into mnc-dev 2015-07-24 02:41:00 +00:00
Yohei Yukawa
0e235f4753 am 0526ee52: Merge "Don\'t rely on broadcast intent for waking up input method." into mnc-dev
* commit '0526ee529812b4fd9743aa46d87198043a59d2ab':
  Don't rely on broadcast intent for waking up input method.
2015-07-23 23:40:06 +00:00
Yohei Yukawa
0526ee5298 Merge "Don't rely on broadcast intent for waking up input method." into mnc-dev 2015-07-23 23:24:58 +00:00
Svetoslav Ganov
29e3f76669 am 607bc34f: Merge "Reset permissions and app links when clearing app preferences - framework" into mnc-dev
* commit '607bc34f93a8c074d1982861273d210291eae34d':
  Reset permissions and app links when clearing app preferences - framework
2015-07-23 22:42:42 +00:00
Svetoslav Ganov
bb8bdd7168 am 258e630a: Merge "Shut down UiAutomationConnection without a lock held" into mnc-dev
* commit '258e630a6bc876c57ac97c6da3e5414d0e7eb036':
  Shut down UiAutomationConnection without a lock held
2015-07-23 22:42:35 +00:00