Commit Graph

39853 Commits

Author SHA1 Message Date
jackqdyulei
df4ca8af76 Merge "Add bt anomaly action in testing app" into oc-mr1-dev am: 4aaacaf7e3
am: d52c9708b5

Change-Id: I5122c905e3227b5fb26286a87bbf879a0fce9fb1
2017-08-25 01:53:28 +00:00
jackqdyulei
d52c9708b5 Merge "Add bt anomaly action in testing app" into oc-mr1-dev
am: 4aaacaf7e3

Change-Id: Icc5588c0fde97908d371452c622980fddae054df
2017-08-25 01:49:28 +00:00
TreeHugger Robot
4aaacaf7e3 Merge "Add bt anomaly action in testing app" into oc-mr1-dev 2017-08-25 01:38:53 +00:00
Sundeep Ghuman
8adf634a54 Merge "Scroll to top when user connects to a network." into oc-mr1-dev am: a253e1d416
am: 501975914c

Change-Id: Ic3489f58b427ee0be5b3ad39a801af02ec15835b
2017-08-25 00:57:11 +00:00
Sundeep Ghuman
501975914c Merge "Scroll to top when user connects to a network." into oc-mr1-dev
am: a253e1d416

Change-Id: I4309bdd864d7da5a0b33e744d28feafe9966012b
2017-08-25 00:38:58 +00:00
Maurice Lam
7d5919dd04 Merge "Fix typo in fingerprint string" 2017-08-25 00:31:02 +00:00
TreeHugger Robot
a253e1d416 Merge "Scroll to top when user connects to a network." into oc-mr1-dev 2017-08-25 00:12:51 +00:00
Lei Yu
af9138e8e3 Merge "Add battery indicator to bluetooth icon" 2017-08-24 23:39:35 +00:00
jackqdyulei
9d78df0d30 Add bt anomaly action in testing app
This cl adds the action to start bluttooth unoptimized scanning.
With this action we could test whether bt anomaly detector is
effective.

Bug: 62602318
Test: make -j40 AnomalyTester
Change-Id: I7f41dbb07384fbf3c5a81e460a3629306bc33f59
2017-08-24 16:15:24 -07:00
Daniel Nishi
9d0a84e95f Merge "Move the Robolectric shadow config up." into oc-mr1-dev am: efcc8be05c
am: 5f97c05f1c

Change-Id: I46c4a921a25ef17197e90038ff71a982a192aae7
2017-08-24 22:15:39 +00:00
Daniel Nishi
5f97c05f1c Merge "Move the Robolectric shadow config up." into oc-mr1-dev
am: efcc8be05c

Change-Id: Ie816d276fe196452f38c88ca1f944dd040f19321
2017-08-24 21:24:31 +00:00
jackqdyulei
6f5c990abd Add battery indicator to bluetooth icon
This cl change util method in bluetooth package to return
drawable instead of resId.

If the bt device has battery level, then method return customized
layerDrawable, otherwise return a simple drawable created from
resId.

Bug: 63393322
Test: RunSettingsRoboTests

Change-Id: Ib21822eafda0e8570212ce5cb070478e4f4876a2
2017-08-24 20:50:10 +00:00
Maurice Lam
be1bc679c2 Fix typo in fingerprint string
Test: Manual
Bug: 65017285
Change-Id: I3664cc4b888c4c573b439f06f1ef9983d0470674
2017-08-24 19:40:30 +00:00
TreeHugger Robot
efcc8be05c Merge "Move the Robolectric shadow config up." into oc-mr1-dev 2017-08-24 19:27:23 +00:00
Roozbeh Pournader
d0c1f65451 Merge "Use fallback linespacing in ChartSweepView and ChartGridView" 2017-08-24 19:24:01 +00:00
Lei Yu
181a972430 Merge "Add UI components for bluetooth anomaly" into oc-mr1-dev am: 3949ed53a9
am: a9eb0eb4bc

Change-Id: Ia427fdbec8afce9aa0133e182bde39757345e132
2017-08-24 17:46:29 +00:00
Lei Yu
98b0e638a6 Merge "Set up anomaly test app in settings" into oc-mr1-dev am: 8cac6b07bc
am: c564686ec8

Change-Id: Id6c2f70cd547fad814e2bbf344f9e8d64fc8f64d
2017-08-24 17:45:52 +00:00
Lei Yu
a9eb0eb4bc Merge "Add UI components for bluetooth anomaly" into oc-mr1-dev
am: 3949ed53a9

Change-Id: I2cfae5ecff424ff042e0a0b29a610908563b8348
2017-08-24 17:42:09 +00:00
Lei Yu
c564686ec8 Merge "Set up anomaly test app in settings" into oc-mr1-dev
am: 8cac6b07bc

Change-Id: I5be8aab32f4918814ab2273f608b38d4403b24d0
2017-08-24 17:41:25 +00:00
Lei Yu
3949ed53a9 Merge "Add UI components for bluetooth anomaly" into oc-mr1-dev 2017-08-24 17:35:15 +00:00
Lei Yu
8cac6b07bc Merge "Set up anomaly test app in settings" into oc-mr1-dev 2017-08-24 17:34:56 +00:00
Bill Yi
91f4e8981d Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 8dce5e57c3 -s ours
am: ac57de36da  -s ours

Change-Id: Iba539724df718bca825ce46cee030ea8064bd217
2017-08-24 08:33:50 +00:00
Bill Yi
ac57de36da Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 8dce5e57c3  -s ours

Change-Id: I3b749db0e748344dad59f8d9487525320f516bb2
2017-08-24 08:07:20 +00:00
TreeHugger Robot
8dce5e57c3 Merge "Import translations. DO NOT MERGE" into oc-mr1-dev 2017-08-24 07:49:30 +00:00
Bill Yi
347416b146 Merge "Import translations. DO NOT MERGE am: 683fdb8177 -s ours am: 1d339fab5f -s ours" into oc-mr1-dev-plus-aosp
am: 9b1ff6ca9d  -s ours

Change-Id: I5a0a51ad0e6d581293ef90363c13bb325f9e64a3
2017-08-24 07:45:49 +00:00
Bill Yi
0084080709 Import translations. DO NOT MERGE am: 683fdb8177 -s ours am: 89ebaf6c52 -s ours
am: 82446dc8a7  -s ours

Change-Id: I52855274f49bcad4141468c296b36ce1b62c0bcc
2017-08-24 07:45:12 +00:00
Android Build Merger (Role)
9b1ff6ca9d Merge "Import translations. DO NOT MERGE am: 683fdb8177 -s ours am: 1d339fab5f -s ours" into oc-mr1-dev-plus-aosp 2017-08-24 07:41:50 +00:00
Bill Yi
95c4157005 Import translations. DO NOT MERGE am: 683fdb8177 -s ours
am: 1d339fab5f  -s ours

Change-Id: Ifce1308a8c9524b7ed12037f7c4912b6991c168e
2017-08-24 07:41:13 +00:00
Bill Yi
82446dc8a7 Import translations. DO NOT MERGE am: 683fdb8177 -s ours
am: 89ebaf6c52  -s ours

Change-Id: I2e80906f9c3d4657e9dc1d5dd8aef36f4ce19235
2017-08-24 07:41:12 +00:00
Bill Yi
89ebaf6c52 Import translations. DO NOT MERGE
am: 683fdb8177  -s ours

Change-Id: I6d6c17a868765261ace38e0532c95695c2dfb840
2017-08-24 07:37:10 +00:00
Bill Yi
1d339fab5f Import translations. DO NOT MERGE
am: 683fdb8177  -s ours

Change-Id: I5b3d3ae77cbda9a3badd40e678034f4ee157b7be
2017-08-24 07:37:10 +00:00
TreeHugger Robot
9ef271d837 Merge "Import translations. DO NOT MERGE" 2017-08-24 07:27:37 +00:00
Bill Yi
683fdb8177 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I452434cbf7282ba20233b9345b75ebdf9251ef98
2017-08-23 22:15:37 -07:00
Bill Yi
ed1712a7ef Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I5ac7b8c39cb58c662a744ac1c0608ed901fb670e
2017-08-23 21:58:28 -07:00
Bill Yi
4189d7f66c Import translations. DO NOT MERGE
Change-Id: Ie2c072d206c99da9b6fc821012a7a4056020aaaf
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-23 21:40:56 -07:00
Soroosh Mariooryad
f1ea9cc668 Merge "Extending SearchFeatureProvider API to provide timeout" into oc-mr1-dev am: f83b94aa0c
am: 4e4d3631fc

Change-Id: I5207a13fa2997cad393ec60d5f0cfb93eecbde16
2017-08-24 04:32:47 +00:00
Soroosh Mariooryad
4e4d3631fc Merge "Extending SearchFeatureProvider API to provide timeout" into oc-mr1-dev
am: f83b94aa0c

Change-Id: I72618b3a6e47661c6c690638db0ed7d7c1d8c08c
2017-08-24 04:20:30 +00:00
TreeHugger Robot
f83b94aa0c Merge "Extending SearchFeatureProvider API to provide timeout" into oc-mr1-dev 2017-08-24 04:11:48 +00:00
Stephen Chen
0246cd8a40 Merge "Add a "Add Network" button to SavedAccessPointsWifiSettings" into oc-mr1-dev am: a78eeb2d61
am: 31deb9a766

Change-Id: Ibd4f9959af5c5c1bde51ce1b9285531880301daa
2017-08-24 02:17:10 +00:00
Stephen Chen
31deb9a766 Merge "Add a "Add Network" button to SavedAccessPointsWifiSettings" into oc-mr1-dev
am: a78eeb2d61

Change-Id: Ide908ed189c110c272cd5535f9fbc99705b8555a
2017-08-24 01:58:48 +00:00
TreeHugger Robot
a78eeb2d61 Merge "Add a "Add Network" button to SavedAccessPointsWifiSettings" into oc-mr1-dev 2017-08-24 01:43:58 +00:00
Doris Ling
d9d877cb48 Merge "Fix null pointer exception when logging suggestions." into oc-mr1-dev am: d94fbbc325
am: c2eab36c7c

Change-Id: I09efabd3f8a4a7358f2b6a6d52a15fdd75ca7672
2017-08-24 01:11:22 +00:00
Doris Ling
c2eab36c7c Merge "Fix null pointer exception when logging suggestions." into oc-mr1-dev
am: d94fbbc325

Change-Id: I4c827d601b8ed20934c4671d5a7de29a3001bd0b
2017-08-24 00:48:20 +00:00
jackqdyulei
693fe62fe0 Add UI components for bluetooth anomaly
Bug: 62602318
Test: make -j40 AnomalyTester
Change-Id: I4584e6ada784d8d87558a5b30cf55e2de33d443a
2017-08-23 17:37:18 -07:00
TreeHugger Robot
d94fbbc325 Merge "Fix null pointer exception when logging suggestions." into oc-mr1-dev 2017-08-24 00:36:43 +00:00
jackqdyulei
7e97d2d9a5 Set up anomaly test app in settings
This cl set up the basic android framework for anomly test app.
Anomaly test app has the similar architecture compared with
settings api tester.

1. Add Android.mk and AndroidManifest.xml
2. Add blank AnomalyActivity
3. Add related resource files.

Bug: 62602318
Test: make -j40 AnomalyTester
Change-Id: I1d59517c9c2d8d0b8e219e3a67dfae73ca5a968e
2017-08-23 17:35:26 -07:00
jackqdyulei
a5b20303ee Merge "Set preference invisible when no anomaly" into oc-mr1-dev am: 0e800978bf
am: fb13cac59f

Change-Id: I9a851fc886abb1489b8133468aed2c0548ffbd2d
2017-08-23 20:24:21 +00:00
jackqdyulei
002a20c8f3 Merge "Update strings when shortString is true" into oc-mr1-dev am: d0066e3875
am: 02e4c7d809

Change-Id: I031e65952befe7507ce09701af02e1131fe278cf
2017-08-23 20:15:19 +00:00
jackqdyulei
fb13cac59f Merge "Set preference invisible when no anomaly" into oc-mr1-dev
am: 0e800978bf

Change-Id: Icf0931c60d62fd9e18bc3cfe2853e965403e7740
2017-08-23 20:11:28 +00:00
jackqdyulei
02e4c7d809 Merge "Update strings when shortString is true" into oc-mr1-dev
am: d0066e3875

Change-Id: Ifce24bf0b5df7b912d3859d6aacdb35a90ce9c29
2017-08-23 20:01:51 +00:00