OSDN Git Service
jackqdyulei [Mon, 31 Jul 2017 23:56:23 +0000 (23:56 +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
am:
e140bc3795 -s ours
Change-Id: I5439c17182dce2f149033e749161d00345a5dd12
jackqdyulei [Mon, 31 Jul 2017 23:55:50 +0000 (23:55 +0000)]
Merge "Use package from sipper if default is null" into oc-dr1-dev am:
ca24d0435b -s ours am:
f1dfb105cd -s ours
am:
33b0f20c21 -s ours
Change-Id: Ife2707a5bbae6d9e3aea0afad8f039ddfedc28af
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:47 +0000 (23:52 +0000)]
Merge "Add shadow and wrapper classes" into oc-mr1-dev am:
1b2408433a
am:
04c28ab23c
Change-Id: If01fbb956c5171a1fe9b64794e80a8b734ca6b54
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:52:20 +0000 (23:52 +0000)]
Merge "Fix DataUsageSummary non-indexable keys" into oc-mr1-dev am:
2972b5c992
am:
56f5ac21a5
Change-Id: I6c0130746d4a5dc6324ef330384cf77b7b64c18e
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
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
Alex Kulesza [Mon, 31 Jul 2017 20:23:10 +0000 (20:23 +0000)]
Merge "Merge "Fixing bug in UsageGraph rendering." into oc-dr1-dev am:
8fd9c28b7e am:
e9216ccbd3" into oc-mr1-dev-plus-aosp
am:
8bc726d770
Change-Id: If4a740fbd056f88937dbd32a468baab542ff959c
Alex Kulesza [Mon, 31 Jul 2017 20:22:49 +0000 (20:22 +0000)]
Merge "Fixing bug in UsageGraph rendering." into oc-dr1-dev am:
8fd9c28b7e am:
b76fe783e0
am:
5252372c15
Change-Id: I9ec7bf6f03d0c08b77db145abdbc1557beaa30aa
Fan Zhang [Mon, 31 Jul 2017 20:22:29 +0000 (20:22 +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
am:
17cee2d180
Change-Id: I5494796aac471251cff77d6df69f9ebd991ad26f
Fan Zhang [Mon, 31 Jul 2017 20:22:05 +0000 (20:22 +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
am:
6d591a3682
Change-Id: Ib7739df2540340e6ef7eea921f8833572864196d
jackqdyulei [Mon, 31 Jul 2017 20:21:27 +0000 (20:21 +0000)]
Merge "Merge "Create wrapper and shadow for AccessibilityManager" into oc-dr1-dev am:
d6c9a8b5b2 am:
b3a488c40c" into oc-mr1-dev-plus-aosp
am:
c3829cab9d
Change-Id: I64f2a3e4560fe7cab63deb194df0db1b8ddfa78b
jackqdyulei [Mon, 31 Jul 2017 20:20:47 +0000 (20:20 +0000)]
Merge "Merge "Create wrapper and shadow for AccessibilityManager" into oc-dr1-dev am:
d6c9a8b5b2 am:
68af5f3a5d" into oc-mr1-dev-plus-aosp
am:
d8664d6cba
Change-Id: I73affa5a3fb146ac4ddc62a96b16b54a4554b224
jackqdyulei [Mon, 31 Jul 2017 20:20:20 +0000 (20:20 +0000)]
Merge "Use package from sipper if default is null" into oc-mr1-dev am:
8be9d6519f
am:
6399937d47
Change-Id: I54392bce57eb20c96e51ee5270cc19d4b8d2b933
Fan Zhang [Mon, 31 Jul 2017 20:20:00 +0000 (20:20 +0000)]
Merge "Layout tweak for app action buttons" into oc-mr1-dev am:
48d54ff2f6
am:
1f0b09c924
Change-Id: I253da71b17e387c089b5fd3ee29fd4ac6597429d
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:34:29 +0000 (18:34 +0000)]
Merge "Change vision settings suggestion title" into oc-mr1-dev am:
9b89fb0080
am:
40c652b221
Change-Id: Ib966fa27205c8f07dafa02b8dcb61b37b99667fc
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
Maurice Lam [Mon, 31 Jul 2017 17:48:54 +0000 (17:48 +0000)]
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
Maurice Lam [Mon, 31 Jul 2017 17:48:31 +0000 (17:48 +0000)]
Merge "Align screen lock options to view start" into oc-dr1-dev am:
5e2e0df356 am:
7c5fc6737c
am:
d3c2026aae
Change-Id: I6a32995c441a6b48a0eecc9c98864e8504d7739c
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:16:21 +0000 (17:16 +0000)]
Merge "Add string needed to support carrier wifi in UI." into oc-mr1-dev am:
492c9f4d16
am:
99dc2bf58e
Change-Id: I7ee1f292f89cf4a66e8813ac8ea7e3a2804d9310
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
TreeHugger Robot [Mon, 31 Jul 2017 15:13:24 +0000 (15:13 +0000)]
Merge "Update work briefcase asset."
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:24:36 +0000 (00:24 +0000)]
Merge "Update search bar's navup content description" into oc-dr1-dev am:
b79d38f2f3 am:
d58a499c02
am:
320680e817
Change-Id: Ice553b789170afa27e1149951746daf2e2bf3f8c
Fan Zhang [Sat, 29 Jul 2017 00:23:56 +0000 (00:23 +0000)]
Merge "Update search bar's navup content description" into oc-dr1-dev am:
b79d38f2f3 am:
4d5172bfeb
am:
e0dee98e12
Change-Id: Ia2fae5915d65ba1141a5d4e37fad544c0860d102
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
Lei Yu [Fri, 28 Jul 2017 20:57:41 +0000 (20:57 +0000)]
Merge "Merge "Turn off some anomaly detectors by default" into oc-dr1-dev am:
f940431d32 am:
7cfaeeca58" into oc-mr1-dev-plus-aosp
am:
9848aafd79
Change-Id: Ifff392b8a0231731d32d131b024eaa32a4ec14a5
Lei Yu [Fri, 28 Jul 2017 20:57:18 +0000 (20:57 +0000)]
Merge "Turn off some anomaly detectors by default" into oc-dr1-dev am:
f940431d32 am:
90db9083ad
am:
5711389270
Change-Id: Ifafa37160dddc8799fcbca61715df18f952e7ef5
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
Fan Zhang [Fri, 28 Jul 2017 19:39:19 +0000 (19:39 +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
am:
4f1b9461fa
Change-Id: Id54aea464d3d129cd13bd2ecf88b3687d888a226
Fan Zhang [Fri, 28 Jul 2017 19:38:53 +0000 (19:38 +0000)]
Merge "Query search result intent before launching to avoid crash" into oc-dr1-dev am:
9f93faf7ae am:
81840033e3
am:
7a07f68794
Change-Id: Ib8f446f2bbde28ce98e7ad4e33550d7fdb8ad069
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
Bill Yi [Fri, 28 Jul 2017 18:43:06 +0000 (18:43 +0000)]
Merge "Import translations. DO NOT MERGE am:
8432802275 -s ours am:
3908af4a6d -s ours" into oc-mr1-dev-plus-aosp
am:
70b975d109 -s ours
Change-Id: Ie12db463b5f6fba9243902033d80b3e1b42d7f16
Bill Yi [Fri, 28 Jul 2017 18:42:39 +0000 (18:42 +0000)]
Import translations. DO NOT MERGE am:
8432802275 -s ours am:
be723e5868 -s ours
am:
91c157eb9a -s ours
Change-Id: Ibb67e97669b5e663558db29ad54289a223da760f
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
OSDN Git Service
