2093 Commits

Author SHA1 Message Date
Eric Schwarzenbach
8a8ff2907f Merge "Add individual ScanResult speeds to verbose logging." into oc-mr1-dev am: 402e44173d
am: 617c761251

Change-Id: I55b16ee31e7e9434d95377f9e66ceac282fd3f0d
2017-08-01 01:21:36 +00:00
Eric Schwarzenbach
617c761251 Merge "Add individual ScanResult speeds to verbose logging." into oc-mr1-dev
am: 402e44173d

Change-Id: I76a6b0552b8924746b2a28628b79c226002961ec
2017-08-01 01:10:38 +00:00
Eric Schwarzenbach
0b8700f842 Add individual ScanResult speeds to verbose logging.
Moves the individual ScanResult summary string generation out of
getVisibilityStatus into its own method `verboseScanResultSummary`,
to reduce duplication and to enable testing the per-ScanResult speed labeling.

Bug: 63866500
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java

Change-Id: I9583d142a7d50314017154703df4e1ce69fc68aa
2017-07-31 15:46:29 -07:00
pkanwar
116e619f27 Add string needed to support carrier wifi in UI. am: bf7ceec031
am: 5a2b73b288

Change-Id: I906587f10a122ec142871253103b7bfa9a2c1fd6
2017-07-31 01:52:39 +00:00
pkanwar
5a2b73b288 Add string needed to support carrier wifi in UI.
am: bf7ceec031

Change-Id: I669fcd9904e23943ecd2dd0a9f558209fd00b1c5
2017-07-31 01:44:09 +00:00
pkanwar
bf7ceec031 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: I41e63ce831dface4f2baf2879dde84ebe2fecc94
2017-07-30 17:59:27 +00:00
Bill Yi
03d4052fcf Import translations. DO NOT MERGE
Change-Id: I757ee47abb27616c1a9112490c805375e8710ec7
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-28 01:44:25 -07:00
Bill Yi
9059e3ee2e Import translations. DO NOT MERGE
Change-Id: I03b1c82e67b566797ce5c66136bbb5a981b6cb4b
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-28 01:38:37 -07:00
Bill Yi
d6216c67f6 Merge "Import translations. DO NOT MERGE" 2017-07-27 17:13:59 +00:00
Antony Sargent
e9f1046e36 Merge "resolve merge conflicts of 1e74fdb6842b to oc-mr1-dev" into oc-mr1-dev
am: eea2441f0a

Change-Id: I1a7aa500b686f3b7531db03e61bd12f108333850
2017-07-26 23:46:27 +00:00
TreeHugger Robot
eea2441f0a Merge "resolve merge conflicts of 1e74fdb6842b to oc-mr1-dev" into oc-mr1-dev 2017-07-26 23:25:05 +00:00
TreeHugger Robot
20c5ac18db Merge "Import translations. DO NOT MERGE" into oc-mr1-dev 2017-07-26 19:57:22 +00:00
Antony Sargent
d1dcfd1dc0 resolve merge conflicts of 1e74fdb6842b to oc-mr1-dev
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I1e90e7ff397f7a995c9d6471c876be020e6de582
Merged-In: I92b56b7908e5be8a3553a2779646d48bb5b94f01
2017-07-26 12:55:04 -07:00
Bill Yi
f11b91b94e Import translations. DO NOT MERGE
Change-Id: I616171beaec9b4a90da7f0c726db79bef1ea066f
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-26 10:21:07 -07:00
Bill Yi
ee8dd9c373 Import translations. DO NOT MERGE
Change-Id: Ia56580662240b965d77ec102ea91a8b0ea5a8bab
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-26 08:05:55 -07:00
TreeHugger Robot
1dc4dd22b1 Merge "@Keep all the things in TestAccessPointBuilder" 2017-07-26 07:23:44 +00:00
Eric Schwarzenbach
76f63b7b29 Merge "Only display RSSI/band information if network is connected." into oc-mr1-dev
am: c7886489ee

Change-Id: I18be4be9f92d841cf5579ecde4fd6b73c860ee93
2017-07-26 03:53:29 +00:00
Eric Schwarzenbach
f4f779d561 Merge "Sort APs by Speed label value instead of ranking score." into oc-mr1-dev
am: 3b8ce7c6d7

Change-Id: I43772768b4fe58de3a6b4fa1af909ed06122f802
2017-07-26 03:51:02 +00:00
TreeHugger Robot
c7886489ee Merge "Only display RSSI/band information if network is connected." into oc-mr1-dev 2017-07-26 03:42:09 +00:00
TreeHugger Robot
3b8ce7c6d7 Merge "Sort APs by Speed label value instead of ranking score." into oc-mr1-dev 2017-07-26 03:41:27 +00:00
Sundeep Ghuman
2fd9ad068a Merge "Merge "Do not evict scan results in cold start." into oc-dr1-dev am: d68b6dc56b am: f5b7da9b32" into oc-mr1-dev-plus-aosp
am: c8d5463923

Change-Id: Ia3e0d750ab8f7541700b2a99b3b10bea2b826565
2017-07-25 23:47:18 +00:00
Sundeep Ghuman
295d4092de Merge "Do not evict scan results in cold start." into oc-dr1-dev am: d68b6dc56b
am: f5b7da9b32

Change-Id: Ia43904db88f27c5b6a2d9c79fa049f5811303dde
2017-07-25 23:28:52 +00:00
Sundeep Ghuman
f5b7da9b32 Merge "Do not evict scan results in cold start." into oc-dr1-dev
am: d68b6dc56b

Change-Id: If442689c6a05ad261a846a5252d9a0256520508e
2017-07-25 23:05:11 +00:00
TreeHugger Robot
d68b6dc56b Merge "Do not evict scan results in cold start." into oc-dr1-dev 2017-07-25 22:41:39 +00:00
Antony Sargent
a117158e09 @Keep all the things in TestAccessPointBuilder
The test in packages/apps/Settings/tests/unit/src/com/android/settings/
wifi/WifiSettingsUiTest.java fails because the TestAccessPointBuilder
class and all methods in it seem to get stripped during build time
since they aren't referenced by code within the settings app itself.

Bug: 33245941
Test: runtest --path packages/apps/Settings/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
Change-Id: I92b56b7908e5be8a3553a2779646d48bb5b94f01
2017-07-25 20:26:36 +00:00
Salvador Martinez
ab7fb5369f Merge "move icon so that inline actions in settings can use it" into oc-dr1-dev am: f104b68a04 am: f68823e51e
am: e94731c47b

Change-Id: I7efc491a0b9fda7e13b5812e9746147e6bb6af29
2017-07-25 00:18:22 +00:00
Salvador Martinez
e94731c47b Merge "move icon so that inline actions in settings can use it" into oc-dr1-dev am: f104b68a04
am: f68823e51e

Change-Id: I291ec343b9c774449203c1c519e9685fbc19c552
2017-07-25 00:10:27 +00:00
Salvador Martinez
ac791f4454 Merge "move icon so that inline actions in settings can use it" into oc-dr1-dev
am: f104b68a04

Change-Id: Id549831e1061088cefd261f460febcb7b3a3cb3f
2017-07-25 00:05:50 +00:00
Salvador Martinez
f68823e51e Merge "move icon so that inline actions in settings can use it" into oc-dr1-dev
am: f104b68a04

Change-Id: I83321a143a402f0babebca140a01bdacf26feb4d
2017-07-25 00:05:01 +00:00
Sundeep Ghuman
4205874ec7 Do not evict scan results in cold start.
When starting WifiTracker, show whatever results are available from
platform until new scan results come in. This allows us to show the best
available results from the previous location scan. Once we have resumed
scanning and new scan results come in, the previous logic of evicting
scan results older than 15 seconds applies.

Also prevent unnecessary onConnectedChanged callbacks from being fired,
which may unnecessarily cause UI reloading bars to appear by performing
unnecessary work.

Bug: b/38212080
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java &&
runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java

Change-Id: I3db9d98425b3d2fc66fa0757807a318d0c7456ee
2017-07-24 13:15:23 -07:00
Salvador Martinez
52737f9266 move icon so that inline actions in settings can use it
Test: tests still pass
Bug: 62022517
Change-Id: Ifc01797c6ada51130586b5b42570c3357923ef85
2017-07-24 13:06:18 -07:00
TreeHugger Robot
69e41a4e9c Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-07-22 16:31:16 +00:00
TreeHugger Robot
6ca1df654f Merge "Import translations. DO NOT MERGE" 2017-07-22 16:04:48 +00:00
Bill Yi
19a8d0af26 Import translations. DO NOT MERGE
Change-Id: I1670c714954e5835f6c79f446c463ee18d72d17b
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-22 02:47:35 -07:00
Bill Yi
53e8be7921 Import translations. DO NOT MERGE
Change-Id: Id35d21a3bd768e8ab9bcb946c66cf18790393ee2
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-22 02:36:03 -07:00
Matthew Fritze
572d4e4adf Merge "Move icon resources into SettingsLib for phone buddy" into oc-dr1-dev am: 1cc73a5773 am: 1986c25da7
am: 0e7fc49139

Change-Id: I45ce0a0dbe7605eca86344e507042d7badc96059
2017-07-22 03:50:53 +00:00
Matthew Fritze
0e7fc49139 Merge "Move icon resources into SettingsLib for phone buddy" into oc-dr1-dev am: 1cc73a5773
am: 1986c25da7

Change-Id: I7ddd29766ecb6a4315ab635b16b2f480cc4915a8
2017-07-22 03:44:10 +00:00
Matthew Fritze
5e4b071704 Merge "Move icon resources into SettingsLib for phone buddy" into oc-dr1-dev
am: 1cc73a5773

Change-Id: I7bba78003073c79aaf692a01f0f6980b40e45598
2017-07-22 03:37:47 +00:00
Matthew Fritze
1986c25da7 Merge "Move icon resources into SettingsLib for phone buddy" into oc-dr1-dev
am: 1cc73a5773

Change-Id: Iebb70bf9db4c3eabf0aecd07a0ecf9178ff8944b
2017-07-22 03:37:46 +00:00
TreeHugger Robot
1cc73a5773 Merge "Move icon resources into SettingsLib for phone buddy" into oc-dr1-dev 2017-07-22 03:31:53 +00:00
Fan Zhang
38b86cfc5a Merge "Fix suggestion crash if parser fails to parse dismiss rule" into oc-mr1-dev
am: b975b333af

Change-Id: Icdde985be117189f1445bc78f3c94da236fec0df
2017-07-22 01:12:17 +00:00
Matthew Fritze
ab8148f2f6 Move icon resources into SettingsLib for phone buddy
The external settings api needs to pass icons for
corresponding settings. The following signals didn't have
icons in Settings.
- Night display
- Location

Bug: 62706782
Test: make RunSettingsGoogleRoboTests
Change-Id: Ia2feaa9cfea7dbce165545e5b7d96ad0798b8e07
2017-07-21 17:39:58 -07:00
Fan Zhang
d30c05c293 Make a helper method to post work to ui thread.
Bug: 36131513
Bug: 63896139
Test: robotests
Change-Id: If7154f17926f86157816987221f449a48ae6fd4e
2017-07-21 17:05:09 -07:00
Fan Zhang
82388cda78 Merge "Fix suggestion crash if parser fails to parse dismiss rule" into oc-dr1-dev
am: 689359914d

Change-Id: I351f0df469be67b5998567d7fb9ff0163d613a1d
2017-07-21 23:06:20 +00:00
TreeHugger Robot
689359914d Merge "Fix suggestion crash if parser fails to parse dismiss rule" into oc-dr1-dev 2017-07-21 22:59:13 +00:00
Fan Zhang
7b77cf8938 Fix suggestion crash if parser fails to parse dismiss rule
We store a index value in shared pref to figure out when a suggestion
should be displayed next time. However the rule can change due to
various reasons. When the index and the rule itself go out of sync, we
should not crash.

Change-Id: Id3ea88b6d321434e20ac0cd3e2670524c237e24e
Bug: 63908636
Test: robotests
(cherry picked from commit 4d37a1a1e1ca902b8a65bce64fafa0eeea51a4dd)
2017-07-21 22:11:41 +00:00
Fan Zhang
15ea628204 Fix suggestion crash if parser fails to parse dismiss rule
We store a index value in shared pref to figure out when a suggestion
should be displayed next time. However the rule can change due to
various reasons. When the index and the rule itself go out of sync, we
should not crash.

Merged-In: Id3ea88b6d321434e20ac0cd3e2670524c237e24e
Change-Id: Ied4a0359f9bc22ee94ec79c0591d2671a9c31b86
Fix: 63908636
Test: robotests
2017-07-21 12:57:14 -07:00
Fan Zhang
4d37a1a1e1 Fix suggestion crash if parser fails to parse dismiss rule
We store a index value in shared pref to figure out when a suggestion
should be displayed next time. However the rule can change due to
various reasons. When the index and the rule itself go out of sync, we
should not crash.

Change-Id: Id3ea88b6d321434e20ac0cd3e2670524c237e24e
Bug: 63908636
Test: robotests
2017-07-21 12:53:00 -07:00
Bill Yi
c87481965f Import translations. DO NOT MERGE
Change-Id: I9905307a26573e5e19db63f85ba4a89bab47b166
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-21 12:05:22 -07:00
Jeff Sharkey
1eb8b3cf48 Merge "Expose SubscriptionPlan API." into oc-mr1-dev am: 84c6684bba
am: 6f1d451a3a

Change-Id: I10844e487ab51a121ecdbf51e7732c0bcc198ef6
2017-07-21 18:28:37 +00:00