Commit Graph

39566 Commits

Author SHA1 Message Date
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
9b3dfd9d2c Merge "Remove DND and all gesture suggestions from Settings" into oc-dr1-dev am: 9064072ed7
am: 56538f1775

Change-Id: Id3e5d86f60da922dcdbfa83e042b8442a674f0c7
2017-07-31 19:28:33 +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)
c3829cab9d Merge "Merge "Create wrapper and shadow for AccessibilityManager" into oc-dr1-dev am: d6c9a8b5b2 am: b3a488c40c" into oc-mr1-dev-plus-aosp 2017-07-31 19:28:26 +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
3d391cac88 Merge "Create wrapper and shadow for AccessibilityManager" into oc-dr1-dev am: d6c9a8b5b2
am: b3a488c40c

Change-Id: Iced9212fa792abc6d24c68e3177babb8c61b9bbb
2017-07-31 19:27:56 +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
Fan Zhang
1f0b09c924 Merge "Layout tweak for app action buttons" into oc-mr1-dev
am: 48d54ff2f6

Change-Id: Ieb1c678c66781341c5ab703ed66412508006afe3
2017-07-31 19:27:13 +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
48d54ff2f6 Merge "Layout tweak for app action buttons" into oc-mr1-dev 2017-07-31 18:57:09 +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
Ajay Nadathur
0724a106fe Merge "Change vision settings suggestion title" into oc-mr1-dev am: 9b89fb0080
am: 40c652b221

Change-Id: Ib966fa27205c8f07dafa02b8dcb61b37b99667fc
2017-07-31 18:34:29 +00:00
Ajay Nadathur
40c652b221 Merge "Change vision settings suggestion title" into oc-mr1-dev
am: 9b89fb0080

Change-Id: I76719d69ebf0fa79e047da425de297422693f512
2017-07-31 18:30:57 +00:00
Ajay Nadathur
9b89fb0080 Merge "Change vision settings suggestion title" into oc-mr1-dev 2017-07-31 18:19:12 +00:00
Geoffrey Pitsch
f3fc635947 AOD setting availability depends on other user settings
Bug: 62918778
Test: make
ROBOTEST_FILTER=AmbientDisplayAlwaysOnPreferenceControllerTest
RunSettingsRoboTests -j
Change-Id: Id6f1ad580cf5caace82a1bfa85e85b98f134f9d6
2017-07-31 13:56:41 -04:00
Maurice Lam
d0f51e6177 Merge "Merge "Align screen lock options to view start" into oc-dr1-dev am: 5e2e0df356 am: 5faa5ab6ea" into oc-mr1-dev-plus-aosp
am: 1b032d9d39

Change-Id: I6436186aa68674d20537aefcbb5837a68fc73967
2017-07-31 17:48:54 +00:00
Maurice Lam
10b3d87d34 Merge "Align screen lock options to view start" into oc-dr1-dev am: 5e2e0df356 am: 7c5fc6737c
am: d3c2026aae

Change-Id: I6a32995c441a6b48a0eecc9c98864e8504d7739c
2017-07-31 17:48:31 +00:00
Android Build Merger (Role)
1b032d9d39 Merge "Merge "Align screen lock options to view start" into oc-dr1-dev am: 5e2e0df356 am: 5faa5ab6ea" into oc-mr1-dev-plus-aosp 2017-07-31 17:45:32 +00:00
Maurice Lam
58b0e9f743 Merge "Align screen lock options to view start" into oc-dr1-dev am: 5e2e0df356
am: 5faa5ab6ea

Change-Id: Id18996a7427d2aedce6b24494e84adf5468dd496
2017-07-31 17:45:18 +00:00
Maurice Lam
d3c2026aae Merge "Align screen lock options to view start" into oc-dr1-dev am: 5e2e0df356
am: 7c5fc6737c

Change-Id: Ic27b1772351d5e893b2c8ebd3ada4fe2a2bb1e20
2017-07-31 17:44:35 +00:00
Maurice Lam
7c5fc6737c Merge "Align screen lock options to view start" into oc-dr1-dev
am: 5e2e0df356

Change-Id: I5e4e5714d6e881ad25771da7fca5c27996f68617
2017-07-31 17:41:13 +00:00
Maurice Lam
5faa5ab6ea Merge "Align screen lock options to view start" into oc-dr1-dev
am: 5e2e0df356

Change-Id: I38de58cc51e58c831e513a7dae13f06f3db0fce3
2017-07-31 17:41:12 +00:00
Maurice Lam
5e2e0df356 Merge "Align screen lock options to view start" into oc-dr1-dev 2017-07-31 17:35:07 +00:00
Pankaj Kanwar
2ce583e934 Merge "Add string needed to support carrier wifi in UI." into oc-mr1-dev am: 492c9f4d16
am: 99dc2bf58e

Change-Id: I7ee1f292f89cf4a66e8813ac8ea7e3a2804d9310
2017-07-31 17:16:21 +00:00
Pankaj Kanwar
99dc2bf58e Merge "Add string needed to support carrier wifi in UI." into oc-mr1-dev
am: 492c9f4d16

Change-Id: I3d05092be28d9fc527e882464e117837242143b3
2017-07-31 17:13:22 +00:00
Pankaj Kanwar
492c9f4d16 Merge "Add string needed to support carrier wifi in UI." into oc-mr1-dev 2017-07-31 17:09:00 +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
TreeHugger Robot
a7bd3e4a32 Merge "Update work briefcase asset." 2017-07-31 15:13:24 +00: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
Fan Zhang
c16f7d55a2 Merge "Update search bar's navup content description" into oc-dr1-dev am: b79d38f2f3 am: d58a499c02
am: 320680e817

Change-Id: Ice553b789170afa27e1149951746daf2e2bf3f8c
2017-07-29 00:24:36 +00:00
Fan Zhang
f7df1afb2a Merge "Update search bar's navup content description" into oc-dr1-dev am: b79d38f2f3 am: 4d5172bfeb
am: e0dee98e12

Change-Id: Ia2fae5915d65ba1141a5d4e37fad544c0860d102
2017-07-29 00:23:56 +00:00
Fan Zhang
320680e817 Merge "Update search bar's navup content description" into oc-dr1-dev am: b79d38f2f3
am: d58a499c02

Change-Id: Ia15be666f61be4cb3a2ba503242343384b037484
2017-07-29 00:21:49 +00:00
Fan Zhang
e0dee98e12 Merge "Update search bar's navup content description" into oc-dr1-dev am: b79d38f2f3
am: 4d5172bfeb

Change-Id: I8fec7ef3502df99ccf08731ad7a5547f13e643ea
2017-07-29 00:20:50 +00:00
Fan Zhang
d58a499c02 Merge "Update search bar's navup content description" into oc-dr1-dev
am: b79d38f2f3

Change-Id: Idf6df51c8c2b4f765b370f70c8f427a261d4d1bb
2017-07-29 00:16:23 +00:00
Fan Zhang
4d5172bfeb Merge "Update search bar's navup content description" into oc-dr1-dev
am: b79d38f2f3

Change-Id: I774c5a2d4e456cfcb1fb4d37a5fd6373336400e5
2017-07-29 00:16:22 +00:00
Fan Zhang
b79d38f2f3 Merge "Update search bar's navup content description" into oc-dr1-dev 2017-07-29 00:10:10 +00:00
Oren Blasberg
813f0b5ba9 SMS mirroring: Add placeholder summary.
Prevents the summary text from shifting once the final text is
loaded, if OEM specific implementations do an async load of
the summary text.

Bug: 37546615

Test: Verified the placeholder works.
Change-Id: Ia16fe53dbf7a8daf96b9fa955ef9a02fa1eb784f
2017-07-28 16:51:42 -07: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
pkanwar
186c9b4525 Add string needed to support carrier wifi in UI.
Add strings which will be used to indicate to the user in the wifi
picker and wifi config that they are connecting/connected to carrier
wifi.

Bug:30988281
Test: manual
Change-Id: I6f3b6a047bb28fddf81ed967c89fac5824d34f9f
2017-07-28 23:00:32 +00:00
Fan Zhang
fd6d4bf1c8 Layout tweak for app action buttons
Now shadow is no longer cropped when pressing button

Change-Id: I6ac8588abb75ca23912f62808a57e8402857e18b
Fixes: 62550425
Test: visual
(cherry picked from commit ee308b950f)
2017-07-28 22:55:59 +00:00
Ajay Nadathur
5224edfb92 Change vision settings suggestion title
bug: 63867327
Test: Manually tested and verified
Change-Id: I358508534d0ef77c99851430f979b61702519313
2017-07-28 22:01:09 +00: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