OSDN Git Service
Matthew Fritze [Tue, 1 Aug 2017 00:28:57 +0000 (00:28 +0000)]
Merge "resolve merge conflicts of
a03a707f74 to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp
Matthew Fritze [Tue, 1 Aug 2017 00:24:17 +0000 (17:24 -0700)]
resolve merge conflicts of
a03a707f74 to oc-mr1-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Icca7a8cc2632b35c54421cb8398c8deb4e670032
Eric Schwarzenbach [Tue, 1 Aug 2017 00:17:31 +0000 (00:17 +0000)]
Merge "Make only the "Add Network" WifiDialog fullscreen." into oc-mr1-dev
am:
5e888ad7b6
Change-Id: I8e6852561bba50ed44d17f52099ebf82becd5433
TreeHugger Robot [Tue, 1 Aug 2017 00:02:38 +0000 (00:02 +0000)]
Merge "Make only the "Add Network" WifiDialog fullscreen." into oc-mr1-dev
Android Build Merger (Role) [Mon, 31 Jul 2017 23:52:47 +0000 (23:52 +0000)]
Merge "Merge "Use package from sipper if default is null" into oc-dr1-dev am:
ca24d0435b am:
c65e873d3e -s ours" into oc-mr1-dev-plus-aosp
jackqdyulei [Mon, 31 Jul 2017 23:52:23 +0000 (23:52 +0000)]
Merge "Use package from sipper if default is null" into oc-dr1-dev am:
ca24d0435b -s ours
am:
f1dfb105cd -s ours
Change-Id: I08f20e90020bfc6b3a1f85b104f8c800c9336c87
jackqdyulei [Mon, 31 Jul 2017 23:52:23 +0000 (23:52 +0000)]
Merge "Use package from sipper if default is null" into oc-dr1-dev am:
ca24d0435b
am:
c65e873d3e -s ours
Change-Id: If907662fdbfa21593960b0cd2910271df14766ed
Matthew Fritze [Mon, 31 Jul 2017 23:50:03 +0000 (23:50 +0000)]
Merge "Add INTENT_ONLY as a ResultPayload Availibility" into oc-dr1-dev
am:
9feab7a8a5
Change-Id: I45565eb7bd6046cc20ccb223d88d1ac31a95d6b5
jackqdyulei [Mon, 31 Jul 2017 23:49:11 +0000 (23:49 +0000)]
Merge "Use package from sipper if default is null" into oc-dr1-dev
am:
ca24d0435b -s ours
Change-Id: I438dc044a0f923a288d2dea795c85ae48147bd8e
jackqdyulei [Mon, 31 Jul 2017 23:49:07 +0000 (23:49 +0000)]
Merge "Use package from sipper if default is null" into oc-dr1-dev
am:
ca24d0435b
Change-Id: Idfa84fd3c07b228ddc689244b7d33ca66463d25f
jackqdyulei [Mon, 31 Jul 2017 23:48:51 +0000 (23:48 +0000)]
Merge "Add shadow and wrapper classes" into oc-mr1-dev
am:
1b2408433a
Change-Id: If0839d6ae74defedaa3c8dcf20fb80c1cccab46e
TreeHugger Robot [Mon, 31 Jul 2017 23:48:02 +0000 (23:48 +0000)]
Merge "Add INTENT_ONLY as a ResultPayload Availibility" into oc-dr1-dev
Matthew Fritze [Mon, 31 Jul 2017 23:45:31 +0000 (23:45 +0000)]
Merge "Fix DataUsageSummary non-indexable keys" into oc-mr1-dev
am:
2972b5c992
Change-Id: I3936a622769dbb315c9f191982cd5b74ae1c7564
TreeHugger Robot [Mon, 31 Jul 2017 23:44:43 +0000 (23:44 +0000)]
Merge "Add shadow and wrapper classes" into oc-mr1-dev
TreeHugger Robot [Mon, 31 Jul 2017 23:42:49 +0000 (23:42 +0000)]
Merge "Use package from sipper if default is null" into oc-dr1-dev
TreeHugger Robot [Mon, 31 Jul 2017 23:35:29 +0000 (23:35 +0000)]
Merge "Fix DataUsageSummary non-indexable keys" into oc-mr1-dev
Matthew Fritze [Mon, 31 Jul 2017 16:44:57 +0000 (09:44 -0700)]
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
Android Build Merger (Role) [Mon, 31 Jul 2017 19:34:15 +0000 (19:34 +0000)]
Merge "Merge "Fixing bug in UsageGraph rendering." into oc-dr1-dev am:
8fd9c28b7e am:
e9216ccbd3" into oc-mr1-dev-plus-aosp
Alex Kulesza [Mon, 31 Jul 2017 19:33:57 +0000 (19:33 +0000)]
Merge "Fixing bug in UsageGraph rendering." into oc-dr1-dev am:
8fd9c28b7e
am:
e9216ccbd3
Change-Id: I97720a853f9d5fde41c2920ced45bbd4079bae68
Alex Kulesza [Mon, 31 Jul 2017 19:33:55 +0000 (19:33 +0000)]
Merge "Fixing bug in UsageGraph rendering." into oc-dr1-dev am:
8fd9c28b7e
am:
b76fe783e0
Change-Id: I1f56ef0bd997293c0f1912abc2c5fc193c060684
jackqdyulei [Thu, 27 Jul 2017 21:44:58 +0000 (14:44 -0700)]
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
Alex Kulesza [Mon, 31 Jul 2017 19:30:16 +0000 (19:30 +0000)]
Merge "Fixing bug in UsageGraph rendering." into oc-dr1-dev
am:
8fd9c28b7e
Change-Id: I8a24c0d388524c34d19a2f1bfd0e8f53b6c9304c
Alex Kulesza [Mon, 31 Jul 2017 19:30:16 +0000 (19:30 +0000)]
Merge "Fixing bug in UsageGraph rendering." into oc-dr1-dev
am:
8fd9c28b7e
Change-Id: I47a18bcfc174e06964aaa3a7140ebcf5be12919c
Android Build Merger (Role) [Mon, 31 Jul 2017 19:28:51 +0000 (19:28 +0000)]
Merge "Merge "Remove DND and all gesture suggestions from Settings" into oc-dr1-dev am:
9064072ed7 am:
56538f1775" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 31 Jul 2017 19:28:45 +0000 (19:28 +0000)]
Merge "Merge "Remove DND and all gesture suggestions from Settings" into oc-dr1-dev am:
9064072ed7 am:
1b62cfb973" into oc-mr1-dev-plus-aosp
Fan Zhang [Mon, 31 Jul 2017 19:28:33 +0000 (19:28 +0000)]
Merge "Remove DND and all gesture suggestions from Settings" into oc-dr1-dev am:
9064072ed7
am:
56538f1775
Change-Id: Id3e5d86f60da922dcdbfa83e042b8442a674f0c7
Fan Zhang [Mon, 31 Jul 2017 19:28:28 +0000 (19:28 +0000)]
Merge "Remove DND and all gesture suggestions from Settings" into oc-dr1-dev am:
9064072ed7
am:
1b62cfb973
Change-Id: I2911fd45b056eb9ecf8f523a824878cf23747b8d
Android Build Merger (Role) [Mon, 31 Jul 2017 19:28:26 +0000 (19:28 +0000)]
Merge "Merge "Create wrapper and shadow for AccessibilityManager" into oc-dr1-dev am:
d6c9a8b5b2 am:
b3a488c40c" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 31 Jul 2017 19:28:21 +0000 (19:28 +0000)]
Merge "Merge "Create wrapper and shadow for AccessibilityManager" into oc-dr1-dev am:
d6c9a8b5b2 am:
68af5f3a5d" into oc-mr1-dev-plus-aosp
jackqdyulei [Mon, 31 Jul 2017 19:27:56 +0000 (19:27 +0000)]
Merge "Create wrapper and shadow for AccessibilityManager" into oc-dr1-dev am:
d6c9a8b5b2
am:
b3a488c40c
Change-Id: Iced9212fa792abc6d24c68e3177babb8c61b9bbb
jackqdyulei [Mon, 31 Jul 2017 19:27:46 +0000 (19:27 +0000)]
Merge "Create wrapper and shadow for AccessibilityManager" into oc-dr1-dev am:
d6c9a8b5b2
am:
68af5f3a5d
Change-Id: I24a1e496688277428b680eaa0a66dd12e0eac3d3
jackqdyulei [Mon, 31 Jul 2017 19:27:34 +0000 (19:27 +0000)]
Merge "Use package from sipper if default is null" into oc-mr1-dev
am:
8be9d6519f
Change-Id: I6755b14b62b9ec8958ce2aa7e99b3faa4fbb7aa7
Fan Zhang [Mon, 31 Jul 2017 19:27:13 +0000 (19:27 +0000)]
Merge "Layout tweak for app action buttons" into oc-mr1-dev
am:
48d54ff2f6
Change-Id: Ieb1c678c66781341c5ab703ed66412508006afe3
TreeHugger Robot [Mon, 31 Jul 2017 19:19:03 +0000 (19:19 +0000)]
Merge "Fixing bug in UsageGraph rendering." into oc-dr1-dev
Fan Zhang [Mon, 31 Jul 2017 19:12:11 +0000 (19:12 +0000)]
Merge "Remove DND and all gesture suggestions from Settings" into oc-dr1-dev
am:
9064072ed7
Change-Id: Ic4bb153fc670441f3f1a04be40e56d59d31f4275
jackqdyulei [Mon, 31 Jul 2017 19:11:31 +0000 (19:11 +0000)]
Merge "Create wrapper and shadow for AccessibilityManager" into oc-dr1-dev
am:
d6c9a8b5b2
Change-Id: I9dcac73b1360471f4357ef75201b49c6d5031033
Fan Zhang [Mon, 31 Jul 2017 19:09:10 +0000 (19:09 +0000)]
Merge "Remove DND and all gesture suggestions from Settings" into oc-dr1-dev
am:
9064072ed7
Change-Id: I8aec2dc4de1ec18375ce3af177f1c9769499f8e3
jackqdyulei [Mon, 31 Jul 2017 19:08:31 +0000 (19:08 +0000)]
Merge "Create wrapper and shadow for AccessibilityManager" into oc-dr1-dev
am:
d6c9a8b5b2
Change-Id: Id708356c38b10789974e35193c1d71dc0c9fdf34
TreeHugger Robot [Mon, 31 Jul 2017 18:58:22 +0000 (18:58 +0000)]
Merge "Use package from sipper if default is null" into oc-mr1-dev
TreeHugger Robot [Mon, 31 Jul 2017 18:57:09 +0000 (18:57 +0000)]
Merge "Layout tweak for app action buttons" into oc-mr1-dev
TreeHugger Robot [Mon, 31 Jul 2017 18:56:02 +0000 (18:56 +0000)]
Merge "Remove DND and all gesture suggestions from Settings" into oc-dr1-dev
TreeHugger Robot [Mon, 31 Jul 2017 18:55:40 +0000 (18:55 +0000)]
Merge "Create wrapper and shadow for AccessibilityManager" into oc-dr1-dev
Ajay Nadathur [Mon, 31 Jul 2017 18:30:57 +0000 (18:30 +0000)]
Merge "Change vision settings suggestion title" into oc-mr1-dev
am:
9b89fb0080
Change-Id: I76719d69ebf0fa79e047da425de297422693f512
Ajay Nadathur [Mon, 31 Jul 2017 18:19:12 +0000 (18:19 +0000)]
Merge "Change vision settings suggestion title" into oc-mr1-dev
Android Build Merger (Role) [Mon, 31 Jul 2017 17:45:32 +0000 (17:45 +0000)]
Merge "Merge "Align screen lock options to view start" into oc-dr1-dev am:
5e2e0df356 am:
5faa5ab6ea" into oc-mr1-dev-plus-aosp
Maurice Lam [Mon, 31 Jul 2017 17:45:18 +0000 (17:45 +0000)]
Merge "Align screen lock options to view start" into oc-dr1-dev am:
5e2e0df356
am:
5faa5ab6ea
Change-Id: Id18996a7427d2aedce6b24494e84adf5468dd496
Maurice Lam [Mon, 31 Jul 2017 17:44:35 +0000 (17:44 +0000)]
Merge "Align screen lock options to view start" into oc-dr1-dev am:
5e2e0df356
am:
7c5fc6737c
Change-Id: Ic27b1772351d5e893b2c8ebd3ada4fe2a2bb1e20
Maurice Lam [Mon, 31 Jul 2017 17:41:13 +0000 (17:41 +0000)]
Merge "Align screen lock options to view start" into oc-dr1-dev
am:
5e2e0df356
Change-Id: I5e4e5714d6e881ad25771da7fca5c27996f68617
Maurice Lam [Mon, 31 Jul 2017 17:41:12 +0000 (17:41 +0000)]
Merge "Align screen lock options to view start" into oc-dr1-dev
am:
5e2e0df356
Change-Id: I38de58cc51e58c831e513a7dae13f06f3db0fce3
Maurice Lam [Mon, 31 Jul 2017 17:35:07 +0000 (17:35 +0000)]
Merge "Align screen lock options to view start" into oc-dr1-dev
Pankaj Kanwar [Mon, 31 Jul 2017 17:13:22 +0000 (17:13 +0000)]
Merge "Add string needed to support carrier wifi in UI." into oc-mr1-dev
am:
492c9f4d16
Change-Id: I3d05092be28d9fc527e882464e117837242143b3
Pankaj Kanwar [Mon, 31 Jul 2017 17:09:00 +0000 (17:09 +0000)]
Merge "Add string needed to support carrier wifi in UI." into oc-mr1-dev
Matthew Fritze [Mon, 31 Jul 2017 15:18:20 +0000 (08:18 -0700)]
Add INTENT_ONLY as a ResultPayload Availibility
Test: robotests
Bug:
64165583
Change-Id: I1bb8fd3f331c8b8aabda55afe329471a9c5ef0c9
Alex Kulesza [Sun, 30 Jul 2017 22:11:24 +0000 (18:11 -0400)]
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
Fan Zhang [Sat, 29 Jul 2017 00:21:49 +0000 (00:21 +0000)]
Merge "Update search bar's navup content description" into oc-dr1-dev am:
b79d38f2f3
am:
d58a499c02
Change-Id: Ia15be666f61be4cb3a2ba503242343384b037484
Fan Zhang [Sat, 29 Jul 2017 00:20:50 +0000 (00:20 +0000)]
Merge "Update search bar's navup content description" into oc-dr1-dev am:
b79d38f2f3
am:
4d5172bfeb
Change-Id: I8fec7ef3502df99ccf08731ad7a5547f13e643ea
Fan Zhang [Sat, 29 Jul 2017 00:16:23 +0000 (00:16 +0000)]
Merge "Update search bar's navup content description" into oc-dr1-dev
am:
b79d38f2f3
Change-Id: Idf6df51c8c2b4f765b370f70c8f427a261d4d1bb
Fan Zhang [Sat, 29 Jul 2017 00:16:22 +0000 (00:16 +0000)]
Merge "Update search bar's navup content description" into oc-dr1-dev
am:
b79d38f2f3
Change-Id: I774c5a2d4e456cfcb1fb4d37a5fd6373336400e5
Fan Zhang [Sat, 29 Jul 2017 00:10:10 +0000 (00:10 +0000)]
Merge "Update search bar's navup content description" into oc-dr1-dev
jackqdyulei [Tue, 25 Jul 2017 00:43:23 +0000 (17:43 -0700)]
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
pkanwar [Fri, 28 Jul 2017 22:56:22 +0000 (15:56 -0700)]
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
Fan Zhang [Fri, 21 Jul 2017 22:06:36 +0000 (15:06 -0700)]
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
ee308b950f5d4bc0312ed7f439ff02f9ef065d17)
Ajay Nadathur [Fri, 28 Jul 2017 21:24:39 +0000 (14:24 -0700)]
Change vision settings suggestion title
bug:
63867327
Test: Manually tested and verified
Change-Id: I358508534d0ef77c99851430f979b61702519313
Fan Zhang [Fri, 28 Jul 2017 21:20:23 +0000 (14:20 -0700)]
Remove DND and all gesture suggestions from Settings
Change-Id: I2f59c426132ca907e556b8bb2fbc869f4e830768
Fix:
64156274
Test: robotests
jackqdyulei [Thu, 27 Jul 2017 21:44:58 +0000 (14:44 -0700)]
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
Android Build Merger (Role) [Fri, 28 Jul 2017 20:54:05 +0000 (20:54 +0000)]
Merge "Merge "Turn off some anomaly detectors by default" into oc-dr1-dev am:
f940431d32 am:
7cfaeeca58" into oc-mr1-dev-plus-aosp
Lei Yu [Fri, 28 Jul 2017 20:53:47 +0000 (20:53 +0000)]
Merge "Turn off some anomaly detectors by default" into oc-dr1-dev am:
f940431d32
am:
7cfaeeca58
Change-Id: I04315d3e4ff3bda720468f94940d8d11f76d01e0
Lei Yu [Fri, 28 Jul 2017 20:53:46 +0000 (20:53 +0000)]
Merge "Turn off some anomaly detectors by default" into oc-dr1-dev am:
f940431d32
am:
90db9083ad
Change-Id: Ia08486adcf17e1747d0ea119eabd754dcc155dbc
Lei Yu [Fri, 28 Jul 2017 20:49:49 +0000 (20:49 +0000)]
Merge "Turn off some anomaly detectors by default" into oc-dr1-dev
am:
f940431d32
Change-Id: I2e7ab9e29e9e2910c2405af287c3c46a927b3a1c
Lei Yu [Fri, 28 Jul 2017 20:49:48 +0000 (20:49 +0000)]
Merge "Turn off some anomaly detectors by default" into oc-dr1-dev
am:
f940431d32
Change-Id: I1d3672b40a0de6dfe481295134a5cb9eeea91b89
Lei Yu [Fri, 28 Jul 2017 20:39:57 +0000 (20:39 +0000)]
Merge "Turn off some anomaly detectors by default" into oc-dr1-dev
jackqdyulei [Thu, 27 Jul 2017 23:13:03 +0000 (16:13 -0700)]
Create wrapper and shadow for AccessibilityManager
This is for testing, because robolectric doesn't recognize new
API.
Bug:
62022517
Test: Build
Change-Id: I1c150d86366305eacf3245bbabdf3d3e26124c77
Android Build Merger (Role) [Fri, 28 Jul 2017 19:34:48 +0000 (19:34 +0000)]
Merge "Merge "Query search result intent before launching to avoid crash" into oc-dr1-dev am:
9f93faf7ae am:
ae0dbe3e13" into oc-mr1-dev-plus-aosp
Fan Zhang [Fri, 28 Jul 2017 19:34:29 +0000 (19:34 +0000)]
Merge "Query search result intent before launching to avoid crash" into oc-dr1-dev am:
9f93faf7ae
am:
ae0dbe3e13
Change-Id: Ica05aff63af3f64996a434862cf60b358d0f8bfc
Fan Zhang [Fri, 28 Jul 2017 19:34:13 +0000 (19:34 +0000)]
Merge "Query search result intent before launching to avoid crash" into oc-dr1-dev am:
9f93faf7ae
am:
81840033e3
Change-Id: I6898c45e13ee4418fb83d78e77303dbfa097888b
Fan Zhang [Fri, 28 Jul 2017 19:29:44 +0000 (19:29 +0000)]
Merge "Query search result intent before launching to avoid crash" into oc-dr1-dev
am:
9f93faf7ae
Change-Id: I5c0dc1366be5059fe7387831c3ee88cf9dfa0b43
Fan Zhang [Fri, 28 Jul 2017 19:29:44 +0000 (19:29 +0000)]
Merge "Query search result intent before launching to avoid crash" into oc-dr1-dev
am:
9f93faf7ae
Change-Id: I596f52f4db123c3df485a1a194966771706650db
TreeHugger Robot [Fri, 28 Jul 2017 19:21:45 +0000 (19:21 +0000)]
Merge "Query search result intent before launching to avoid crash" into oc-dr1-dev
Maurice Lam [Mon, 24 Jul 2017 23:39:00 +0000 (16:39 -0700)]
Align screen lock options to view start
Test: Manual
Bug:
63715610
Change-Id: If723a200ee402dcd7204e20e2a02cb151935d1fd
Android Build Merger (Role) [Fri, 28 Jul 2017 18:39:08 +0000 (18:39 +0000)]
Merge "Import translations. DO NOT MERGE am:
8432802275 -s ours am:
3908af4a6d -s ours" into oc-mr1-dev-plus-aosp
Bill Yi [Fri, 28 Jul 2017 18:38:37 +0000 (18:38 +0000)]
Import translations. DO NOT MERGE am:
8432802275 -s ours
am:
be723e5868 -s ours
Change-Id: If5f3769fcbd92212d61d70b3dcecf9f80c58e991
Bill Yi [Fri, 28 Jul 2017 18:38:36 +0000 (18:38 +0000)]
Import translations. DO NOT MERGE am:
8432802275 -s ours
am:
3908af4a6d -s ours
Change-Id: Icafe96c868f340b6fa48cc0052aca178071d1817
Bill Yi [Fri, 28 Jul 2017 18:34:04 +0000 (18:34 +0000)]
Import translations. DO NOT MERGE
am:
8432802275 -s ours
Change-Id: I447c5c121a9aca19f9ca2da7ac29e2dae439864a
Bill Yi [Fri, 28 Jul 2017 18:34:04 +0000 (18:34 +0000)]
Import translations. DO NOT MERGE
am:
8432802275 -s ours
Change-Id: I6dacb50f9fe4d6ba5a44e3a1249c58afe24747de
Ajay Nadathur [Fri, 28 Jul 2017 17:51:25 +0000 (17:51 +0000)]
Merge "Fix fingerprint enrollment bug that fails during last leg" into oc-mr1-dev
am:
cfcd1c4b77
Change-Id: I9d99a7d65d38609e2db3c2e24f70bf537b9e8660
Ajay Nadathur [Fri, 28 Jul 2017 17:51:03 +0000 (17:51 +0000)]
Merge "Update text for lock screen notifications" into oc-mr1-dev
am:
d2352cdd08
Change-Id: Id8f23cc08b481405c82318972107e283035816a7
Ajay Nadathur [Fri, 28 Jul 2017 17:50:42 +0000 (17:50 +0000)]
Merge "Remove extra steps in fingerprint flow" into oc-mr1-dev
am:
57a92e5a19
Change-Id: Ie06c454b68aa5cb82c3fcec9fbb39af72e38021b
Ajay Nadathur [Fri, 28 Jul 2017 17:45:22 +0000 (17:45 +0000)]
Merge "Fix fingerprint enrollment bug that fails during last leg" into oc-mr1-dev
Ajay Nadathur [Fri, 28 Jul 2017 17:45:00 +0000 (17:45 +0000)]
Merge "Update text for lock screen notifications" into oc-mr1-dev
Ajay Nadathur [Fri, 28 Jul 2017 17:44:44 +0000 (17:44 +0000)]
Merge "Remove extra steps in fingerprint flow" into oc-mr1-dev
Doris Ling [Fri, 28 Jul 2017 17:25:51 +0000 (17:25 +0000)]
Merge "Fix null pointer exception when updating action bar shadow." into oc-mr1-dev
am:
51fb9ad956
Change-Id: I5df37cf381ef448bda838756b466f78d85fa8f8b
Fan Zhang [Fri, 28 Jul 2017 17:22:07 +0000 (10:22 -0700)]
Update search bar's navup content description
It should read "Search settings"
Change-Id: I1a55f905949341b290ea5f224171592cf5021e31
Fix:
64140213
Test: talkback
Doris Ling [Fri, 28 Jul 2017 17:03:49 +0000 (17:03 +0000)]
Merge "Fix null pointer exception when updating action bar shadow." into oc-mr1-dev
jackqdyulei [Wed, 19 Jul 2017 17:46:21 +0000 (10:46 -0700)]
Turn off some anomaly detectors by default
1. Wakeup alarm detector
Because we cannot distinguish it between foreground and background
2. Bluetooth unoptimized scanning detector
There is a bug in framework that may undercount the scanning time
Bug:
63390581
Bug:
63964363
Test: RunSettingsRoboTests
Change-Id: Ia762f580462823e8eddccbeb12dec3876b0ef47a
Bill Yi [Fri, 28 Jul 2017 16:09:52 +0000 (16:09 +0000)]
Import translations. DO NOT MERGE
am:
129ed98650 -s ours
Change-Id: I6778963c60c8e1a973c084d5ec1889d3e0d13848
Bill Yi [Fri, 28 Jul 2017 10:27:50 +0000 (03:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: If9cb3de5de1845431f075d5ca6c7935d49e0e6f7
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Fri, 28 Jul 2017 10:08:41 +0000 (03:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie25fb80dbf73c1681c72adf0cfac13c319f952b7
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Android Build Merger (Role) [Fri, 28 Jul 2017 02:42:59 +0000 (02:42 +0000)]
Merge "Add ResultPayload for Allow notification dots am:
c50495ba06 am:
52aeaefbbe -s ours" into oc-mr1-dev-plus-aosp
jackqdyulei [Fri, 28 Jul 2017 02:42:44 +0000 (02:42 +0000)]
Add ResultPayload for Allow notification dots am:
c50495ba06
am:
52aeaefbbe -s ours
Change-Id: If0e7654814e9d7cec6758e2b657ccb61bfe9f425
jackqdyulei [Fri, 28 Jul 2017 02:42:32 +0000 (02:42 +0000)]
Add ResultPayload for Allow notification dots am:
c50495ba06 -s ours
am:
1b4b6e490a -s ours
Change-Id: Id02fbd2ac2ad5b6918097ff8819ee62f7f5d4945