Commit Graph

26 Commits

Author SHA1 Message Date
Wesley.CW Wang
ff0e65c7f7 Add intent extra when launching WallpaperPicker from SUW and Settings
- Add extra to these intents to help WallpaperPicker log the launch
 source

Bug: 154781896
Test: make SettingsRoboTests
Change-Id: Ifb0ed22ab8ebfbb3c2ad24e9b7bad80007162b6e
2020-09-23 08:06:52 +00:00
Edgar Wang
651edc5c44 Remove ignore test case
Fixes: 147865441
Test: RunSettingsRoboTests ROBOTEST_FILTER=AssistFlashScreenPreferenceControllerTest
      RunSettingsRoboTests ROBOTEST_FILTER=DefaultAssistPreferenceControllerTest
      RunSettingsRoboTests ROBOTEST_FILTER=DefaultAutofillPickerTest
      RunSettingsRoboTests ROBOTEST_FILTER=StyleSuggestionActivityTest
Change-Id: I46f2d4b1dc38047bea3b287f11dcc71b7aed6c87
2020-03-12 19:21:36 +08:00
Tsung-Mao Fang
084b132295 Ignore test cases
Since ag/10056493 changed the interface, robotest is broken.

Bug: 147865441
Test: run all robotest
Change-Id: I88dce302068dbce3443c1909c092ff926260ad9b
2020-01-17 19:31:12 +08:00
alexylli
c310eb9494 [Settings] Adds an intent extra when setup wizard start the WallpaperSuggestionActivity
before: https://hsv.googleplex.com/4812887816142848
changed: https://hsv.googleplex.com/5670376870772736

Bug: b/139653958
Test: manual
Change-Id: I54de39059f7215d25f37c0d88d92e03bc5a076d4
2019-12-20 11:31:01 +08:00
Beth Thibodeau
bf63dde205 Add setting suggestion for style
Also added extra to the existing wallpaper suggestion so it opens
directly to that tab instead of the style tab

Test: atest com.android.settings.wallpaper.StyleSuggestionActivityTest
Fixes: 126230901

Change-Id: I50ca588627063194900dca8a9273baff4a44ca67
2019-05-02 10:58:22 -04:00
James Lemieux
f1dade40d2 Use binary resource support in robolectric
The resources available to tests are now exactly the merged resources
located in the APK under test.

Bug: 74359828
Test: make -j56 RunSettingsRoboTests
Change-Id: I050db81a92decefea23314b5ec7a62f77ff4bb2b
2018-12-12 19:53:49 -08:00
Fan Zhang
cdf284b732 Make Settings robotest work with tot Robolectric
Bug: 116278591
Test: make -j RunSettingsRoboTests
Change-Id: I32cb2fcf6094675f79d2fc24702ef6298a9691e4
2018-10-31 17:59:17 -07:00
Fan Zhang
23f8d59d02 Sort imports
Having consistent import order will reduce chance of merge
conflict between internal and external master

Test: rebuild
Change-Id: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
2018-08-28 22:13:15 +00:00
Fan Zhang
7373ec042b Migrate all remaining condition cards to v2.
Bug: 112485407
Test: robotests
Change-Id: I3c304c308fa6f499b4b5e21d4c5735cde7b90220
2018-08-15 09:48:38 -07:00
TreeHugger Robot
f9341c4c0b Merge "When wallpaper colors not ready set sys ui flags when ready" 2018-07-26 23:21:36 +00:00
Matthew Ng
932b20272a When wallpaper colors not ready set sys ui flags when ready
Uses a listener on wallpaper manager to get the wallpaper colors for
fallback home. When the colors are ready it can correctly set the system
ui flags.

Change-Id: I7119c0f035245539cb69bec1ccccecef64d3aff5
Fixes: 79776583
Test: reboot phone, unlock with pin/pattern with light them wallpaper
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FallbackHomeActivityTest
2018-07-26 15:22:41 -07:00
tmfang
f12e6adcdc Settings Fragment Migration (Fix test cases)
Fix all Roboletric test cases.
In this CL, some test cases are broken.
So, We ignored these test cases temporarily.

Test: make RunSettingsRoboTests -j56
Bug: 110259478
Change-Id: I1a3075438a614432a2de4f2d96d8abf9a83ce58c
2018-07-11 18:24:51 -07:00
tmfang
99cc23d0da Settings Fragment Migration (Change imports)
This commit *only* changes imports and optimize imports.
We don't do anything else.

This patch can't compile pass and run test case.
We will update other patches to fix these problem.

Change list.

1. import android.app.Fragment; ->
   import androidx.fragment.app.Fragment;
2. import android.app.DialogFragment; ->
   import androidx.fragment.app.DialogFragment;
3. import android.app.ListFragment; ->
   import androidx.fragment.app.ListFragment;
4. import android.app.LoaderManager; ->
   import androidx.loader.app.LoaderManager;
5. import android.content.AsyncTaskLoader; ->
   import androidx.loader.content.AsyncTaskLoader;
6. import android.content.Loader; ->
   import androidx.loader.content.Loader;
7. import android.app.FragmentTransaction; ->
   import androidx.fragment.app.FragmentTransaction;
8. import android.app.FragmentManager; ->
   import androidx.fragment.app.FragmentManager;
9. import android.app.LoaderManager.LoaderCallbacks; ->
    import androidx.loader.app.LoaderManager.LoaderCallbacks;

Bug: 110259478
Test: Can't test it.
Change-Id: I0a3f98fff34a3494a839c3c42aeabcec3df2c8b3
2018-07-11 18:23:51 -07:00
Fan Zhang
ec40f41e4c Do not stop wallpaper chooser activity
When choosing wallpaper type, do not finish the activity so we can
maintain a consistent back stack.

Change-Id: I690f4482716c6eaeb0a31605fbdf0a2525be0a15
Fixes: 80554423
Test: robotests
2018-06-21 11:11:47 -07:00
Fan Zhang
c7162cd24d Reorder and clean up imports.
Test: rebuild
Change-Id: I178485c84ae7146f991fd77b6d7504b029942a68
2018-06-18 15:45:09 -07:00
Aurimas Liutikas
e0069d332d Migrate Settings to androidx.
Test: make Settings
Bug: 76692459
Change-Id: I941dea40562170649bf056e675cc32e5163c0e39
2018-04-20 12:52:29 -07:00
Mill Chen
f4b328e723 WallpaperTypeSettings use DashboardFragment
- Build a controller to generate/manage a list of preferences.
- Move some logics to the controller and add tests.

Bug: 73899467
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.wallpaper
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.core
Test: atest SettingsGatewayTest UniquePreferenceTest
Change-Id: I519a76ff34bcd4195b0ad6ad406a8f66371923d2
2018-04-17 13:02:08 -07:00
Fan Zhang
947a673f74 Remove more wrappers
- WallpaperManagerWrapper
- UserManagerWrapper

Bug: 76167422
Test: robotests
Change-Id: I3ca866089082e01f1e9d7a4554387962f45a5437
2018-04-02 16:51:40 -07:00
James Lemieux
22a39c2b93 Use external/robolectric-shadows/run_robotests.mk
This allows Settings to test against the latest framework changes.

Also replaced TestConfig with traditional robolectric.properties.

Bug: 73173204
Bug: 73892008
Test: make -j56 RunSettingsRoboTests
Change-Id: I3135b4fa5f095ba79b282a76f45dd9baa2584bc7
2018-03-04 03:50:08 -08:00
Ben Lin
245ac03c07 Check device for config_enableWallpaperService before calling service.
On some devices, it is possible that config_enableWallpaperService is
false, in which then there is no wallpaper service on device. Calling
WallpaperManager#getWallpaperId will then result in an NPE. We should
just do a check and return false.

Bug: 62387789
Test: RoboSettingsTest
Change-Id: I31db6845f06533d92140bf91d0f7fc7e7bedc5c5
2018-02-05 15:17:16 -08:00
jeffreyhuang
cbfb099a40 Rename SDK_VERSION_O to SDK_VERSION
Test: make RunSettingsRoboTests -j40
Change-Id: I6715062d8addadda441e32809db1af55f15e3a90
2017-12-05 16:43:54 -08:00
Ajay Nadathur
d473e38c74 Forward wallpaper activity results to the caller.
- Added Activity.FLAG_ACTIVITY_FORWARD_RESULT to the intent that
launches the wallpaper activities.
- WallpaperSuggestionActivity also finishes itself after launching
intent.

Bug: 65691577
Test: Added robolectric test. Also verified manually that result code is
being forwarded
Change-Id: I2f8b0fac7a35c38e14c4a733b7552fd2e58dd0db
2017-11-08 11:03:04 -08:00
Fan Zhang
31f699c281 Move code from SuggestionChecks to FeatureProvider
This is step one to deprecate SuggestionChecks. Moving logic into
SuggestionFeatureProvider allows potential logic override and improves
testability.

Also moved isSuggestionComplete tests to corresponding activity/pref
controller test.

Bug: 65065268
Test: robotests
Change-Id: I2071d30fc58bb84acad2083ca03cfcf7d41f10cb
2017-09-29 11:36:16 -07:00
Maurice Lam
e18902ec67 Update Robolectric to 3.4.2
Bug: 66693279
Test: m RunSettingsRoboTests
      m RunSettingsRoboTests-jacoco
Change-Id: I9df619c3d68f0af2ee2ae944a15998275129f7c2
2017-09-22 18:34:00 +00:00
Andrew Sapperstein
9f1e911759 Refactor test runner to use static list of resource paths
Previously everything lived in an inner class method of
SettingsRobolectricTestRunner. That method has now been turned into
a static method so that it can be called by other runners.

Bug: 62460102
Test: robotests
Change-Id: I6612b1f26404587301c534c8ba60e39d59d6c840
2017-06-09 09:21:26 -07:00
Fan Zhang
2907f86971 Fallback to default wallpaper picker if first choice fails
- Add fallback logic in WallpaperSuggestionActivity
- Move some classes around
- Delete some unused class

Change-Id: Ifc8864428647a94f3ecae50d193c2156b2592ff3
Fix: 36140287
Test: make RunSettingsRoboTests
2017-03-17 16:49:58 -07:00