Commit Graph

527 Commits

Author SHA1 Message Date
Adrian Roos
5bc4bdf35c Merge "Use new OverlayManager categories" 2018-02-16 22:47:11 +00:00
TreeHugger Robot
a33ee8b349 Merge "Fix instrumentation tests" 2018-02-14 17:22:55 +00:00
Adrian Roos
807cf8d2c5 Use new OverlayManager categories
Using this, we split overlays based on their category, so that
cutout emulation and theme overlays no longer clash in their
respective settings.

Bug: 72436677
Test: make ROBOTEST_FILTER=EmulateDisplayCutoutPreferenceControllerTest RunSettingsRoboTests
Change-Id: I23f22113351b3948beb9e3a1fb969700852539cc
2018-02-13 19:13:10 -08:00
Fan Zhang
d2e33e73a1 Fix instrumentation tests
Change-Id: I4f6891f095f4803e822b55a3f44d67ee4d173180
Fixes: 73242024
Test: atest
2018-02-12 14:26:47 -08:00
Leslie Watkins
29a2379b09 Merge "Remove all reference to SmsMirroring in Android Settings." 2018-02-12 22:13:48 +00:00
Leslie Watkins
58eb43a2e4 Remove all reference to SmsMirroring in Android Settings.
Test: Robotests

Change-Id: I3318c6915cae95522f09838f00a3c567fe9e5fc5
2018-02-12 22:05:56 +00:00
Doris Ling
f2ecc4bf26 Add test to verify external account settings is shown.
- add a test service that provides a test authenticator and a test
preference screen. Creates corresponding test account and verifies that
the preferences defined in the authenticator is displayed from the
account detail page.

Change-Id: Iab87177ae500d0a36272cf8ecf464139a3dc07cd
Fixes: 35353708
Test: make SettingsUnitTests
2018-02-09 14:27:06 -08:00
Sundeep Ghuman
0f711f86a6 Remove use of forceUpdate.
Now that WifiTracker correctly handles eviction of stale scan results
only after scanning has resumed, it is no longer necessary to
conditionally fetch APs on app resumption.

Fix broken test.

Bug: 68030053
Test: runtest --path
tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java

Change-Id: Ib4c8d6e53cf760fcb5f00069da40c578171c09f4
2018-02-08 17:49:05 -08:00
Doris Ling
7459f40bfd Add test to verify Users settings shows in secondary user.
- also update launch sequence for Users settings tests as Users settings
has been moved inside system settings and the preference title has
changed.
- and change the test to run with AndroidJUnit4.

Change-Id: I049b83f9ae4b2724608af267e8900dd9e6749874
Fixes: 34774778
Test: make SettingsUnitTests
2018-02-08 14:06:23 -08:00
Fan Zhang
3d516e7607 Highlight row (instead of ripple) when come from search.
- Moved HighlightableAdapter to its own class
- Replaced ripple with blue background
- Bluebackground only stays for 5 seconds. After that it's replaced by
  ?attr/selectableBackground

Misc fixes.

- Fix NPE in UserSettings
- Update char limit on a new string

Change-Id: I4687e54e71fd7b9243f520b7630563df58be23d4
Fixes: 71715698
Fixes: 72761974
Test: robotests
2018-02-01 12:35:25 -08:00
Doris Ling
ce55d7c6a1 Remove app info page v1 related codes.
- change to use AppInfoDashboardFragment completely
- remove InstalledAppDetails and the corresponding tests

Change-Id: I8cbdf71cadc8b5743929abbafe91185e5e39b6b2
Fixes: 69384089
Test: make RunSettingsRoboTests
2018-01-29 17:14:32 -08:00
Fan Zhang
409eab14de Fix shortcut icon in launcher
When building icon for shortcut, check if the icon is LayerDrawable.
- If yes, only take the second layer (foreground).

Also move the class to shortcut package

Change-Id: I3513dbeb6509f11aa70ab3230d441e268ca9356d
Fixes: 72553870
Test: atest
2018-01-29 11:39:48 -08:00
Daniel Nishi
9f1352b4f3 Fix the UniquePreferenceTest.
By adding in the About Phone v2 screen, we duplicated some settings.

This isn't actually a problem because when the flag to turn on V2 is on,
V1 goes away, and vice versa.

Change-Id: I9aa327ac532ed2ac240bb2d6cbb327f299438889
Bug: 72459760
Test: adb shell am instrument -w -e class
com.android.settings.core.UniquePreferenceTest
com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner
2018-01-25 02:26:17 +00:00
TreeHugger Robot
f3b61d1206 Merge "Fix the app ops settings tests by adding FLAG_ACTIVITY_NEW_TASK to Intents." 2018-01-24 18:02:18 +00:00
Julia Reynolds
1c542bbeb0 Remove unused intent.
Test: cts-verifier
Bug: 63927402
Change-Id: I0ae2f33f7e8f1cce9dbe8166b522eb9cbde4c8b5
2018-01-23 09:05:37 -05:00
Peter Visontay
cec65e9423 Fix the app ops settings tests by adding FLAG_ACTIVITY_NEW_TASK to Intents.
Test: make -j32 SettingsUnitTests && adb install -r out/target/product/marlin/data/app/SettingsUnitTests/SettingsUnitTests.apk && adb shell am instrument -w -e class com.android.settings.applications.ExternalSourcesSettingsTest com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner
Change-Id: I187d68e6b214d975df0fe2a3d5dc88cadec35fa3
2018-01-23 13:32:34 +00:00
TreeHugger Robot
a9f6d41635 Merge "Block sleep options in Settings app when DISALLOW_CONFIG_SCREEN_TIMEOUT is set." 2018-01-19 22:25:23 +00:00
TreeHugger Robot
95c89da244 Merge "Unregister hotspot receiver in TetherService." 2018-01-19 22:01:18 +00:00
Doris Ling
c692758818 Unregister hotspot receiver in TetherService.
- when the service exits, also unregister the hotspot receiver.
- move TetherService and HotspotOffReceiver to wifi.tether package.

Change-Id: I0044a52bf80a5530a58b5186ab056de55e83532b
Fixes: 69844871
Test: make RunSettingsRoboTests
2018-01-19 12:12:57 -08:00
yuemingw
cdeeaff473 Block sleep options in Settings app when DISALLOW_CONFIG_SCREEN_TIMEOUT is set.
Test: m -j RunSettingsRoboTests
Bug: 67675734
Change-Id: Icdcadd03caa2884338d4300fb41f0036b8b9eb51
2018-01-19 20:01:21 +00:00
Ben Lin
4d163fcc93 Add capability for OEMs to supply their own SearchIndexableResources.
This moves SearchIndexableResources to be supplied by FeatureFactory
rather than its own singleton, which in effect allows OEMs to supply their
own, in the case where they have their own classes they want to be
indexed (or, remove certain classes that used to be indexed).

Bug: 72179744
Test: All tests pass.

Change-Id: Ia06b2026df7eca4c53b44a5a589c4aaa0b69d96c
2018-01-19 11:49:51 -08:00
Fan Zhang
85cd77c9f2 Remove search v1
Fixes: 69851037
Test: robotests
Change-Id: I53bc6408116031619053066055cb26cac67b9945
2018-01-16 14:19:51 -08:00
yuemingw
68b0320856 Block settings when DISALLOW_CONFIG_BRIGHTNESS.
Test: m -j RunSettingsRoboTests
Change-Id: I667c76dfef20158ab2a72178fb82b8183b448976
Fix: 67675654

Change-Id: I83f2e0086e16cd2a0dbc4cbcc31d4e2d454934cd
2018-01-12 23:03:17 +00:00
yuemingw
533dfdfbfd Block Settings APP UI when disallow_airplane_mode is set.
Test: runtest -x packages/apps/Settings/tests/unit/src/com/android/settings/core/UserRestrictionTest.java
Fix: 67675441

Change-Id: Ice234cecf4de191b797ad4219852cf821720ab78
2018-01-10 16:37:54 +00:00
Victor Chang
75325675de Revert "Don't use framework strings for formatting file sizes"
This reverts commit ded99003c4.

- Add java import in order to build successfully
- Fix RunSettingsRoboTests

Test: adb shell am instrument -w -e class
com.android.settings.utils.FileSizeFormatterTest
com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner
Test: make -j RunSettingsRoboTests
Bug: 70005649
Bug: 36994779
Change-Id: I1c0ff48c749e9fbb82fd670c27243bd3922ed373
2018-01-03 14:33:24 +00:00
Fan Zhang
74a91ca49e Merge "Fix UniquePreferenceTest" 2017-12-19 20:22:18 +00:00
Fan Zhang
c007634df2 Fix UniquePreferenceTest
Bug: 70638967
Test: atest UniquePreferenceTest
Change-Id: Idf06ccd9580d66c051f9b7c910c567f321da6cc5
2017-12-19 10:52:30 -08:00
Janis Danisevskis
7bc0236cc7 Merge "Make Settings aware of legacy user keys with secret key prefix" 2017-12-15 23:48:55 +00:00
Janis Danisevskis
b705e1a691 Make Settings aware of legacy user keys with secret key prefix
Secret keys are not longer identifiable by their alias prefix.
So now we call getKeyCharacteristics and check the algorithm of the
key.

Bug: 63931634
Test: Manually installed a key and checked that it is still dispayed
      correctly.
Change-Id: I55a4e46434618cb52ceb9456f184e004165872fd
2017-12-15 13:46:27 -08:00
Philip P. Moltmann
e360d51476 Merge "Switch to modern ArgumentMatchers" am: b8bf3bbc72
am: ced2263d48

Change-Id: Iccb726dc2166bb1e30f39f7f6539fb74e1d83997
2017-12-15 11:04:48 +00:00
Philip P. Moltmann
a56f6c5bdb Switch to modern ArgumentMatchers
Test: adb shell am instrument -w -e class com.android.settings.vpn2.PreferenceListTest com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner

Change-Id: Id2e4684f6d3048cfb60fee1f747d0796c157a3da
2017-12-14 09:48:33 -08:00
Peter Visontay
7ca6649566 Merge "Add a unit test for the AppOps permission for displaying UI overlays." 2017-12-14 13:49:18 +00:00
Philip P. Moltmann
bfaec28943 Merge "Switch to modern ArgumentMatchers" 2017-12-13 23:40:08 +00:00
TreeHugger Robot
aceacf5d43 Merge "Move AppInfoDashboardFragment into appinfo package." 2017-12-13 21:22:36 +00:00
Peter Visontay
11bfef660c Add a unit test for the AppOps permission for displaying UI overlays.
The test logic is the same as ExetrnalSourcesSettingsTest but I moved/renamed some methods so both AppOps tests can use them.

Test: make -j32 SettingsUnitTests && adb install -r out/target/product/marlin/data/app/SettingsUnitTests/SettingsUnitTests.apk && adb shell am instrument -w -e class com.android.settings.applications.ExternalSourcesSettingsTest com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner
Test: same as above, but for DrawOverlaySettingsTest
Change-Id: Ifc0f0985a4cb4a82a00839aeb4cd4216c777250e
2017-12-13 18:54:53 +00:00
Doris Ling
a0006d93bd Move AppInfoDashboardFragment into appinfo package.
- update all references to AppInfoDashboardFragment
- removed PackageUtil inner class and change the corresponding function
to be a simple method.

Bug: 69384089
Test: make RunSettingsRoboTests
Change-Id: Ief067e25a303ef16db20b2ca1d8840cb06eff5f9
2017-12-12 16:58:17 -08:00
Adam Lesinski
11ab7f7b82 Merge "Update the way OMS records details about overlays" into oc-mr1-dev
am: 15b42b89b8

Change-Id: I15809e100fc46691f0f60ed2729c18a07d904313
2017-12-12 23:16:37 +00:00
Doris Ling
e29587e334 Fix crashes related to ExternalSourcesDetails.
- ExternalSourcesSettingsTest crashes due to the package moved of
ExternalSourcesDetails. Corresponding xml has been updated in previous
CLs. So, reverting the suppress tag for the test class.
- ExternalSourcesDetails can be launched directly with
MANAGE_UNKNOWN_APP_SOURCES intent, and client can pass in invalid
package while launching ExternalSourcesDetails. Need to check whether
the app info is invalid before we try to launch the fragment.
- also fix test failure for not founding the app list as list object
type and id had been changed.

Change-Id: Id7787ca889f770e10d7a8e9fbf8dc79c9d6e884d
Fixes: 70383636
Test: make RunSettingsRoboTests, make SettingsUnitTests
2017-12-12 22:21:20 +00:00
Philip P. Moltmann
d27fe3275f Switch to modern ArgumentMatchers
Test: adb shell am instrument -w -e class com.android.settings.vpn2.PreferenceListTest com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner

Change-Id: Id2e4684f6d3048cfb60fee1f747d0796c157a3da
2017-12-12 13:07:21 -08:00
TreeHugger Robot
2f7240ceb5 Merge "Update package name for PictureAndPictureSettings" 2017-12-12 01:05:33 +00:00
Doris Ling
a8472007a7 Update package name for PictureAndPictureSettings
- also need to update the reference in the special app access xml page.

Change-Id: I1199f70adf18d3f0e21a946848239526d9c8b3c8
Fixes: 70491786
Test: make SettingsUnitTests
2017-12-11 14:54:37 -08:00
TreeHugger Robot
854e3e8266 Merge "Update the way OMS records details about overlays" 2017-12-11 21:51:35 +00:00
Aurimas Liutikas
6df7a52011 Disable crashing ExternalSourcesSettingsTest#testManageExternalSourcesForApp
Bug: 70383636
Change-Id: If542ef48d54959b3cc6c9fb07ddf07977fe40a8b
2017-12-09 19:03:43 +00:00
Paul Duffin
2baf72190c Stop statically including legacy-android-test
Statically including legacy-android-test leads to duplicate classes
which causes build time problems (with Proguard) and runtime problems on
older SDK versions. This change:
* Stops statically including legacy-android-test.
* Adds compile time dependencies on andoid.test.base, android.test.mock
  and android.test.runner where necessary.
* Adds <uses-library android:name="android.test.runner"/> to any
  affected package to ensure that the classes that were included by
  legacy-android-test are still available at runtime. That also adds a
  dependency on android.test.base and android.test.mock.

The following change descriptions were generated automatically and so
may be a little repetitive. They are provided to give the reviewer
enough information to check the comments match what has actually been
changed and check the reasoning behind the changes.

* tests/unit/Android.mk
    Added 'android.test.base' and 'android.test.mock' to
    LOCAL_JAVA_LIBRARIES because SettingsUnitTests's source depends on
    their classes and because of these changes they are no longer
    present on the compilation path.

    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in SettingsUnitTests
    results in duplicate classes which leads to build time and compile
    time issues.

Bug: 30188076
Test: make checkbuild
Change-Id: I191a72e50017213df6ad04f32aa660e8028720e2
2017-12-08 23:43:33 +00:00
Adam Lesinski
9e19121a00 Update the way OMS records details about overlays
Use flags, since we keep introducing boolean traits which would
be wasteful to encode as booleans.

Bug: 69383160
Test: builds
Change-Id: Ic09ae1086c7afa039b5df11e4c8c968125784586
Merged-In: Ic09ae1086c7afa039b5df11e4c8c968125784586
2017-12-07 19:40:19 +00:00
Adam Lesinski
d79cc0de92 Update the way OMS records details about overlays
Use newly added getter methods instead of relying on internal state.

Bug: 69383160
Test: builds and unit test passes
Change-Id: Ic09ae1086c7afa039b5df11e4c8c968125784586
2017-12-07 11:37:26 -08:00
jackqdyulei
4076bae930 Disable ConnectedDeviceConnectedActivity
Only one connected device activity could be enabled at one time. This
cl disbale the new version but keep old version enabled in
AndroidMainfest.xml.

In this case tile could find correct activity at any time.

Bug: 69810208
Test: Build
Change-Id: I0175b968cc26e38d0549fe2302b762fe0bc65c20
2017-12-04 13:35:12 -08:00
Matthew Fritze
09ec9ae852 Fix unit test for PreferenceController
As we migrate to using BasePreferenceController,
we need to change the checks for PreferenceControllerMixin.

Change-Id: I68cc065b9ac5a39eec21b7979cdb527b13c9778a
Fixes: 69917609
Test: atest
2017-11-29 11:05:46 -08:00
TreeHugger Robot
6a68f306d7 Merge "Implement querySiteMapPairs for indexableProvider." 2017-11-28 19:38:32 +00:00
Fan Zhang
518e648acf Implement querySiteMapPairs for indexableProvider.
Query sitemap will return a list of pairs [parent class name, child
class name]. It's up to consumer to figure out the display name later
so the provider doesn't have dependency on localizing any display names.

- Removed SiteMapManagerTest. We will perform the test in
  SettingsIntelligence instead.
- Added test for the new provider in instrumentation test (robolectric
  doesn't recognize the new constants in framework yet)

Bug: 67359411
Bug: 64938328
Test: atest
Change-Id: Ia973115320e6b7c8cf84d4756db1763ae7010aed
2017-11-27 15:50:19 -08:00