Lei Yu
d2bce9d176
Merge "Merge "Turn on bluetooth anomaly detector" into oc-dr1-dev am: 2750dd8d6d am: 95fc90a45c" into oc-mr1-dev-plus-aosp
...
am: 2726d7b2cd
2017-08-03 17:24:29 +00:00
Lei Yu
f12d0394c7
Merge "Turn on bluetooth anomaly detector" into oc-dr1-dev am: 2750dd8d6d am: fab00d4262
...
am: aefe48590c
2017-08-03 17:24:07 +00:00
Android Build Merger (Role)
2726d7b2cd
Merge "Merge "Turn on bluetooth anomaly detector" into oc-dr1-dev am: 2750dd8d6d am: 95fc90a45c" into oc-mr1-dev-plus-aosp
2017-08-03 17:14:05 +00:00
Lei Yu
aefe48590c
Merge "Turn on bluetooth anomaly detector" into oc-dr1-dev am: 2750dd8d6d
...
am: fab00d4262
2017-08-03 17:13:36 +00:00
Lei Yu
c519698765
Merge "Turn on bluetooth anomaly detector" into oc-dr1-dev am: 2750dd8d6d
...
am: 95fc90a45c
2017-08-03 17:13:36 +00:00
Lei Yu
fab00d4262
Merge "Turn on bluetooth anomaly detector" into oc-dr1-dev
...
am: 2750dd8d6d
2017-08-03 17:08:05 +00:00
Lei Yu
95fc90a45c
Merge "Turn on bluetooth anomaly detector" into oc-dr1-dev
...
am: 2750dd8d6d
2017-08-03 17:08:05 +00:00
Ajay Nadathur
4aa65a6ed5
Merge "Fingerprint added graphic is bigger than enrolling progressbar" into oc-mr1-dev am: 1908c4010b
...
am: 1f2317c4b4
2017-08-03 16:57:05 +00:00
Lei Yu
2750dd8d6d
Merge "Turn on bluetooth anomaly detector" into oc-dr1-dev
2017-08-03 16:55:03 +00:00
Ajay Nadathur
1f2317c4b4
Merge "Fingerprint added graphic is bigger than enrolling progressbar" into oc-mr1-dev
...
am: 1908c4010b
2017-08-03 16:51:06 +00:00
Ajay Nadathur
1908c4010b
Merge "Fingerprint added graphic is bigger than enrolling progressbar" into oc-mr1-dev
2017-08-03 16:45:10 +00:00
Kenny Guy
332272b596
Update work briefcase asset. am: 27ea052133
...
am: 413d71d400
2017-08-03 14:26:24 +00:00
Kenny Guy
413d71d400
Update work briefcase asset.
...
am: 27ea052133
2017-08-03 14:20:53 +00:00
Kenny Guy
27ea052133
Update work briefcase asset.
...
Bug: 36497538
Test: manual
Change-Id: If8c7385f75c1ff5b9fc257991e1c3255a70c8f8b
(cherry picked from commit bb504346c7
2017-08-03 09:48:28 +00:00
TreeHugger Robot
9510aa7649
Merge "[Companion] Make notification dialog non-cancelable"
2017-08-03 04:59:45 +00:00
Eugene Susla
d004a96c5b
[Companion] Make notification dialog non-cancelable
...
Bug: 63405718
Test: Ensute that the notification access dialog is not dismissable with
either back button or touch outside
Change-Id: I613da247a2adc0571478f649a2191cd5840359f0
2017-08-02 20:06:50 -07:00
Amit Mahajan
0e46ba10dc
Merge "Change to not cache user entered apn type as user may change it." into oc-dr1-dev am: d1c3bb1341 am: 3d8d9808dd
...
am: 896037a1dc
2017-08-03 02:13:42 +00:00
Amit Mahajan
11816c6f10
Merge "Change to not cache user entered apn type as user may change it." into oc-dr1-dev am: d1c3bb1341 am: 0af5de0639
...
am: fdb5c991c1
2017-08-03 02:13:20 +00:00
Amit Mahajan
896037a1dc
Merge "Change to not cache user entered apn type as user may change it." into oc-dr1-dev am: d1c3bb1341
...
am: 3d8d9808dd
2017-08-03 02:03:18 +00:00
Amit Mahajan
fdb5c991c1
Merge "Change to not cache user entered apn type as user may change it." into oc-dr1-dev am: d1c3bb1341
...
am: 0af5de0639
2017-08-03 02:02:37 +00:00
Amit Mahajan
0af5de0639
Merge "Change to not cache user entered apn type as user may change it." into oc-dr1-dev
...
am: d1c3bb1341
2017-08-03 01:57:38 +00:00
Amit Mahajan
3d8d9808dd
Merge "Change to not cache user entered apn type as user may change it." into oc-dr1-dev
...
am: d1c3bb1341
2017-08-03 01:57:38 +00:00
TreeHugger Robot
d1c3bb1341
Merge "Change to not cache user entered apn type as user may change it." into oc-dr1-dev
2017-08-03 01:46:21 +00:00
TreeHugger Robot
187b2f9d0c
Merge "Convert app storage page to use generic ActionButtonPref"
2017-08-02 23:29:13 +00:00
Bill Yi
fb1c973621
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: a3bdce963f -s ours am: 52498c1da9 -s ours
...
am: 97d8360fc5
2017-08-02 22:21:53 +00:00
Bill Yi
d9c14efd16
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: a3bdce963f -s ours am: f366a8716a -s ours
...
am: 290200b2a7
2017-08-02 22:17:07 +00:00
Bill Yi
97d8360fc5
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: a3bdce963f -s ours
...
am: 52498c1da9
2017-08-02 22:16:53 +00:00
Bill Yi
52498c1da9
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: a3bdce963f
2017-08-02 22:12:38 +00:00
Bill Yi
290200b2a7
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: a3bdce963f -s ours
...
am: f366a8716a
2017-08-02 22:11:51 +00:00
Bill Yi
f366a8716a
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: a3bdce963f
2017-08-02 22:07:22 +00:00
TreeHugger Robot
a3bdce963f
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
2017-08-02 21:57:36 +00:00
Fan Zhang
2a1fbd45b6
Merge "Support dynamic summary and icon for injected tiles"
2017-08-02 21:39:56 +00:00
Fan Zhang
915001cbd5
Style action bar during onResume instead of onCreate am: e156d9a59f am: 97e850ade9 -s ours
...
am: 50790d76fa
2017-08-02 21:15:24 +00:00
Fan Zhang
50790d76fa
Style action bar during onResume instead of onCreate am: e156d9a59f
...
am: 97e850ade9
2017-08-02 21:10:23 +00:00
Fan Zhang
7e6037b4b2
Style action bar during onResume instead of onCreate am: e156d9a59f -s ours am: cb9f8a8ebc
...
am: 85a0a5771e
2017-08-02 21:05:23 +00:00
Fan Zhang
0d302dbaf1
Style action bar during onResume instead of onCreate am: 50eb81f114
...
am: a31da35b74
2017-08-02 21:04:49 +00:00
Fan Zhang
85a0a5771e
Style action bar during onResume instead of onCreate am: e156d9a59f -s ours
...
am: cb9f8a8ebc
2017-08-02 21:01:43 +00:00
Fan Zhang
a31da35b74
Style action bar during onResume instead of onCreate
...
am: 50eb81f114
2017-08-02 21:01:16 +00:00
Fan Zhang
cb9f8a8ebc
Style action bar during onResume instead of onCreate
...
am: e156d9a59f
2017-08-02 20:59:50 +00:00
Fan Zhang
97e850ade9
Style action bar during onResume instead of onCreate
...
am: e156d9a59f
2017-08-02 20:50:24 +00:00
Ajay Nadathur
c13273687a
Fingerprint added graphic is bigger than enrolling progressbar
...
bug: 63714762
Test: Manually tested
Change-Id: I415ab41bb985eb52146693091d61152b51ecfd6c
2017-08-02 20:32:03 +00:00
Saige McVea
ab1417a319
Merge "Update generic icon in accessibility settings to a lighter colour."
2017-08-02 19:54:02 +00:00
Bill Yi
2533ebcc83
Import translations. DO NOT MERGE
...
Change-Id: Ie91a9117688052ec898ebf955a9c6978e1304af6
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-02 12:47:11 -07:00
Rajeev Kumar
43f411394f
Merge "Replace with HashMap with ArrayMap."
2017-08-02 19:26:09 +00:00
TreeHugger Robot
89a8d6afb8
Merge "Delete unused classes"
2017-08-02 18:58:51 +00:00
Fan Zhang
e156d9a59f
Style action bar during onResume instead of onCreate
...
Change-Id: I628266e7062e514d2044c9e32668db23094d82e6
Merged-In: Ib57bf128b644737b5a34238ec85ca6d740543c5f
Fix: 64284689
Bug: 64297479
Test: robotests
2017-08-02 11:34:35 -07:00
jackqdyulei
dff144ad62
Turn on bluetooth anomaly detector
...
Since the related bug in battery stats is fixed, it is safe to
turn it on.
Also fix a bug in LocationCheckAction. In PermissionChecker we should
use permission name to check, not permission group name.
Bug: 64255601
Test: RunSettingsRoboTests
Change-Id: Ief8b5dc98f8a7ae462eb84936f6f61d626d7cddd
2017-08-02 11:24:16 -07:00
Fan Zhang
50eb81f114
Style action bar during onResume instead of onCreate
...
Change-Id: Ib57bf128b644737b5a34238ec85ca6d740543c5f
Fix: 64284689
Bug: 64297479
Test: robotests
2017-08-02 17:58:47 +00:00
TreeHugger Robot
04ff5a4b66
Merge "Ensure a11y ids for LabeledSeekBar are in bounds"
2017-08-02 17:23:58 +00:00
Amit Mahajan
9eac2f7cbc
Change to not cache user entered apn type as user may change it.
...
Test: manual
Bug: 64263412
Change-Id: Idc49109926e123eddec7f6553f3c493b1ed22212
2017-08-02 09:59:03 -07:00
