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
Lei Yu
cb958642b6
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
2017-07-28 20:57:41 +00:00
Lei Yu
3e9e4d5bcd
Merge "Turn off some anomaly detectors by default" into oc-dr1-dev am: f940431d32
am: 90db9083ad
...
am: 5711389270
Change-Id: Ifafa37160dddc8799fcbca61715df18f952e7ef5
2017-07-28 20:57:18 +00:00
Android Build Merger (Role)
9848aafd79
Merge "Merge "Turn off some anomaly detectors by default" into oc-dr1-dev am: f940431d32
am: 7cfaeeca58" into oc-mr1-dev-plus-aosp
2017-07-28 20:54:05 +00:00
Lei Yu
959be5f0f5
Merge "Turn off some anomaly detectors by default" into oc-dr1-dev am: f940431d32
...
am: 7cfaeeca58
Change-Id: I04315d3e4ff3bda720468f94940d8d11f76d01e0
2017-07-28 20:53:47 +00: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
Fan Zhang
58f9963fb7
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
2017-07-28 19:39:19 +00:00
Fan Zhang
83a427c543
Merge "Query search result intent before launching to avoid crash" into oc-dr1-dev am: 9f93faf7ae
am: 81840033e3
...
am: 7a07f68794
Change-Id: Ib8f446f2bbde28ce98e7ad4e33550d7fdb8ad069
2017-07-28 19:38:53 +00:00
Android Build Merger (Role)
4f1b9461fa
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
2017-07-28 19:34:48 +00:00
Fan Zhang
a4caed71df
Merge "Query search result intent before launching to avoid crash" into oc-dr1-dev am: 9f93faf7ae
...
am: ae0dbe3e13
Change-Id: Ica05aff63af3f64996a434862cf60b358d0f8bfc
2017-07-28 19:34:29 +00: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
Bill Yi
c86821c472
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
2017-07-28 18:43:06 +00:00
Bill Yi
c2e95de62e
Import translations. DO NOT MERGE am: 8432802275
-s ours am: be723e5868
-s ours
...
am: 91c157eb9a
-s ours
Change-Id: Ibb67e97669b5e663558db29ad54289a223da760f
2017-07-28 18:42:39 +00:00
Android Build Merger (Role)
70b975d109
Merge "Import translations. DO NOT MERGE am: 8432802275
-s ours am: 3908af4a6d
-s ours" into oc-mr1-dev-plus-aosp
2017-07-28 18:39:08 +00:00
Bill Yi
91c157eb9a
Import translations. DO NOT MERGE am: 8432802275
-s ours
...
am: be723e5868
-s ours
Change-Id: If5f3769fcbd92212d61d70b3dcecf9f80c58e991
2017-07-28 18:38:37 +00:00
Bill Yi
08c39de146
Import translations. DO NOT MERGE am: 8432802275
-s ours
...
am: 3908af4a6d
-s ours
Change-Id: Icafe96c868f340b6fa48cc0052aca178071d1817
2017-07-28 18:38:36 +00:00
Bill Yi
3908af4a6d
Import translations. DO NOT MERGE
...
am: 8432802275
-s ours
Change-Id: I447c5c121a9aca19f9ca2da7ac29e2dae439864a
2017-07-28 18:34:04 +00:00
Bill Yi
be723e5868
Import translations. DO NOT MERGE
...
am: 8432802275
-s ours
Change-Id: I6dacb50f9fe4d6ba5a44e3a1249c58afe24747de
2017-07-28 18:34:04 +00:00
Ajay Nadathur
2248d82396
Merge "Fix fingerprint enrollment bug that fails during last leg" into oc-mr1-dev am: cfcd1c4b77
...
am: 8f0791a8e1
Change-Id: I5fb9a512746e45f67f8c783af897981af4c8830a
2017-07-28 18:08:40 +00:00
Ajay Nadathur
f012c892a2
Merge "Update text for lock screen notifications" into oc-mr1-dev am: d2352cdd08
...
am: 4f27a4de98
Change-Id: Ic7caf0cfa42d0f835b238ea17289e68c8e1ac773
2017-07-28 18:08:18 +00:00
Ajay Nadathur
3f21efd762
Merge "Remove extra steps in fingerprint flow" into oc-mr1-dev am: 57a92e5a19
...
am: 60746517bf
Change-Id: Ib8d0417d7a8d96a97945db0e5299f5990386d9e6
2017-07-28 18:07:57 +00:00
Doris Ling
c2b7f12f30
Merge "Fix null pointer exception when updating action bar shadow." into oc-mr1-dev am: 51fb9ad956
...
am: 7cdb94384f
Change-Id: Iae7f415054b1848a4c33d89e176f38fb942ded03
2017-07-28 18:07:34 +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
4f27a4de98
Merge "Update text for lock screen notifications" into oc-mr1-dev
...
am: d2352cdd08
Change-Id: Id8f23cc08b481405c82318972107e283035816a7
2017-07-28 17:51:03 +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
d2352cdd08
Merge "Update text for lock screen notifications" into oc-mr1-dev
2017-07-28 17:45:00 +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
Fan Zhang
ca9ddd45fe
Update search bar's navup content description
...
It should read "Search settings"
Change-Id: I1a55f905949341b290ea5f224171592cf5021e31
Fix: 64140213
Test: talkback
2017-07-28 10:23:00 -07: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
jackqdyulei
5a3be2874e
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
2017-07-28 09:39:32 -07:00
Bill Yi
db1d8fd737
Import translations. DO NOT MERGE am: 129ed98650
-s ours
...
am: 1e719a0ed7
-s ours
Change-Id: I78b9084ec7eaf3e32a7938215088b2d24d3d588a
2017-07-28 16:12:22 +00:00
Bill Yi
1e719a0ed7
Import translations. DO NOT MERGE
...
am: 129ed98650
-s ours
Change-Id: I6778963c60c8e1a973c084d5ec1889d3e0d13848
2017-07-28 16:09:52 +00:00
Bill Yi
8432802275
Import translations. DO NOT MERGE
...
Change-Id: If9cb3de5de1845431f075d5ca6c7935d49e0e6f7
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-28 03:27:50 -07:00
Bill Yi
129ed98650
Import translations. DO NOT MERGE
...
Change-Id: Ie25fb80dbf73c1681c72adf0cfac13c319f952b7
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-28 03:08:41 -07:00
Bill Yi
43ccd90085
Import translations. DO NOT MERGE
...
Change-Id: Iee17c5b632e8caa7d538fbc5bc1e095806e82b78
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-28 02:52:17 -07:00
TreeHugger Robot
3902516a25
Merge "Unify action buttons to a common widget (part 1)"
2017-07-28 03:03:52 +00:00