Commit Graph

38960 Commits

Author SHA1 Message Date
Lei Yu
c519698765 Merge "Turn on bluetooth anomaly detector" into oc-dr1-dev am: 2750dd8d6d
am: 95fc90a45c

Change-Id: Ic6636bf1bf7cfe4561eb38f7081e9dee8235352f
2017-08-03 17:13:36 +00:00
Lei Yu
95fc90a45c Merge "Turn on bluetooth anomaly detector" into oc-dr1-dev
am: 2750dd8d6d

Change-Id: I39fc570ff7af36a55d46aa2d626a94fbba2c1190
2017-08-03 17:08: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

Change-Id: I949aa81a0a88be0824590d85a50400b1b1268d3f
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
413d71d400 Update work briefcase asset.
am: 27ea052133

Change-Id: I1ddee0d3c4da6b41b51a38aa1bad9ce3b1c14840
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
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

Change-Id: I50dd513140c05aeee04552f009ea010b84f8dade
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

Change-Id: I70d05c9f4ae755dd9958aac60a9ca6ac8592ca07
2017-08-03 02:02:37 +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

Change-Id: If5018f14c636f6634e70771471ee6ee2103a0ede
2017-08-03 01:57:38 +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

Change-Id: I693e64b11f9f4320d57749e35143d201fa3d23ca
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
Bill Yi
97d8360fc5 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: a3bdce963f -s ours
am: 52498c1da9  -s ours

Change-Id: Ibbca1b09b50102ece59623530bfe131610449c8d
2017-08-02 22:16:53 +00:00
Bill Yi
52498c1da9 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: a3bdce963f  -s ours

Change-Id: Ia5800ef75e332195d281d0b9f687bffb6ddcb16c
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  -s ours

Change-Id: I555e47f15108be17b89d75de17f932fb5fd32528
2017-08-02 22:11:51 +00:00
Bill Yi
f366a8716a Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: a3bdce963f  -s ours

Change-Id: I832d9850508a376fc4dccc53df3a943379ada6cf
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
50790d76fa Style action bar during onResume instead of onCreate am: e156d9a59f
am: 97e850ade9  -s ours

Change-Id: I6de39f0014a666c6367d032527d04018ba681566
2017-08-02 21:10:23 +00:00
Fan Zhang
85a0a5771e Style action bar during onResume instead of onCreate am: e156d9a59f -s ours
am: cb9f8a8ebc

Change-Id: If7eb4529c55a5e739850dc775d27b052ba357b96
2017-08-02 21:01:43 +00:00
Fan Zhang
a31da35b74 Style action bar during onResume instead of onCreate
am: 50eb81f114

Change-Id: I4259ccfcb36b193a2fa4c745338860c407eeedd6
2017-08-02 21:01:16 +00:00
Fan Zhang
cb9f8a8ebc Style action bar during onResume instead of onCreate
am: e156d9a59f  -s ours

Change-Id: I4b6c8332a9a950fc9b5ca2310a4099e7cf887202
2017-08-02 20:59:50 +00:00
Fan Zhang
97e850ade9 Style action bar during onResume instead of onCreate
am: e156d9a59f

Change-Id: Iee729bda63cb9cf007754d1003fa02d755d5a771
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
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
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
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
Bill Yi
08db3835ee Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 446c5b08b1  -s ours

Change-Id: I7c6d93380f9195ee177646871ed80e8cfa136b12
2017-08-02 15:13:23 +00:00
Bill Yi
446c5b08b1 Merge "Import translations. DO NOT MERGE" into oc-mr1-dev 2017-08-02 14:57:50 +00:00
Andrew Sapperstein
71e40d24a1 Merge "Refactoring DoubleTwistPreferenceController." into oc-dr1-dev am: 3daceaec5f
am: 0f13525842

Change-Id: I0db5879b01cb1a03b99911472625a6090a412b26
2017-08-02 06:15:55 +00:00
Andrew Sapperstein
d126c63e22 Merge "Refactoring DoubleTwistPreferenceController." into oc-dr1-dev am: 3daceaec5f
am: aa661b548b

Change-Id: Ieb0569d46a5f06aa6fd372b685d8f64152d68029
2017-08-02 06:11:53 +00:00
Andrew Sapperstein
aa661b548b Merge "Refactoring DoubleTwistPreferenceController." into oc-dr1-dev
am: 3daceaec5f

Change-Id: Ie4d946fb7ca1c018f8e1e5f3b54462f0e59041fa
2017-08-02 06:07:23 +00:00
Andrew Sapperstein
0f13525842 Merge "Refactoring DoubleTwistPreferenceController." into oc-dr1-dev
am: 3daceaec5f

Change-Id: Iabce075585a4cca4c0876999f6b9e9f031fe2c10
2017-08-02 06:07:23 +00:00
TreeHugger Robot
3daceaec5f Merge "Refactoring DoubleTwistPreferenceController." into oc-dr1-dev 2017-08-02 06:02:29 +00:00
Bill Yi
34d85d4cef Import translations. DO NOT MERGE
Change-Id: Iee79f4aad0c81901bc3c79b8dac1c95c29db3f00
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-01 18:01:46 -07:00
Daniel Nishi
a7f215cce2 Merge "Make nfc toggability logic static and public." into oc-dr1-dev am: b27d65fa55
am: ea39f74a42

Change-Id: I04d39ec692c704d24f515aec1cc12961918db2ce
2017-08-01 23:31:46 +00:00
Daniel Nishi
85cd1b7d39 Merge "Make nfc toggability logic static and public." into oc-dr1-dev am: b27d65fa55
am: db1158f855

Change-Id: I39a83eff9705f8ed5e66a4ea4aeada9f262d12aa
2017-08-01 23:27:41 +00:00
Daniel Nishi
ea39f74a42 Merge "Make nfc toggability logic static and public." into oc-dr1-dev
am: b27d65fa55

Change-Id: Id09171357fb772cc05ec668eafa10e5320cefeb5
2017-08-01 23:18:58 +00:00
Daniel Nishi
db1158f855 Merge "Make nfc toggability logic static and public." into oc-dr1-dev
am: b27d65fa55

Change-Id: Ie3f854c21d7a099095202a9005cea6a8aec670c2
2017-08-01 23:18:57 +00:00
Daniel Nishi
b27d65fa55 Merge "Make nfc toggability logic static and public." into oc-dr1-dev 2017-08-01 23:11:18 +00:00
Bill Yi
7f5b5f391d Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 4f368a3acc  -s ours

Change-Id: I6d826f234c28123e0636c58e049454b618d1b1a9
2017-08-01 21:19:19 +00:00
TreeHugger Robot
4f368a3acc Merge "Import translations. DO NOT MERGE" into oc-mr1-dev 2017-08-01 21:00:25 +00:00
Andrew Sapperstein
9c9549bd29 Refactoring DoubleTwistPreferenceController.
Made the availability and setting logic static so that
it can be invoked without creating a controller.

Bug: 62022517
Test: robotests
Change-Id: I3a51c61849e6ba8b8aa850ca22d666a9f84d252f
2017-08-01 13:56:51 -07:00
Meng Wang
7a801228f6 Merge "Rephrase emergency_address_summary to remove '911'" into oc-mr1-dev
am: 1ae2573bb5

Change-Id: I622a7851b1cff523633d62727f437651627883d3
2017-08-01 20:55:13 +00:00
Bill Yi
090a10ab35 Import translations. DO NOT MERGE am: b9fa3d1115 -s ours
am: 6444b2ac85  -s ours

Change-Id: I83535cf31351afc73228cfe7e26be0437d847cb2
2017-08-01 20:54:24 +00:00
Bill Yi
bfeafd271c Import translations. DO NOT MERGE am: b9fa3d1115 -s ours
am: 1b16f952e7  -s ours

Change-Id: I976b5b1fd4e0e23a91929b5828c9a1e7599b9f52
2017-08-01 20:39:43 +00:00
Meng Wang
1ae2573bb5 Merge "Rephrase emergency_address_summary to remove '911'" into oc-mr1-dev 2017-08-01 20:37:37 +00:00
Bill Yi
1b16f952e7 Import translations. DO NOT MERGE
am: b9fa3d1115  -s ours

Change-Id: I209e686f6bb1047fdc89e8d0103bb5ad7391f33f
2017-08-01 20:35:43 +00:00
Bill Yi
6444b2ac85 Import translations. DO NOT MERGE
am: b9fa3d1115  -s ours

Change-Id: I5efc1ca9ac51a4840d12fe21ba4db578dd00927e
2017-08-01 20:35:41 +00:00