PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
63,849 Commits 1 Branch 0 Tags
f56584cd21eae2da86e016b4f6eeeb8fe8988bee
Commit Graph

14 Commits

Author SHA1 Message Date
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
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
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
Weilun Du
68a195ae93 Disable bluetooth controller if unsupported 
Only disable the controllers not the whole fragment because
user might need to have entry for other features.

Fixes: 73664409

Change-Id: I98ed248cf33d11715dd523e711cbc68ebf128ef8
Signed-off-by: Weilun Du <wdu@google.com>
 2018-03-06 12:05:32 -08:00
Mariano Giardina
c94cf51666 Merge "Revert "Disable bluetooth controller if unsupported"" 2018-03-06 12:18:48 +00:00
Mariano Giardina
b8709ca0e2 Revert "Disable bluetooth controller if unsupported" 
This reverts commit 726f115660.

Reason for revert: broke git_master
https://android-build.googleplex.com/builds/submitted/4635329/sailfish-userdebug_fastbuild3_linux/latest/view/logs/build_error.log

Change-Id: Icefa78f0a79f7ff0af373f3f0cd35d200cd4fec8
 2018-03-06 11:02:31 +00:00
TreeHugger Robot
6e97fc8d86 Merge "Disable bluetooth controller if unsupported" 2018-03-06 07:28:15 +00: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
Weilun Du
726f115660 Disable bluetooth controller if unsupported 
Only disable the controllers not the whole fragment because
user might need to have entry for other features.

Change-Id: I9c44cca97189a2115785cf70aee8eb580ac56000
Fixes: 73664409
Signed-off-by: Weilun Du <wdu@google.com>
 2018-03-03 14:42: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
jeffreyhuang
4824ff3d00 Move bluetooth test package to sdk 26 
Test: make RunSettingsRoboTests -j40
Change-Id: I26e6f437052caafd97f3f164b388d379fc890e7e
 2017-11-27 15:42:25 -08: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
jackqdyulei
837200041f Move "Received files" in BluetoothSettings 
Move it from menu to preference

Also clean up the code about menu since there is no menu anymore
in BluetoothSettings

Bug: 35876447
Test: RunSettingsRoboTests
Change-Id: I4a3821595a0cc75382f1cf74bcafb3ecc44cc178
 2017-06-16 13:45:46 -07:00