diff --git a/CtsTestCaseList.mk b/CtsTestCaseList.mk index 8a37b72a905330bb128db5e572e0229917aafef8..3b30e0ddf26e846641f606c0ed15ccaa49a247a6 100644 --- a/CtsTestCaseList.mk +++ b/CtsTestCaseList.mk @@ -30,15 +30,17 @@ cts_security_apps_list := \ CtsMultiUserStorageApp cts_support_packages := \ + CtsAccelerationTestStubs \ + CtsDeviceAdmin \ CtsDeviceOpenGl \ CtsDeviceTaskswitchingAppA \ CtsDeviceTaskswitchingAppB \ CtsDeviceTaskswitchingControl \ CtsDeviceUi \ - CtsAccelerationTestStubs \ - CtsDeviceAdmin \ + CtsHoloDeviceApp \ CtsMonkeyApp \ CtsMonkeyApp2 \ + CtsSampleDeviceApp \ CtsSomeAccessibilityServices \ CtsTestStubs \ SignatureTest \ @@ -82,7 +84,6 @@ cts_test_packages := \ CtsDreamsTestCases \ CtsDrmTestCases \ CtsEffectTestCases \ - CtsExampleTestCases \ CtsGestureTestCases \ CtsGraphicsTestCases \ CtsGraphics2TestCases \ @@ -107,6 +108,7 @@ cts_test_packages := \ CtsRenderscriptTestCases \ CtsRenderscriptGraphicsTestCases \ CtsRsCppTestCases \ + CtsSampleDeviceTestCases \ CtsSaxTestCases \ CtsSecurityTestCases \ CtsSpeechTestCases \ @@ -124,17 +126,17 @@ CTS_COVERAGE_TEST_CASE_LIST := \ $(cts_support_packages) \ $(cts_test_packages) - # Host side only tests cts_host_libraries := \ - CtsHostUi \ - CtsHostJank \ CtsAdbTests \ CtsAppSecurityTests \ + CtsHoloHostTestCases \ + CtsHostJank \ + CtsHostUi \ CtsMonkeyTestCases \ + CtsSampleHostTestCases \ CtsUsbTests - # Native test executables that need to have associated test XMLs. cts_native_exes := \ NativeMediaTest_SL \ diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml index 9a583ef30ca6964cd3865ab68a03bb86c095f45e..8f505356537b4c77ffa1d46eaf74dc7d8460ac52 100644 --- a/apps/CtsVerifier/AndroidManifest.xml +++ b/apps/CtsVerifier/AndroidManifest.xml @@ -18,7 +18,7 @@ + android:versionName="4.4_r1.95"> @@ -208,6 +208,122 @@ android:label="@string/bt_device_picker" android:configChanges="keyboardHidden|orientation|screenSize" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -218,6 +334,16 @@ + + + + + + + + @@ -464,6 +590,39 @@ android:value="android.hardware.sensor.compass" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -528,7 +687,7 @@ - + + + + + + + + + diff --git a/apps/CtsVerifier/proguard.flags b/apps/CtsVerifier/proguard.flags index dde9fdeef1d18d14cf09acba5d1d5f5dda723b2d..7e6587a1b87acc7b828283a9a9842fc2cb81acce 100644 --- a/apps/CtsVerifier/proguard.flags +++ b/apps/CtsVerifier/proguard.flags @@ -6,5 +6,7 @@ private ; } +-keepclasseswithmembers class * extends com.android.cts.verifier.location.LocationModeTestActivity + -dontwarn android.hardware.Sensor -dontwarn java.util.concurrent.ConcurrentLinkedDeque diff --git a/apps/CtsVerifier/res/layout/ble_button.xml b/apps/CtsVerifier/res/layout/ble_button.xml new file mode 100644 index 0000000000000000000000000000000000000000..6428fe2bfe3349657cdcddfe8e882ade6b270629 --- /dev/null +++ b/apps/CtsVerifier/res/layout/ble_button.xml @@ -0,0 +1,33 @@ + + + +