Maurice Lam
d3c2026aae
Merge "Align screen lock options to view start" into oc-dr1-dev am: 5e2e0df356
...
am: 7c5fc6737c
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
2017-07-31 17:41:13 +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
99dc2bf58e
Merge "Add string needed to support carrier wifi in UI." into oc-mr1-dev
...
am: 492c9f4d16
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
Fan Zhang
320680e817
Merge "Update search bar's navup content description" into oc-dr1-dev am: b79d38f2f3
...
am: d58a499c02
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Maurice Lam
9136effad6
Align screen lock options to view start
...
Test: Manual
Bug: 63715610
Change-Id: If723a200ee402dcd7204e20e2a02cb151935d1fd
2017-07-28 18:39:09 +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
2017-07-28 18:38:37 +00:00
Bill Yi
08c39de146
Import translations. DO NOT MERGE am: 8432802275 -s ours
...
am: 3908af4a6d
2017-07-28 18:38:36 +00:00
Bill Yi
3908af4a6d
Import translations. DO NOT MERGE
...
am: 8432802275
2017-07-28 18:34:04 +00:00
Bill Yi
be723e5868
Import translations. DO NOT MERGE
...
am: 8432802275
2017-07-28 18:34:04 +00:00
Ajay Nadathur
8f0791a8e1
Merge "Fix fingerprint enrollment bug that fails during last leg" into oc-mr1-dev
...
am: cfcd1c4b77
2017-07-28 17:51:25 +00:00
Ajay Nadathur
4f27a4de98
Merge "Update text for lock screen notifications" into oc-mr1-dev
...
am: d2352cdd08
2017-07-28 17:51:03 +00:00
Ajay Nadathur
60746517bf
Merge "Remove extra steps in fingerprint flow" into oc-mr1-dev
...
am: 57a92e5a19
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
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
1e719a0ed7
Import translations. DO NOT MERGE
...
am: 129ed98650
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
Android Build Merger (Role)
03b6f9a78c
Merge "Add ResultPayload for Allow notification dots am: c50495ba06 am: 52aeaefbbe -s ours" into oc-mr1-dev-plus-aosp
2017-07-28 02:42:59 +00:00
jackqdyulei
cdc2db9969
Add ResultPayload for Allow notification dots am: c50495ba06
...
am: 52aeaefbbe
2017-07-28 02:42:44 +00:00
jackqdyulei
fe64e2c80b
Add ResultPayload for Allow notification dots am: c50495ba06 -s ours
...
am: 1b4b6e490a
2017-07-28 02:42:32 +00:00
jackqdyulei
52aeaefbbe
Add ResultPayload for Allow notification dots
...
am: c50495ba06
2017-07-28 02:40:02 +00:00
jackqdyulei
1b4b6e490a
Add ResultPayload for Allow notification dots
...
am: c50495ba06
2017-07-28 02:40:00 +00:00
Fan Zhang
add4b5c413
Query search result intent before launching to avoid crash
...
If intent cannot launch, log error.
Change-Id: Ib6f37da467749be1ef09e6665dcab122e71a52d3
Fix: 64065678
Test: robotests
2017-07-28 00:52:04 +00:00
Android Build Merger (Role)
1007885701
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
2017-07-28 00:00:55 +00:00
Doris Ling
c691528377
Merge "Limit the suggestions to be shown to 5." into oc-dr1-dev am: 70f0013e43
...
am: 1b2ec4f096
2017-07-27 23:59:19 +00:00
