Commit Graph

18649 Commits

Author SHA1 Message Date
Matthew Fritze
7907bd215d Merge "resolve merge conflicts of a03a707f74 to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp 2017-08-01 00:28:57 +00:00
Matthew Fritze
57b641eee8 resolve merge conflicts of a03a707f74 to oc-mr1-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Icca7a8cc2632b35c54421cb8398c8deb4e670032
2017-07-31 17:24:17 -07:00
Eric Schwarzenbach
666d70ea76 Merge "Make only the "Add Network" WifiDialog fullscreen." into oc-mr1-dev
am: 5e888ad7b6

Change-Id: I8e6852561bba50ed44d17f52099ebf82becd5433
2017-08-01 00:17:31 +00:00
TreeHugger Robot
5e888ad7b6 Merge "Make only the "Add Network" WifiDialog fullscreen." into oc-mr1-dev 2017-08-01 00:02:38 +00:00
Matthew Fritze
a03a707f74 Merge "Add INTENT_ONLY as a ResultPayload Availibility" into oc-dr1-dev
am: 9feab7a8a5

Change-Id: I45565eb7bd6046cc20ccb223d88d1ac31a95d6b5
2017-07-31 23:50:03 +00:00
jackqdyulei
c65e873d3e Merge "Use package from sipper if default is null" into oc-dr1-dev
am: ca24d0435b

Change-Id: Idfa84fd3c07b228ddc689244b7d33ca66463d25f
2017-07-31 23:49:07 +00:00
jackqdyulei
04c28ab23c Merge "Add shadow and wrapper classes" into oc-mr1-dev
am: 1b2408433a

Change-Id: If0839d6ae74defedaa3c8dcf20fb80c1cccab46e
2017-07-31 23:48:51 +00:00
TreeHugger Robot
9feab7a8a5 Merge "Add INTENT_ONLY as a ResultPayload Availibility" into oc-dr1-dev 2017-07-31 23:48:02 +00:00
Matthew Fritze
56f5ac21a5 Merge "Fix DataUsageSummary non-indexable keys" into oc-mr1-dev
am: 2972b5c992

Change-Id: I3936a622769dbb315c9f191982cd5b74ae1c7564
2017-07-31 23:45:31 +00:00
TreeHugger Robot
1b2408433a Merge "Add shadow and wrapper classes" into oc-mr1-dev 2017-07-31 23:44:43 +00:00
TreeHugger Robot
ca24d0435b Merge "Use package from sipper if default is null" into oc-dr1-dev 2017-07-31 23:42:49 +00:00
TreeHugger Robot
2972b5c992 Merge "Fix DataUsageSummary non-indexable keys" into oc-mr1-dev 2017-07-31 23:35:29 +00:00
Matthew Fritze
621c24861c Fix DataUsageSummary non-indexable keys
Indexing in DataUsage was not conventional, since it
blocked adding XML based on current sim status rather than
indexing everything and changing non-indexabe keys.

Manual merge for: ag/2631595

Change-Id: I7bb3cdb0f11772bbaefb6c21c61eb63bd0b17c7e
Fixes: 64193449
Test: robotests
2017-07-31 14:20:31 -07:00
Alex Kulesza
5252372c15 Merge "Fixing bug in UsageGraph rendering." into oc-dr1-dev am: 8fd9c28b7e
am: b76fe783e0

Change-Id: I1f56ef0bd997293c0f1912abc2c5fc193c060684
2017-07-31 19:33:55 +00:00
jackqdyulei
1f0f6317f6 Use package from sipper if default is null
The BatteryEntry need a background thread to update the
package name and icon. However in InstalledAppDetails we
don't have this thread and it is unnecessary because we
already has the package name.

This cl:
1. Use the mPackageName from InstalledAppDetails directly in
BatteryEntry
2. Double check the defaultPackageName in AdvancedPowerUsageDetail,
use packageName from sipper if default is null

Bug: 64127162
Test: RunSettingsRoboTests

Change-Id: I5d21afca17f177817976758c28ed86b3a10e95eb
Merged-In: I5d21afca17f177817976758c28ed86b3a10e95eb
2017-07-31 12:33:10 -07:00
Alex Kulesza
b76fe783e0 Merge "Fixing bug in UsageGraph rendering." into oc-dr1-dev
am: 8fd9c28b7e

Change-Id: I8a24c0d388524c34d19a2f1bfd0e8f53b6c9304c
2017-07-31 19:30:16 +00:00
Alex Kulesza
e9216ccbd3 Merge "Fixing bug in UsageGraph rendering." into oc-dr1-dev
am: 8fd9c28b7e

Change-Id: I47a18bcfc174e06964aaa3a7140ebcf5be12919c
2017-07-31 19:30:16 +00:00
Android Build Merger (Role)
6d591a3682 Merge "Merge "Remove DND and all gesture suggestions from Settings" into oc-dr1-dev am: 9064072ed7 am: 1b62cfb973" into oc-mr1-dev-plus-aosp 2017-07-31 19:28:45 +00:00
Fan Zhang
b43867dc5e Merge "Remove DND and all gesture suggestions from Settings" into oc-dr1-dev am: 9064072ed7
am: 1b62cfb973

Change-Id: I2911fd45b056eb9ecf8f523a824878cf23747b8d
2017-07-31 19:28:28 +00:00
Android Build Merger (Role)
d8664d6cba Merge "Merge "Create wrapper and shadow for AccessibilityManager" into oc-dr1-dev am: d6c9a8b5b2 am: 68af5f3a5d" into oc-mr1-dev-plus-aosp 2017-07-31 19:28:21 +00:00
jackqdyulei
7bea7b2cdd Merge "Create wrapper and shadow for AccessibilityManager" into oc-dr1-dev am: d6c9a8b5b2
am: 68af5f3a5d

Change-Id: I24a1e496688277428b680eaa0a66dd12e0eac3d3
2017-07-31 19:27:46 +00:00
jackqdyulei
6399937d47 Merge "Use package from sipper if default is null" into oc-mr1-dev
am: 8be9d6519f

Change-Id: I6755b14b62b9ec8958ce2aa7e99b3faa4fbb7aa7
2017-07-31 19:27:34 +00:00
TreeHugger Robot
8fd9c28b7e Merge "Fixing bug in UsageGraph rendering." into oc-dr1-dev 2017-07-31 19:19:03 +00:00
Fan Zhang
1b62cfb973 Merge "Remove DND and all gesture suggestions from Settings" into oc-dr1-dev
am: 9064072ed7

Change-Id: Ic4bb153fc670441f3f1a04be40e56d59d31f4275
2017-07-31 19:12:11 +00:00
jackqdyulei
68af5f3a5d Merge "Create wrapper and shadow for AccessibilityManager" into oc-dr1-dev
am: d6c9a8b5b2

Change-Id: I9dcac73b1360471f4357ef75201b49c6d5031033
2017-07-31 19:11:31 +00:00
Fan Zhang
56538f1775 Merge "Remove DND and all gesture suggestions from Settings" into oc-dr1-dev
am: 9064072ed7

Change-Id: I8aec2dc4de1ec18375ce3af177f1c9769499f8e3
2017-07-31 19:09:10 +00:00
jackqdyulei
b3a488c40c Merge "Create wrapper and shadow for AccessibilityManager" into oc-dr1-dev
am: d6c9a8b5b2

Change-Id: Id708356c38b10789974e35193c1d71dc0c9fdf34
2017-07-31 19:08:31 +00:00
TreeHugger Robot
8be9d6519f Merge "Use package from sipper if default is null" into oc-mr1-dev 2017-07-31 18:58:22 +00:00
TreeHugger Robot
9064072ed7 Merge "Remove DND and all gesture suggestions from Settings" into oc-dr1-dev 2017-07-31 18:56:02 +00:00
TreeHugger Robot
d6c9a8b5b2 Merge "Create wrapper and shadow for AccessibilityManager" into oc-dr1-dev 2017-07-31 18:55:40 +00:00
Matthew Fritze
9a70472ff9 Add INTENT_ONLY as a ResultPayload Availibility
Test: robotests
Bug: 64165583
Change-Id: I1bb8fd3f331c8b8aabda55afe329471a9c5ef0c9
2017-07-31 08:18:20 -07:00
Alex Kulesza
4a121ecfae Fixing bug in UsageGraph rendering.
The calculateLocalPaths() method of UsageGraph converts a set of paths
in (milliseconds, percent) coordinates into the actual pixel values that
will be used for drawing. For the most part this is a one to one
process, but not always: input points that are too closely spaced to
draw accurately are skipped. The last point in the path, however, is
never skipped, in order to ensure that the graph ends at the correct
location.

The previous implementation of this method had a bug: the y-coordinates
of points that were skipped would be stored indefinitely (in the local
variable pendingYLoc) and then added back at the very end of the path
(under the condition i == mPaths.size() - 1 && pendingYLoc !=
PATH_DELIM). Under the right conditions, this led to the strange uptick
at the end of the graph seen in the associated bug.

This CL fixes the problem and attempts to make the logic slightly
clearer. It also adds tests, one of which (_similarPointMiddle) fails
for the previous code.

In more detail, previously pendingXLoc was used to hold the last x
coordinate seen, while pendingYLoc was used to hold the last *skipped* y
coordinate, or PATH_DELIM otherwise. The difference between these was
somewhat subtle and hard to understand from a quick read of the code,
and there was a bug: pendingYLoc never got reset to PATH_DELIM even if
later points were added. In this CL I have removed the pendingLoc
variables in favor of a single lx/ly pair, which always holds the local
coordinates of the most recent point, and I added an explicit boolean
skippedLastPoint to track whether the point (lx, ly) has already been
added or was skipped.

Bug: 64065296
Test: make RunSettingsRoboTests
Change-Id: I45ccffea1280d851bfae5143c2e84d188e133731
2017-07-31 11:12:17 -04:00
jackqdyulei
d6cb4a1738 Add shadow and wrapper classes
These classes are used for accessibility service. Also
add a new Availablity type.

Bug: 62022517
Test: Build
Change-Id: Ia2ff72dd04fd99b17809822907746c2411cecb62
2017-07-28 16:12:47 -07:00
Fan Zhang
4f04c68dd1 Remove DND and all gesture suggestions from Settings
Change-Id: I2f59c426132ca907e556b8bb2fbc869f4e830768
Fix: 64156274
Test: robotests
2017-07-28 14:39:48 -07:00
jackqdyulei
51872ed345 Use package from sipper if default is null
The BatteryEntry need a background thread to update the
package name and icon. However in InstalledAppDetails we
don't have this thread and it is unnecessary because we
already has the package name.

This cl:
1. Use the mPackageName from InstalledAppDetails directly in
BatteryEntry
2. Double check the defaultPackageName in AdvancedPowerUsageDetail,
use packageName from sipper if default is null

This cl is cherry picked from oc-dr to fix the test breakage.

Bug: 64127162
Test: RunSettingsRoboTests

Change-Id: I5d21afca17f177817976758c28ed86b3a10e95eb
2017-07-28 14:16:38 -07:00
Lei Yu
5711389270 Merge "Turn off some anomaly detectors by default" into oc-dr1-dev am: f940431d32
am: 90db9083ad

Change-Id: Ia08486adcf17e1747d0ea119eabd754dcc155dbc
2017-07-28 20:53:46 +00:00
Lei Yu
7cfaeeca58 Merge "Turn off some anomaly detectors by default" into oc-dr1-dev
am: f940431d32

Change-Id: I2e7ab9e29e9e2910c2405af287c3c46a927b3a1c
2017-07-28 20:49:49 +00:00
Lei Yu
90db9083ad Merge "Turn off some anomaly detectors by default" into oc-dr1-dev
am: f940431d32

Change-Id: I1d3672b40a0de6dfe481295134a5cb9eeea91b89
2017-07-28 20:49:48 +00:00
Lei Yu
f940431d32 Merge "Turn off some anomaly detectors by default" into oc-dr1-dev 2017-07-28 20:39:57 +00:00
jackqdyulei
c27d74d08e Create wrapper and shadow for AccessibilityManager
This is for testing, because robolectric doesn't recognize new
API.

Bug: 62022517
Test: Build
Change-Id: I1c150d86366305eacf3245bbabdf3d3e26124c77
2017-07-28 13:12:15 -07:00
Fan Zhang
7a07f68794 Merge "Query search result intent before launching to avoid crash" into oc-dr1-dev am: 9f93faf7ae
am: 81840033e3

Change-Id: I6898c45e13ee4418fb83d78e77303dbfa097888b
2017-07-28 19:34:13 +00:00
Fan Zhang
81840033e3 Merge "Query search result intent before launching to avoid crash" into oc-dr1-dev
am: 9f93faf7ae

Change-Id: I5c0dc1366be5059fe7387831c3ee88cf9dfa0b43
2017-07-28 19:29:44 +00:00
Fan Zhang
ae0dbe3e13 Merge "Query search result intent before launching to avoid crash" into oc-dr1-dev
am: 9f93faf7ae

Change-Id: I596f52f4db123c3df485a1a194966771706650db
2017-07-28 19:29:44 +00:00
TreeHugger Robot
9f93faf7ae Merge "Query search result intent before launching to avoid crash" into oc-dr1-dev 2017-07-28 19:21:45 +00:00
Ajay Nadathur
8f0791a8e1 Merge "Fix fingerprint enrollment bug that fails during last leg" into oc-mr1-dev
am: cfcd1c4b77

Change-Id: I9d99a7d65d38609e2db3c2e24f70bf537b9e8660
2017-07-28 17:51:25 +00:00
Ajay Nadathur
60746517bf Merge "Remove extra steps in fingerprint flow" into oc-mr1-dev
am: 57a92e5a19

Change-Id: Ie06c454b68aa5cb82c3fcec9fbb39af72e38021b
2017-07-28 17:50:42 +00:00
Ajay Nadathur
cfcd1c4b77 Merge "Fix fingerprint enrollment bug that fails during last leg" into oc-mr1-dev 2017-07-28 17:45:22 +00:00
Ajay Nadathur
57a92e5a19 Merge "Remove extra steps in fingerprint flow" into oc-mr1-dev 2017-07-28 17:44:44 +00:00
Doris Ling
7cdb94384f Merge "Fix null pointer exception when updating action bar shadow." into oc-mr1-dev
am: 51fb9ad956

Change-Id: I5df37cf381ef448bda838756b466f78d85fa8f8b
2017-07-28 17:25:51 +00:00
Doris Ling
51fb9ad956 Merge "Fix null pointer exception when updating action bar shadow." into oc-mr1-dev 2017-07-28 17:03:49 +00:00