TreeHugger Robot
efcc8be05c
Merge "Move the Robolectric shadow config up." into oc-mr1-dev
2017-08-24 19:27:23 +00:00
Alison Cichowlas
c3570914f6
Legacy channels say "allow sound" instead of "let the app decide".
...
We had this string already translated from use in previous ux revs.
Change-Id: I91a9ce001a0d875c0ae12643e6b386328e9cd8de
Fixes: 62873496
Test: String change, manually verified
2017-08-24 15:02:21 -04:00
Lei Yu
a9eb0eb4bc
Merge "Add UI components for bluetooth anomaly" into oc-mr1-dev
...
am: 3949ed53a9
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
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
ac57de36da
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: 8dce5e57c3
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
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
2017-08-24 07:41:13 +00:00
Bill Yi
82446dc8a7
Import translations. DO NOT MERGE am: 683fdb8177 -s ours
...
am: 89ebaf6c52
2017-08-24 07:41:12 +00:00
Bill Yi
1d339fab5f
Import translations. DO NOT MERGE
...
am: 683fdb8177
2017-08-24 07:37:10 +00:00
Bill Yi
89ebaf6c52
Import translations. DO NOT MERGE
...
am: 683fdb8177
2017-08-24 07:37:10 +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
Soroosh Mariooryad
4e4d3631fc
Merge "Extending SearchFeatureProvider API to provide timeout" into oc-mr1-dev
...
am: f83b94aa0c
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
Chien-Yu Chen
14c4b41f78
Settings: Enable HAL HDR+ by default
...
Test: Settings app
Bug: 63045786
Change-Id: I39ed40a3a74bac13a40c556b9cb60b495955a065
2017-08-23 19:09:09 -07:00
Stephen Chen
31deb9a766
Merge "Add a "Add Network" button to SavedAccessPointsWifiSettings" into oc-mr1-dev
...
am: a78eeb2d61
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
c2eab36c7c
Merge "Fix null pointer exception when logging suggestions." into oc-mr1-dev
...
am: d94fbbc325
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
fb13cac59f
Merge "Set preference invisible when no anomaly" into oc-mr1-dev
...
am: 0e800978bf
2017-08-23 20:11:28 +00:00
jackqdyulei
02e4c7d809
Merge "Update strings when shortString is true" into oc-mr1-dev
...
am: d0066e3875
2017-08-23 20:01:51 +00:00
TreeHugger Robot
0e800978bf
Merge "Set preference invisible when no anomaly" into oc-mr1-dev
2017-08-23 19:57:41 +00:00
TreeHugger Robot
d0066e3875
Merge "Update strings when shortString is true" into oc-mr1-dev
2017-08-23 19:38:40 +00:00
jackqdyulei
4242ee0dd4
Set preference invisible when no anomaly
...
In the previous code path, we will create an invisible anomaly preference
and update it to visible if it contains any anomaly. However, when
anomaly is dismissed we don't reset preference to invisible.
So, this cl adds code to set it to invisible explicitly when anomaly list
is empty.
Bug: 64617126
Test: RunSettingsRoboTests
Change-Id: Ie7a3498da91243f05f4c47fb1cc5f67b177d04b1
2017-08-23 10:09:19 -07:00
liming.wang
0db5a99608
Fix Settings crashes after tapping "Learn more" in fingerprint page
...
It is possible in certain build configurations to have an invalid
link. Instead of crashing, swallow the error and write to logs.
Fixes: 64322876
Test: manual - go to Settings > Security & Location > Fingerprint
and then tap "Learn more"
Change-Id: I70beca880261df0ee3eef94f5469f44130ffd95a
2017-08-23 03:32:40 +00:00
jackqdyulei
92597b0e26
Merge "Stop display "Cell network" item for tablet" into oc-mr1-dev
...
am: a097d68c4b
2017-08-23 02:06:12 +00:00
Kevin Chyn
d328b9051c
Merge "Pattern entry views should be consistent" into oc-mr1-dev
...
am: a6b67d15eb
2017-08-23 01:43:12 +00:00
TreeHugger Robot
a097d68c4b
Merge "Stop display "Cell network" item for tablet" into oc-mr1-dev
2017-08-23 01:42:42 +00:00
TreeHugger Robot
a6b67d15eb
Merge "Pattern entry views should be consistent" into oc-mr1-dev
2017-08-23 00:24:13 +00:00
Amit Mahajan
6afddc2308
Merge "Change to not cache user entered apn type as user may change it." am: 54eeafa052 am: b2498bc422 am: f70f53473a
...
am: 4bb56f5282
2017-08-23 00:07:47 +00:00
TreeHugger Robot
1c7988b11b
Merge changes from topic "Read dun APNs from apn db" am: f9390ce1fb am: b87acf6837 am: a81a339c1d -s ours
...
am: a211db7af3
2017-08-22 23:48:07 +00:00
Amit Mahajan
4bb56f5282
Merge "Change to not cache user entered apn type as user may change it." am: 54eeafa052 am: b2498bc422
...
am: f70f53473a
2017-08-22 23:47:07 +00:00
TreeHugger Robot
a211db7af3
Merge changes from topic "Read dun APNs from apn db" am: f9390ce1fb am: b87acf6837
...
am: a81a339c1d
2017-08-22 23:31:10 +00:00
Amit Mahajan
f70f53473a
Merge "Change to not cache user entered apn type as user may change it." am: 54eeafa052
...
am: b2498bc422
2017-08-22 21:19:52 +00:00
Amit Mahajan
b2498bc422
Merge "Change to not cache user entered apn type as user may change it."
...
am: 54eeafa052
2017-08-22 21:09:12 +00:00
Treehugger Robot
54eeafa052
Merge "Change to not cache user entered apn type as user may change it."
2017-08-22 21:02:03 +00:00
TreeHugger Robot
a81a339c1d
Merge changes from topic "Read dun APNs from apn db" am: f9390ce1fb
...
am: b87acf6837
2017-08-22 20:20:19 +00:00
TreeHugger Robot
b87acf6837
Merge changes from topic "Read dun APNs from apn db"
...
am: f9390ce1fb
2017-08-22 20:03:24 +00:00
Treehugger Robot
f9390ce1fb
Merge changes from topic "Read dun APNs from apn db"
...
* changes:
Change empty apn type in user entered APN to non-read-only types.
Check for null mReadOnlyApnTypes.
Disallow adding/editing dun APNs unless allowed by carrier.
2017-08-22 19:52:21 +00:00
Amit Mahajan
efe090ec60
Change to not cache user entered apn type as user may change it.
...
Test: manual
Bug: 64263412
Change-Id: Idc49109926e123eddec7f6553f3c493b1ed22212
2017-08-22 19:36:45 +00:00
Tony Mak
237e49a7c9
Merge "A separate entry for work profile CA cert" into oc-mr1-dev
...
am: e040ef4a39
2017-08-22 18:21:35 +00:00
TreeHugger Robot
937e2d5a8e
Change empty apn type in user entered APN to non-read-only types.
...
Test: Manually added APN and verified read-only and non-wildcardable
types are not included
Bug: 38186417
Change-Id: I07bcf1c2a950a1257446f0a7beb602fed79423b3
2017-08-22 18:20:32 +00:00
Amit Mahajan
2bfc9906c1
Check for null mReadOnlyApnTypes.
...
Test: none
Bug: 62247121
Change-Id: I6866bf2df8d4cb46dd75b94ab88c1e62e65ddda7
2017-08-22 11:09:42 -07:00
Amit Mahajan
607e684f64
Disallow adding/editing dun APNs unless allowed by carrier.
...
Test: WIP
Bug: 38186417
Change-Id: If1cc34ad979659a56a3886da2a02fdbf642739ac
2017-08-22 11:09:42 -07:00
TreeHugger Robot
e040ef4a39
Merge "A separate entry for work profile CA cert" into oc-mr1-dev
2017-08-22 18:04:00 +00:00
