OSDN Git Service
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
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: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
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: I596f52f4db123c3df485a1a194966771706650db
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
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
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: I6dacb50f9fe4d6ba5a44e3a1249c58afe24747de
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
Ajay Nadathur [Fri, 28 Jul 2017 18:08:40 +0000 (18:08 +0000)]
Merge "Fix fingerprint enrollment bug that fails during last leg" into oc-mr1-dev am:
cfcd1c4b77
am:
8f0791a8e1
Change-Id: I5fb9a512746e45f67f8c783af897981af4c8830a
Ajay Nadathur [Fri, 28 Jul 2017 18:08:18 +0000 (18:08 +0000)]
Merge "Update text for lock screen notifications" into oc-mr1-dev am:
d2352cdd08
am:
4f27a4de98
Change-Id: Ic7caf0cfa42d0f835b238ea17289e68c8e1ac773
Ajay Nadathur [Fri, 28 Jul 2017 18:07:57 +0000 (18:07 +0000)]
Merge "Remove extra steps in fingerprint flow" into oc-mr1-dev am:
57a92e5a19
am:
60746517bf
Change-Id: Ib8d0417d7a8d96a97945db0e5299f5990386d9e6
Doris Ling [Fri, 28 Jul 2017 18:07:34 +0000 (18:07 +0000)]
Merge "Fix null pointer exception when updating action bar shadow." into oc-mr1-dev am:
51fb9ad956
am:
7cdb94384f
Change-Id: Iae7f415054b1848a4c33d89e176f38fb942ded03
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
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:12:22 +0000 (16:12 +0000)]
Import translations. DO NOT MERGE am:
129ed98650 -s ours
am:
1e719a0ed7 -s ours
Change-Id: I78b9084ec7eaf3e32a7938215088b2d24d3d588a
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
Bill Yi [Fri, 28 Jul 2017 09:52:17 +0000 (02:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iee17c5b632e8caa7d538fbc5bc1e095806e82b78
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
TreeHugger Robot [Fri, 28 Jul 2017 03:03:52 +0000 (03:03 +0000)]
Merge "Unify action buttons to a common widget (part 1)"
jackqdyulei [Fri, 28 Jul 2017 02:45:50 +0000 (02:45 +0000)]
Merge "Add ResultPayload for Allow notification dots am:
c50495ba06 am:
52aeaefbbe -s ours" into oc-mr1-dev-plus-aosp
am:
03b6f9a78c -s ours
Change-Id: I25dce62655c4d15076c1dec7af9ae51827a0edb3
jackqdyulei [Fri, 28 Jul 2017 02:45:20 +0000 (02:45 +0000)]
Add ResultPayload for Allow notification dots am:
c50495ba06 -s ours am:
1b4b6e490a -s ours
am:
fe64e2c80b -s ours
Change-Id: Ic7a7672003ea5dd753481200fb00e19af1ab4a77
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
jackqdyulei [Fri, 28 Jul 2017 02:40:02 +0000 (02:40 +0000)]
Add ResultPayload for Allow notification dots
am:
c50495ba06
Change-Id: I98790c3e21e28a9b4a6c7bb976c2c512f427ef09
jackqdyulei [Fri, 28 Jul 2017 02:40:00 +0000 (02:40 +0000)]
Add ResultPayload for Allow notification dots
am:
c50495ba06 -s ours
Change-Id: I96dd4e021bf51c330b10a9bba8901d66165cd787
Fan Zhang [Thu, 27 Jul 2017 19:14:59 +0000 (12:14 -0700)]
Unify action buttons to a common widget (part 1)
- Create a preference type to host action button preferences.
- Convert app battery usage page to use the new preference
- Convert wifi detail page to use the new preference
Change-Id: I60bc473986ab46f2897e2537eb0e013fa813a4fc
Fix:
63991885
Test: robotests
Fan Zhang [Fri, 28 Jul 2017 00:50:41 +0000 (17:50 -0700)]
Query search result intent before launching to avoid crash
If intent cannot launch, log error.
Change-Id: Ib6f37da467749be1ef09e6665dcab122e71a52d3
Fix:
64065678
Test: robotests
Doris Ling [Fri, 28 Jul 2017 00:28:32 +0000 (00:28 +0000)]
Merge "Merge "Limit the suggestions to be shown to 5." into oc-dr1-dev am:
70f0013e43 -s ours am:
e1b04c987b -s ours" into oc-mr1-dev-plus-aosp
am:
1007885701 -s ours
Change-Id: Iaf4466acd516b44f60bf1fd573ad108e30d0e676
Doris Ling [Fri, 28 Jul 2017 00:28:03 +0000 (00:28 +0000)]
Merge "Limit the suggestions to be shown to 5." into oc-dr1-dev am:
70f0013e43 am:
1b2ec4f096 -s ours
am:
c691528377 -s ours
Change-Id: Ic271833cd6d281d5cf51b8d0e8f385e55d7484e7
Android Build Merger (Role) [Fri, 28 Jul 2017 00:00:55 +0000 (00:00 +0000)]
Merge "Merge "Limit the suggestions to be shown to 5." into oc-dr1-dev am:
70f0013e43 -s ours am:
e1b04c987b -s ours" into oc-mr1-dev-plus-aosp
Doris Ling [Thu, 27 Jul 2017 23:59:19 +0000 (23:59 +0000)]
Merge "Limit the suggestions to be shown to 5." into oc-dr1-dev am:
70f0013e43
am:
1b2ec4f096 -s ours
Change-Id: I82d433fbb10e186fb99808f1fc22fa9c58b36dc6
Doris Ling [Thu, 27 Jul 2017 23:56:21 +0000 (23:56 +0000)]
Merge "Limit the suggestions to be shown to 5." into oc-dr1-dev am:
70f0013e43 -s ours
am:
e1b04c987b -s ours
Change-Id: I3b44fd463983de7478132765493ea298fba2a974
Doris Ling [Thu, 27 Jul 2017 23:53:47 +0000 (23:53 +0000)]
Merge "Limit the suggestions to be shown to 5." into oc-dr1-dev
am:
70f0013e43
Change-Id: I560de5fdb872558edd6315e377bd5b01399412a8
Doris Ling [Thu, 27 Jul 2017 23:53:47 +0000 (23:53 +0000)]
Merge "Limit the suggestions to be shown to 5." into oc-dr1-dev
am:
70f0013e43 -s ours
Change-Id: Ic60a092e88422210572ff2ae455793165453ae73
jackqdyulei [Tue, 25 Jul 2017 01:34:33 +0000 (18:34 -0700)]
Add ResultPayload for Allow notification dots
Bug:
62022517
Test: robotests
Change-Id: I86caa1c8604ae8eff27574ca45b5e9f3f6830f8f
Merged-In: I86caa1c8604ae8eff27574ca45b5e9f3f6830f8f
TreeHugger Robot [Thu, 27 Jul 2017 23:41:35 +0000 (23:41 +0000)]
Merge "Limit the suggestions to be shown to 5." into oc-dr1-dev
Salvador Martinez [Thu, 27 Jul 2017 23:18:17 +0000 (23:18 +0000)]
Merge "Change visibility of some UsbBackend fields/methods" into oc-dr1-dev am:
7f87347eb9 am:
3bca521f3a
am:
36dbb6e07c
Change-Id: Ib277491c161d4071f9c6620a2026b7d5a7038303
Salvador Martinez [Thu, 27 Jul 2017 22:51:15 +0000 (22:51 +0000)]
Merge "Change visibility of some UsbBackend fields/methods" into oc-dr1-dev am:
7f87347eb9 am:
8e15db0ec9
am:
3d869b6324
Change-Id: I58c7630fe92360cf1c68f6716657b2dac5e59b76
Fan Zhang [Thu, 27 Jul 2017 22:50:50 +0000 (22:50 +0000)]
Update condition tile action button text color am:
951decebb4 am:
4748098d10
am:
578207f109
Change-Id: Ibc0ca6a8d08cebb3b21e2878b1a7cc352aca7831
Fan Zhang [Thu, 27 Jul 2017 22:50:25 +0000 (22:50 +0000)]
Update condition tile action button text color am:
951decebb4 am:
a5dc1d2470
am:
f01de6015f
Change-Id: I4e1c7a24e5f63077414c8acf866472e4dee8b512
Salvador Martinez [Thu, 27 Jul 2017 22:34:00 +0000 (22:34 +0000)]
Merge "Change visibility of some UsbBackend fields/methods" into oc-dr1-dev am:
7f87347eb9
am:
3bca521f3a
Change-Id: I9d08a044e300d3173020704f09e6e273994b96aa
Salvador Martinez [Thu, 27 Jul 2017 22:31:42 +0000 (22:31 +0000)]
Merge "Change visibility of some UsbBackend fields/methods" into oc-dr1-dev am:
7f87347eb9
am:
8e15db0ec9
Change-Id: Iddec3a43f12242f030f32bb42505c908bf3c7ce4
Salvador Martinez [Thu, 27 Jul 2017 22:26:58 +0000 (22:26 +0000)]
Merge "Change visibility of some UsbBackend fields/methods" into oc-dr1-dev
am:
7f87347eb9
Change-Id: I0f300734820634009197c7b9ca85e3973d87a0cb
Salvador Martinez [Thu, 27 Jul 2017 22:24:27 +0000 (22:24 +0000)]
Merge "Change visibility of some UsbBackend fields/methods" into oc-dr1-dev
am:
7f87347eb9
Change-Id: I286ed310140f522c67fa4c3c6af539938a66207d
Fan Zhang [Thu, 27 Jul 2017 22:20:55 +0000 (22:20 +0000)]
Update condition tile action button text color am:
951decebb4
am:
4748098d10
Change-Id: Iedd82040fb727c5d9ac5fa89f0d08b806df51b9b
Fan Zhang [Thu, 27 Jul 2017 22:16:58 +0000 (22:16 +0000)]
Update condition tile action button text color am:
951decebb4
am:
a5dc1d2470
Change-Id: I618f6c9795b4c5c1b728f1acdc2681ce4686d910
TreeHugger Robot [Thu, 27 Jul 2017 22:16:48 +0000 (22:16 +0000)]
Merge "Change visibility of some UsbBackend fields/methods" into oc-dr1-dev
Fan Zhang [Thu, 27 Jul 2017 22:10:35 +0000 (22:10 +0000)]
Update condition tile action button text color
am:
951decebb4
Change-Id: Ie7d0b97ebb61654ad6ea0570ee033a7a037a2b09
Fan Zhang [Thu, 27 Jul 2017 22:10:35 +0000 (22:10 +0000)]
Update condition tile action button text color
am:
951decebb4
Change-Id: I6dba9ab81515f3e80254a1e59a0ae95132bc02f3
Ajay Nadathur [Thu, 27 Jul 2017 19:11:30 +0000 (12:11 -0700)]
Remove extra steps in fingerprint flow
bug:
63900851
Test: Manually tested and verified
Change-Id: Ic7ff0b21dac971edf40a9a9398aef68c2fccd971
(cherry picked from commit
e24f1ab745ba29fbfc5dbc43a4f422b3916798a9)
Ajay Nadathur [Thu, 27 Jul 2017 21:57:12 +0000 (21:57 +0000)]
Merge "Remove extra steps in fingerprint flow"
Doris Ling [Thu, 27 Jul 2017 21:26:31 +0000 (21:26 +0000)]
Merge "Limit the suggestions to be shown to 5." into oc-mr1-dev am:
1f34a5cf46
am:
a374e1062c
Change-Id: I7773754b0f262f2256735de3d98cc4e64d9f7be6
Doris Ling [Thu, 27 Jul 2017 21:21:01 +0000 (21:21 +0000)]
Merge "Limit the suggestions to be shown to 5." into oc-mr1-dev
am:
1f34a5cf46
Change-Id: I165b63605b7a55ea0b64c56f87a7ace291a44a28
TreeHugger Robot [Thu, 27 Jul 2017 21:14:43 +0000 (21:14 +0000)]
Merge "Limit the suggestions to be shown to 5." into oc-mr1-dev
TreeHugger Robot [Thu, 27 Jul 2017 21:03:42 +0000 (21:03 +0000)]
Merge "Update text for lock screen notifications"
Doris Ling [Wed, 26 Jul 2017 23:20:13 +0000 (16:20 -0700)]
Limit the suggestions to be shown to 5.
- when creating the dashboard data, pass the sublist of suggestions to
cap the total number of suggestions to be shown to 5.
- if user swipe away the suggestion, it will only remove the suggestion
from the suggestion adapater, and will not trigger rebuilding the whole
UI.
Change-Id: I3bbc08bb67c411ff5671a837efa40da0ac885983
Merged-In: I1efabeb2a805c670007c631d3ccb0fdfbde7b55a
Fix:
64072051
Test: make RunSettingsRoboTests
Fan Zhang [Thu, 27 Jul 2017 19:24:27 +0000 (12:24 -0700)]
Update condition tile action button text color
Text color needs to be darker for accessibility reasons.
Change-Id: I3ff37f36281d70dd180c0747a707b597139157c2
Fix:
64068145
Test: visual
Ajay Nadathur [Thu, 27 Jul 2017 19:11:30 +0000 (12:11 -0700)]
Remove extra steps in fingerprint flow
bug:
63900851
Test: Manually tested and verified
Change-Id: Ic7ff0b21dac971edf40a9a9398aef68c2fccd971
Android Build Merger (Role) [Thu, 27 Jul 2017 18:45:53 +0000 (18:45 +0000)]
Merge "Merge "Don't update the header when toggle menu" into oc-dr1-dev am:
4ab4966e7a am:
8541d8905a am:
e4c555fcb8"
jackqdyulei [Thu, 27 Jul 2017 18:45:39 +0000 (18:45 +0000)]
Merge "Don't update the header when toggle menu" into oc-dr1-dev am:
4ab4966e7a am:
8541d8905a
am:
e4c555fcb8
Change-Id: Id7631f3d4d190a6d29272cdaf52c6d3b0b330c25
Android Build Merger (Role) [Thu, 27 Jul 2017 18:45:32 +0000 (18:45 +0000)]
Merge "Merge "Settings: Fix SparseArray null pointer issue in monkey issues" am:
41b4d908bb am:
3aee5e1ad0 am:
86535a3d15 am:
62bb1e75ac am:
8071e11d87"
Maurice Lam [Thu, 27 Jul 2017 18:45:25 +0000 (18:45 +0000)]
Merge "Raise CHAR LIMIT and update description"
Jian Zhou [Thu, 27 Jul 2017 18:45:20 +0000 (18:45 +0000)]
Merge "Settings: Fix SparseArray null pointer issue in monkey issues" am:
41b4d908bb am:
3aee5e1ad0 am:
86535a3d15 am:
62bb1e75ac
am:
8071e11d87
Change-Id: I60ffd8a6328b64952176c91922411000e86a9d31
Ryusuke Sawa [Thu, 27 Jul 2017 18:44:55 +0000 (18:44 +0000)]
Merge "Show Error dialog when WPS is interrupted" am:
fd7dec5d4a am:
b0e008841f am:
6b46a9df49 am:
775c1c8eb5
am:
653ef15253
Change-Id: I4b48899bd33466742cbe3bf93d9b5fe01d4472ea
jackqdyulei [Thu, 27 Jul 2017 18:44:26 +0000 (18:44 +0000)]
Merge "Don't update the header when toggle menu" into oc-dr1-dev am:
4ab4966e7a am:
16afa828c7
am:
9b6a6e903d
Change-Id: I7705b7a64bfd8487d9e2d00ad1eba293ec8f096a
Salvador Martinez [Tue, 25 Jul 2017 18:11:48 +0000 (11:11 -0700)]
Change visibility of some UsbBackend fields/methods
Some utility methods in UsbBackend were needed elsewhere so this CL
increases their visibility slightly rather than copying the code.
Test: Robotests still pass
Bug:
62271803
Change-Id: If8ac5494e306ac7f4f6d8eeef75f516308c78026
jackqdyulei [Thu, 27 Jul 2017 18:31:56 +0000 (18:31 +0000)]
Merge "Don't update the header when toggle menu" into oc-dr1-dev am:
4ab4966e7a
am:
8541d8905a
Change-Id: I533528c9bd97d517357a7f7babd5e756b5d97bc3
Jian Zhou [Thu, 27 Jul 2017 18:29:03 +0000 (18:29 +0000)]
Merge "Settings: Fix SparseArray null pointer issue in monkey issues" am:
41b4d908bb am:
3aee5e1ad0 am:
86535a3d15
am:
62bb1e75ac
Change-Id: I9dc6da68107514e839b4284a4aeab47f43f745e6
Ryusuke Sawa [Thu, 27 Jul 2017 18:28:17 +0000 (18:28 +0000)]
Merge "Show Error dialog when WPS is interrupted" am:
fd7dec5d4a am:
b0e008841f am:
6b46a9df49
am:
775c1c8eb5
Change-Id: Ib66a063ebbee94370f69be336d82706da39be427
Jian Zhou [Thu, 27 Jul 2017 18:26:35 +0000 (18:26 +0000)]
Merge "Settings: Fix SparseArray null pointer issue in monkey issues" am:
41b4d908bb am:
3aee5e1ad0
am:
86535a3d15
Change-Id: Ia6f34a3cf6e9b64669ca494c5088791ae5021092
jackqdyulei [Thu, 27 Jul 2017 18:26:24 +0000 (18:26 +0000)]
Merge "Don't update the header when toggle menu" into oc-dr1-dev am:
4ab4966e7a
am:
16afa828c7
Change-Id: I16bcd80c82ed42f65b1490f1f8189e5e55844688
Ryusuke Sawa [Thu, 27 Jul 2017 18:26:18 +0000 (18:26 +0000)]
Merge "Show Error dialog when WPS is interrupted" am:
fd7dec5d4a am:
b0e008841f
am:
6b46a9df49
Change-Id: I80fff447ce87a40d7180b9e25cb53888f681b469
Jian Zhou [Thu, 27 Jul 2017 18:24:10 +0000 (18:24 +0000)]
Merge "Settings: Fix SparseArray null pointer issue in monkey issues" am:
41b4d908bb
am:
3aee5e1ad0
Change-Id: I2b3686a91254fd6f0a1050cf8be68304a70a03f5
Ryusuke Sawa [Thu, 27 Jul 2017 18:23:51 +0000 (18:23 +0000)]
Merge "Show Error dialog when WPS is interrupted" am:
fd7dec5d4a
am:
b0e008841f
Change-Id: I31f65d59a105db0fc49e73c4e3d7005d0102906d
Jian Zhou [Thu, 27 Jul 2017 18:22:21 +0000 (18:22 +0000)]
Merge "Settings: Fix SparseArray null pointer issue in monkey issues"
am:
41b4d908bb
Change-Id: If3c634811506bdc9f3de5501e60f6a662ac2873a
Ryusuke Sawa [Thu, 27 Jul 2017 18:21:19 +0000 (18:21 +0000)]
Merge "Show Error dialog when WPS is interrupted"
am:
fd7dec5d4a
Change-Id: I5ff4247745eba606c22481466f2b9a49e1c604d3
jackqdyulei [Thu, 27 Jul 2017 18:21:16 +0000 (18:21 +0000)]
Merge "Don't update the header when toggle menu" into oc-dr1-dev
am:
4ab4966e7a
Change-Id: I3a814981c648d9b777d2fbf5a2d243864aaaee3c
jackqdyulei [Thu, 27 Jul 2017 18:21:16 +0000 (18:21 +0000)]
Merge "Don't update the header when toggle menu" into oc-dr1-dev
am:
4ab4966e7a
Change-Id: I323a94bc867d7575bd7ec7e34c506dd8e78ec2d1
Soroosh Mariooryad [Thu, 27 Jul 2017 18:16:21 +0000 (18:16 +0000)]
Merge "Merge "Update suggestion ranking model coefficients." into oc-dr1-dev am:
c3bb4cd8c0 am:
6f0e9273f8" into oc-mr1-dev-plus-aosp
am:
f0184bbc35
Change-Id: Ib1938fb8d3cc5f6b6862a0fee7b5fc2cd124ecff
Treehugger Robot [Thu, 27 Jul 2017 18:16:08 +0000 (18:16 +0000)]
Merge "Settings: Fix SparseArray null pointer issue in monkey issues"