Commit Graph

57 Commits

Author SHA1 Message Date
Jesse Evans
ad2b77565c Fix instant app filtering in ApplicationsState
This fixes instant apps showing up as installed apps in the settings
UI where they should not be (namely the opening links page).

Test: Added tests for the filter
      runtest -x packages/SettingsLib/tests/integ

Bug: 37108030
Change-Id: I0fc6cfd237d470a1f4dde7b2db38d8b3643ee6f7
2017-04-13 19:48:48 -07:00
Lei Yu
57af565fb7 Merge "Refine BatteryInfo and battery drawable" into oc-dev 2017-04-13 21:43:37 +00:00
Daniel Nishi
ff97ea2eef Merge changes from topic 'cp-movies' into oc-dev
* changes:
  Use the real filters when determining Other Apps.
  Add support for movies & tv apps querying.
2017-04-13 18:39:57 +00:00
TreeHugger Robot
56fcd408e6 Merge "Listen to RSSI_CHANGED_ACTION broadcasts in WifiTracker." into oc-dev 2017-04-13 17:08:04 +00:00
Sundeep Ghuman
8c79288093 Listen to RSSI_CHANGED_ACTION broadcasts in WifiTracker.
This solves issues where the phone status bar and connected AP in the
picker are out of date.

Bug: 35971425
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/and
roid/settingslib/wifi/WifiTrackerTest.java

Change-Id: I2a7c50de6c754623fd262aac4e9e21d6bd7fc5cf
2017-04-12 18:10:13 -07:00
jackqdyulei
ff5bd948b0 Refine BatteryInfo and battery drawable
1. Remove "m" prefix for all public field
2. Change logic about field "discharging", now it only controlled
   by whether it is plugged in.
3. Change Paint in drawable to protected
Bug: 36862496
Test: RunSettingsLibTests
Change-Id: I2908ae6868dc877d3ce6a8a63ec17826a6dcca1d
2017-04-12 12:57:55 -07:00
Daniel Nishi
140ceb1dcc Use the real filters when determining Other Apps.
This fixes a bug where an app could be classified twice.

Fixes: 36535527
Test: SettingsLib Unit Test
Change-Id: I830a76fa33680b1dd71b285d9419139f84f1d60d
2017-04-07 14:26:38 -07:00
Daniel Nishi
45c23fa689 Add support for movies & tv apps querying.
Bug: 36223441
Test: Robotest
Change-Id: Icbb9b8947112f45d37858ceb5cfb1d76f06bda32
Merged-In: Icfb34844601f87d11b7309eacf9385d49ed36338
2017-04-07 14:20:36 -07:00
Tadashi G. Takaoka
46699675aa Remove supportsDismissingSelfWindow attribute of IME
This partially reverts CL I0f6b130a7df57557e40b52a7b7ac00be965a17c3.

Fixes: 34133139
Test: Confirm that unit test passed.
    adb install out/target/product/.../data/app/FrameworksCoreTests/FrameworksCoreTests.apk
    adb shell am instrument -w \
        -e class android.view.inputmethod.InputMethodInfoTest \
        com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I2b94263b2a0bf330bf9973567fea2d35176754d7
2017-04-07 10:43:43 +09:00
Stephen Chen
21f6868d80 Set AccessPoint metered bit using ScoredNetwork, WifiInfo, and WifiConfiguration.
Bug: 36888471
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java

Change-Id: I5228512a832665916520658acddc9bf93d78a1a1
2017-04-05 19:17:57 -07:00
Jesse Evans
13be12e314 Adds appropriate filtering for instant apps
Adds a new filter that includes downloaded and launcher apps, as well
as instant apps, and ensured that instant apps do not appear where
they previously were not expected (downloaded and launcher apps).

Test: Added testing for the existing filter and the new one.

Bug: 36515324
Change-Id: I7ef94442bae14ee18d4b4d70f04f9bf62af9eff8
(cherry picked from commit a4e0356ed4)
2017-04-02 16:10:22 +00:00
Peter Qiu
ced37dba7b SettingsLib: wifi: encapsulate Passpoint configuration in AccessPoint
The configurations that are managed by "Saved Networks" page are
centered around the abstraction of AccessPoint.  Since we will
need to manage Passpoint configuration in the "Saved Networks"
(for configuration removal), encapsulate necessary information
in an AccessPoint for a Passpoint configuration.

Bug: 34207710
Test: manual test
Test: runtest --path
      frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java
Change-Id: Ide556f5ec6c4ef9e1f82016efe17dc9860f298de
2017-03-31 10:50:45 -07:00
Peter Qiu
f562838125 wifi: add test for tracking Passpoint AP on devices with Passpoint disabled
On a device with Passspoint disabled (config_wifi_hotspot2_enabled build config
set to false), calls to WifiManager#getMatchingWifiConfig will throw
an UnsupportedOperationException.  So add a test to verify that exception
is being caught in WifiTracker#udpateAccessPoints.

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

Change-Id: If7d3d4122c36b1b98c24abf703d6492771918125
2017-03-28 13:24:34 -07:00
Amin Shaikh
a80ae0c0b6 Store the number of saved networks in WifiTracker.
Bug: 36532777
Test:  runtest --path frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java
Change-Id: Ia43ba22e271c08a6dc17683b993fd8231057e45e
2017-03-24 10:42:41 -07:00
TreeHugger Robot
f93cdbd58f Merge "Fix AppRestrictionsHelperTest." 2017-03-23 02:38:41 +00:00
Sudheer Shanka
83083cf358 Fix AppRestrictionsHelperTest.
Recently mockito has been updated to version 2.7.* and any(*.class) will now
reject null values.

Bug: 36531717
Test: runtest -x packages/SettingsLib/tests/integ/src/com/android/settingslib/users/AppRestrictionsHelperTest.java
Change-Id: Ia3ff2f470a95f6ee36a97eba8699425274500f17
2017-03-22 18:01:17 -07:00
Dan Shi
874a0916fc Merge "Add test configs to apct tests under frameworks/base" 2017-03-22 17:55:58 +00:00
Dan Shi
7f2afd2dff Add test configs to apct tests under frameworks/base
TouchLatency is needed by test TouchLatencyJankTestWear
UiBench is needed by test UiBenchJankTests

Details about test configs changes are tracked in doc
https://docs.google.com/document/d/1EWUjJ7fjy8ge_Nk0YQbFdRp8DSHo3z6GU0R8jLgrAcw/edit#

Bug: 35882476
Test: local test
make -j32 TouchLatency TouchLatencyJankTestWear  && \
tradefed.sh run template/local --template:map test=TouchLatencyJankTestWear \
      --test-tag testname --log-level-display VERBOSE
make -j32 UiBenchJankTests UiBench  && \
tradefed.sh run template/local --template:map test=UiBenchJankTests \
      --test-tag testname --log-level-display VERBOSE

Change-Id: I63f23e3a21ad1343607953958fb7bb0a5fb8c343
2017-03-21 00:05:14 -07:00
Sundeep Ghuman
ce78a5f2d3 Average scan results for AccessPoints.
This reduces jitter in the WifiTracker and is modeled after a prior
broken implementation which attempted to half-life the rssi each time
AccessPoint.update(ScanResult) is called.

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

Change-Id: Iab3f9914af40f2fd56e8ae7b45dcbd62176c8a67
2017-03-17 13:29:59 -07:00
Sundeep Ghuman
b9647ebba0 Fix broken AccessPointTests.
Bug: None
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java

Change-Id: I5d5da5e7e0faf1c124816f0dd8ab5f0249e54637
2017-03-17 12:44:54 -07:00
TreeHugger Robot
587b60282e Merge "frameworks/base: Add APCT tests to the device-tests suite." 2017-03-16 17:35:12 +00:00
Simran Basi
473a16e492 frameworks/base: Add APCT tests to the device-tests suite.
This CL adds the APCT tests within this project to
a similar suite as CTS known as device-tests.

The current method of running APCT tests in the infrastructure
is unaffected.

Bug: 35882476
Test: `make dist device-tests -j` and local builds of
      continuous_instrumentation_tests & continuous_native_tests

Change-Id: Ifa382fe691842c1cd76897775b9e2a1653449eb5
2017-03-15 14:46:27 -07:00
Sundeep Ghuman
54bdcfa081 Consolidate getRssi logic to return mRssi.
Changed previous getRssi method to updateeRssi in order to clarify
process, and also changed logic to return current mRssi when the given
AP is active. mRssi is set directly from WifiInfo for active networks.
For non-active networks we return the highest Rssi for any recently seen
BSSID (multiple APs with the same SSID are grouped together).

Change getSeen to updateSeen for consistency, although seen is never
used anywhere.

Also fixes b/34889252.

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

Change-Id: Ic52df41b8eb317e83d835c745b404007a53cf5d7
2017-03-14 15:43:17 -07:00
Paul Duffin
8b00751ff6 Use --multi-dex native to avoid dex limit
Bug: 32912773
Test: make checkbuild
Change-Id: I1adb219894c90487fe9455765972cadf50fb295a
2017-03-11 21:29:48 +00:00
Paul Duffin
192bb0bc54 Refactor code incompatible with Mockito 2.7.13
(cherry picked from 76e319f015c2b43498ce3ce610a253d63e76cbf3)

Some additional internal only refactorings were done as well.

Bug: 32912773
Test: make checkbuild
Change-Id: I96e3da967fad731fc8f39bde9db95f50ab7353fb
2017-03-10 14:18:53 +00:00
Fan Zhang
f1c1bb49f8 Remove drawer code from settings
Change-Id: I3e9920f62745f6ba2236e37689f7603f9a30d6a9
Fix: 35809663
Test: make RunSettingsLibRoboTests
2017-02-28 11:54:28 -08:00
TreeHugger Robot
6ff8367dc2 Merge "AccessPoint - Add Builder; Add unit tests for compareTo()" 2017-02-27 20:39:36 +00:00
Dave Schaefer
9853743705 AccessPoint - Add Builder; Add unit tests for compareTo()
Add a Builder class to make testing easy and clean.
Add unit tests to enforce the sorting order that we want.
Refactor some compareTo() internals to use existing methods rather than
duplicating functionality.
Refactor isReachable() functionality to a new method.
Update tests to use Truth assertion library.

Test: Run local AccessPoint unit tests:

adb shell am instrument -w -e class
com.android.settingslib.wifi.AccessPointTest
com.android.settingslib/android.support.test.runner.AndroidJUnitRunner

Bug: 35042429
Change-Id: I7c8a1ca69800f62e1fb13141e58b4e52b2bc3d70
2017-02-27 08:52:01 -08:00
Sundeep Ghuman
2b48990b9c Process the NetworkInfo before updating AccessPoints.
This fixes a UI issue where the Tracker first displays the connected
accessPoint as inactive before processing the connected state, which
causes the list to jump around.

Also add useful debugging information to AccessPoint toString.

Bug: 35681450
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java
Change-Id: I9a8356cfdd2e5be2da58ce5de82e228fddf301f9
2017-02-24 16:57:53 -08:00
TreeHugger Robot
120f971679 Merge "Disable settings nav drawer entirely." 2017-02-22 20:08:37 +00:00
Antony Sargent
8b0813c3e4 Merge "Add "Instant apps" filter to app listing" 2017-02-22 18:40:43 +00:00
Fan Zhang
5ba2d3fef9 Disable settings nav drawer entirely.
Change-Id: I3e9bdd3759a47fc09a654b6dad00b611138d5de6
Fix: 34806148
Test: make RunSettingsLibRoboTests
2017-02-22 10:36:30 -08:00
TreeHugger Robot
6e82080513 Merge "Move Badging from ScoredNetwork to NetworkingBadging." 2017-02-18 01:14:04 +00:00
TreeHugger Robot
4e43b811e7 Merge "Add multi-dex to SettingsLibTests when buliding with coverage" 2017-02-17 20:47:52 +00:00
Colin Cross
a7cfd57759 Add multi-dex to SettingsLibTests when buliding with coverage
Building with coverage enabled pushes SettingsLibTests over the dex
limit, enable multi-dex.

Test: builds
Change-Id: Ia72db71a2e46e2fdc8cf3e5484f122fa985f25c7
2017-02-17 18:54:37 +00:00
Todd Kennedy
be0b8896d1 Revert "Revert "Per user setting for instant app""
This reverts commit be9ffa15af.

Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.EphemeralTest
Change-Id: Ib21321cf157a79890de487060a093840f7182047
2017-02-16 12:43:37 -08:00
Antony Sargent
67952e94a9 Add "Instant apps" filter to app listing
Bug: 35098444
Test: new test added in ApplicationsStateTest.java ; run it by doing the
following commands:
 make SettingsLibTests -j40
 adb install -r $OUT/data/app/SettingsLibTests/SettingsLibTests.apk
 adb shell am instrument -w com.android.settingslib

In Settings->Apps&Notifications->Apps, the list of filters before this CL is:

 All | Enabled | Disabled

With this CL, the filter list becomes:

 All apps | Installed apps | Disabled apps | Instant apps

Change-Id: Ia2ec099f758901839a2aa84fe155ae032990092f
2017-02-15 15:52:33 -08:00
Guang Zhu
be9ffa15af Revert "Per user setting for instant app"
Bug: 35390781

This reverts commit 2f5811dcfd.

Change-Id: Ibb1c8dacbdc6908fc7fa2bc5dca664f2455162bf
2017-02-15 21:43:48 +00:00
Sundeep Ghuman
699deaf610 Move Badging from ScoredNetwork to NetworkingBadging.
This is a non-functional refactor. The old enums will be removed once
ag/35323372 is addressed.

Bug: 35114358
Test: Ran existing tests (see files touched).
Change-Id: I08fd8c7964463b5908ce361e61f8fe811d0ff6f3
2017-02-14 14:04:18 -08:00
Todd Kennedy
2f5811dcfd Per user setting for instant app
The same application can run as either an instant app or an installed
app. Store this setting per-user instead of based upon the install
location.

Bug: 25119046
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.EphemeralTest
Change-Id: Iff565bb1ac10d631499f0bd0f69b401cb073c10e
2017-02-14 13:42:01 -08:00
Daniel Nishi
646b56c844 Merge "Don't show game and music apps in Other Apps." 2017-02-14 18:45:33 +00:00
Sundeep Ghuman
ac7b43616e Serially (un/)register score cache in WifiTracker.
Before the cache unregistration logic was posted to the worker thread.
However, when WifiSettings is quit, the onDestroy method immediately
kills the WorkHandler. This caused unregistration to never occur, which
left the cache registered and the listener to try to post work on the
dead worker thread. The cache is now registered and unregistered
serially in start and stop tracking, respectively. Furthermore, the
cachelistener is running on the mainHandler as it is a lightweight task
(posting to work handler).

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

Change-Id: I7739fdbe036be5b2870be45f33f670fd69d69af1
2017-02-08 20:56:07 -08:00
Daniel Nishi
bd8c6652cd Don't show game and music apps in Other Apps.
Bug: 35143240
Test: SettingsLib Robotest
Change-Id: Ifaa086373d27dc81203137d20fa1617df21f6093
2017-02-08 12:20:12 -08:00
Dan Sandler
6aa6e6e640 Clean up BatteryMeterDrawable internal api.
Bug: 32539932
Test: runtest -x frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/graph/BatteryMeterDrawableBaseTest.java
Test: runtest -x frameworks/base/packages/SystemUI/tests/src/com/android/systemui/BatteryMeterDrawableTest.java
Change-Id: Ifdc3368b930abcf248b60ee99f6f9139ad804f91
2017-02-08 10:10:46 -08:00
TreeHugger Robot
ba89ed754f Merge "Move the logic of batteryMeterDrawable to settingslib" 2017-02-08 10:14:28 +00:00
jackqdyulei
597b10f6db Move the logic of batteryMeterDrawable to settingslib
In Settings, we also need a BatteryMeterDrawable to show battery meter,
that's why I move it to settingslib.

In this cl, what I have changed is listed below:
1. Create BatteryMeterDrawableLib that contains logic of battery
drawing.
2. Still Keep the battery control logic in systemui.
3. Remove hardcoded battery color by using the color state lists.
4. Move some tests to settingslib

Bug: 34771849
Test: make SettingsLibTests

Change-Id: I39c0f0e31ca5e1b958467298db1d0590d16c9f6d
2017-02-07 17:27:00 -08:00
Daniel Nishi
646f500315 Merge "Add a filter for audio apps." 2017-02-01 21:01:55 +00:00
Daniel Nishi
7e33682338 Add a filter for audio apps.
Bug: 33199077
Test: SettingsLib integ tests
Change-Id: Iad3717c78debe4d4c5edbb4337d0c79f062d93a6
2017-01-26 14:34:32 -08:00
Sundeep Ghuman
e869d83ea8 Create Settings Flags to Disable Scoring UI changes.
When disabled, this will prevent badges from being shown in the status
bar or wifi picker as well as prevent access points in the picker from
being rearranged based on ranking scores.

Fix missing permission dropped from previous CL to run
NetworkControllerWifiTest and refactored tests to enable new setting.

Bug: 34712533
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java
and runtest --path
frameworks/base/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerWifiTest.java

Change-Id: I79c97f2205ebb70c0f7f5b1f66f7207055e5769b
2017-01-26 12:09:04 -08:00
Daniel Nishi
abb4bd2128 Add a games filter to the ApplicationsState.
This allows us to filter on game apps in Settings.

Bug: 33199077
Test: SettingsLib integ tests
Change-Id: I8cbd7f77ab95e2ce19e56a5af3597334f804885e
2017-01-20 15:13:38 -08:00