diff --git a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_landscape_actionButtons.png b/packages/SettingsLib/Spa/screenshot/assets/phone/dark_landscape_actionButtons.png deleted file mode 100644 index e1733b7eef724..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_landscape_actionButtons.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_landscape_barChart.png b/packages/SettingsLib/Spa/screenshot/assets/phone/dark_landscape_barChart.png deleted file mode 100644 index 89c84af22d567..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_landscape_barChart.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_landscape_footer.png b/packages/SettingsLib/Spa/screenshot/assets/phone/dark_landscape_footer.png deleted file mode 100644 index 517ab1826739e..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_landscape_footer.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_landscape_imageIllustration.png b/packages/SettingsLib/Spa/screenshot/assets/phone/dark_landscape_imageIllustration.png deleted file mode 100644 index fbc8174d8903f..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_landscape_imageIllustration.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_landscape_lineChart.png b/packages/SettingsLib/Spa/screenshot/assets/phone/dark_landscape_lineChart.png deleted file mode 100644 index 834f16ddc888f..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_landscape_lineChart.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_landscape_mainSwitchPreference.png b/packages/SettingsLib/Spa/screenshot/assets/phone/dark_landscape_mainSwitchPreference.png deleted file mode 100644 index aad05aa148107..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_landscape_mainSwitchPreference.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_landscape_pieChart.png b/packages/SettingsLib/Spa/screenshot/assets/phone/dark_landscape_pieChart.png deleted file mode 100644 index 5decbed488023..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_landscape_pieChart.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_landscape_preference.png b/packages/SettingsLib/Spa/screenshot/assets/phone/dark_landscape_preference.png deleted file mode 100644 index 6086e2d15dd27..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_landscape_preference.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_landscape_progressBar.png b/packages/SettingsLib/Spa/screenshot/assets/phone/dark_landscape_progressBar.png deleted file mode 100644 index a59369a3f0e31..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_landscape_progressBar.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_landscape_slider.png b/packages/SettingsLib/Spa/screenshot/assets/phone/dark_landscape_slider.png deleted file mode 100644 index 3fc82263bea03..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_landscape_slider.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_landscape_spinner.png b/packages/SettingsLib/Spa/screenshot/assets/phone/dark_landscape_spinner.png deleted file mode 100644 index bc119bc069f7c..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_landscape_spinner.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_landscape_switchPreference.png b/packages/SettingsLib/Spa/screenshot/assets/phone/dark_landscape_switchPreference.png deleted file mode 100644 index 1286b8aaa6054..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_landscape_switchPreference.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_landscape_twoTargetSwitchPreference.png b/packages/SettingsLib/Spa/screenshot/assets/phone/dark_landscape_twoTargetSwitchPreference.png deleted file mode 100644 index f347c83ef52d8..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_landscape_twoTargetSwitchPreference.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_portrait_actionButtons.png b/packages/SettingsLib/Spa/screenshot/assets/phone/dark_portrait_actionButtons.png deleted file mode 100644 index 44e3029c07a82..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_portrait_actionButtons.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_portrait_barChart.png b/packages/SettingsLib/Spa/screenshot/assets/phone/dark_portrait_barChart.png deleted file mode 100644 index fb7c2025c8b87..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_portrait_barChart.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_portrait_footer.png b/packages/SettingsLib/Spa/screenshot/assets/phone/dark_portrait_footer.png deleted file mode 100644 index 517ab1826739e..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_portrait_footer.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_portrait_imageIllustration.png b/packages/SettingsLib/Spa/screenshot/assets/phone/dark_portrait_imageIllustration.png deleted file mode 100644 index 447b6986f30cf..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_portrait_imageIllustration.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_portrait_lineChart.png b/packages/SettingsLib/Spa/screenshot/assets/phone/dark_portrait_lineChart.png deleted file mode 100644 index ff04de854019d..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_portrait_lineChart.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_portrait_mainSwitchPreference.png b/packages/SettingsLib/Spa/screenshot/assets/phone/dark_portrait_mainSwitchPreference.png deleted file mode 100644 index 90e7d8866bfd8..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_portrait_mainSwitchPreference.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_portrait_pieChart.png b/packages/SettingsLib/Spa/screenshot/assets/phone/dark_portrait_pieChart.png deleted file mode 100644 index b66f9b943c6aa..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_portrait_pieChart.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_portrait_preference.png b/packages/SettingsLib/Spa/screenshot/assets/phone/dark_portrait_preference.png deleted file mode 100644 index aa6c5b7cd131e..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_portrait_preference.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_portrait_progressBar.png b/packages/SettingsLib/Spa/screenshot/assets/phone/dark_portrait_progressBar.png deleted file mode 100644 index 75c22b6232cd1..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_portrait_progressBar.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_portrait_slider.png b/packages/SettingsLib/Spa/screenshot/assets/phone/dark_portrait_slider.png deleted file mode 100644 index 718d7d5083b7f..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_portrait_slider.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_portrait_spinner.png b/packages/SettingsLib/Spa/screenshot/assets/phone/dark_portrait_spinner.png deleted file mode 100644 index bc119bc069f7c..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_portrait_spinner.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_portrait_switchPreference.png b/packages/SettingsLib/Spa/screenshot/assets/phone/dark_portrait_switchPreference.png deleted file mode 100644 index 85e5d73f41be4..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_portrait_switchPreference.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_portrait_twoTargetSwitchPreference.png b/packages/SettingsLib/Spa/screenshot/assets/phone/dark_portrait_twoTargetSwitchPreference.png deleted file mode 100644 index c683005d37822..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/phone/dark_portrait_twoTargetSwitchPreference.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/phone/light_landscape_mainSwitchPreference.png b/packages/SettingsLib/Spa/screenshot/assets/phone/light_landscape_mainSwitchPreference.png index 6fe75a1889663..bf19a2c5b77e7 100644 Binary files a/packages/SettingsLib/Spa/screenshot/assets/phone/light_landscape_mainSwitchPreference.png and b/packages/SettingsLib/Spa/screenshot/assets/phone/light_landscape_mainSwitchPreference.png differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/phone/light_landscape_preference.png b/packages/SettingsLib/Spa/screenshot/assets/phone/light_landscape_preference.png index cac990caad635..c77f9b182140a 100644 Binary files a/packages/SettingsLib/Spa/screenshot/assets/phone/light_landscape_preference.png and b/packages/SettingsLib/Spa/screenshot/assets/phone/light_landscape_preference.png differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/phone/light_landscape_progressBar.png b/packages/SettingsLib/Spa/screenshot/assets/phone/light_landscape_progressBar.png index f8c35e9bf3cd3..6bf20bedecba6 100644 Binary files a/packages/SettingsLib/Spa/screenshot/assets/phone/light_landscape_progressBar.png and b/packages/SettingsLib/Spa/screenshot/assets/phone/light_landscape_progressBar.png differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/phone/light_landscape_slider.png b/packages/SettingsLib/Spa/screenshot/assets/phone/light_landscape_slider.png index d08710f12bc33..dda6f0a48d207 100644 Binary files a/packages/SettingsLib/Spa/screenshot/assets/phone/light_landscape_slider.png and b/packages/SettingsLib/Spa/screenshot/assets/phone/light_landscape_slider.png differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/phone/light_landscape_switchPreference.png b/packages/SettingsLib/Spa/screenshot/assets/phone/light_landscape_switchPreference.png index fa49e90b6fea1..669f443fcd5cd 100644 Binary files a/packages/SettingsLib/Spa/screenshot/assets/phone/light_landscape_switchPreference.png and b/packages/SettingsLib/Spa/screenshot/assets/phone/light_landscape_switchPreference.png differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/phone/light_landscape_twoTargetSwitchPreference.png b/packages/SettingsLib/Spa/screenshot/assets/phone/light_landscape_twoTargetSwitchPreference.png index 9739aa11896ee..8e37cc0e11d95 100644 Binary files a/packages/SettingsLib/Spa/screenshot/assets/phone/light_landscape_twoTargetSwitchPreference.png and b/packages/SettingsLib/Spa/screenshot/assets/phone/light_landscape_twoTargetSwitchPreference.png differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/phone/light_portrait_mainSwitchPreference.png b/packages/SettingsLib/Spa/screenshot/assets/phone/light_portrait_mainSwitchPreference.png index 5ceee05964ca6..2d5894e98dc00 100644 Binary files a/packages/SettingsLib/Spa/screenshot/assets/phone/light_portrait_mainSwitchPreference.png and b/packages/SettingsLib/Spa/screenshot/assets/phone/light_portrait_mainSwitchPreference.png differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/phone/light_portrait_preference.png b/packages/SettingsLib/Spa/screenshot/assets/phone/light_portrait_preference.png index f6298c0b62c45..b0fc305fd23fb 100644 Binary files a/packages/SettingsLib/Spa/screenshot/assets/phone/light_portrait_preference.png and b/packages/SettingsLib/Spa/screenshot/assets/phone/light_portrait_preference.png differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/phone/light_portrait_progressBar.png b/packages/SettingsLib/Spa/screenshot/assets/phone/light_portrait_progressBar.png index fe12373cb0f61..fa01348108a51 100644 Binary files a/packages/SettingsLib/Spa/screenshot/assets/phone/light_portrait_progressBar.png and b/packages/SettingsLib/Spa/screenshot/assets/phone/light_portrait_progressBar.png differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/phone/light_portrait_slider.png b/packages/SettingsLib/Spa/screenshot/assets/phone/light_portrait_slider.png index 2e54b568be382..213c0b243b8b8 100644 Binary files a/packages/SettingsLib/Spa/screenshot/assets/phone/light_portrait_slider.png and b/packages/SettingsLib/Spa/screenshot/assets/phone/light_portrait_slider.png differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/phone/light_portrait_switchPreference.png b/packages/SettingsLib/Spa/screenshot/assets/phone/light_portrait_switchPreference.png index 9b0f1ed610fe1..ce7ab78e56fa5 100644 Binary files a/packages/SettingsLib/Spa/screenshot/assets/phone/light_portrait_switchPreference.png and b/packages/SettingsLib/Spa/screenshot/assets/phone/light_portrait_switchPreference.png differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/phone/light_portrait_twoTargetSwitchPreference.png b/packages/SettingsLib/Spa/screenshot/assets/phone/light_portrait_twoTargetSwitchPreference.png index 1bd26155ef59a..9d92f7ac9ac9e 100644 Binary files a/packages/SettingsLib/Spa/screenshot/assets/phone/light_portrait_twoTargetSwitchPreference.png and b/packages/SettingsLib/Spa/screenshot/assets/phone/light_portrait_twoTargetSwitchPreference.png differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_landscape_actionButtons.png b/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_landscape_actionButtons.png deleted file mode 100644 index f4c80db2f86ec..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_landscape_actionButtons.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_landscape_barChart.png b/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_landscape_barChart.png deleted file mode 100644 index e2e37c25a9fe6..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_landscape_barChart.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_landscape_footer.png b/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_landscape_footer.png deleted file mode 100644 index cc1de5520d150..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_landscape_footer.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_landscape_imageIllustration.png b/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_landscape_imageIllustration.png deleted file mode 100644 index 50913906b0ec7..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_landscape_imageIllustration.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_landscape_lineChart.png b/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_landscape_lineChart.png deleted file mode 100644 index 1216584efcb59..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_landscape_lineChart.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_landscape_mainSwitchPreference.png b/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_landscape_mainSwitchPreference.png deleted file mode 100644 index cb23cdda691cd..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_landscape_mainSwitchPreference.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_landscape_pieChart.png b/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_landscape_pieChart.png deleted file mode 100644 index 79907eb02ce3e..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_landscape_pieChart.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_landscape_preference.png b/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_landscape_preference.png deleted file mode 100644 index ca80739687264..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_landscape_preference.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_landscape_progressBar.png b/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_landscape_progressBar.png deleted file mode 100644 index 6373d94ecee55..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_landscape_progressBar.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_landscape_slider.png b/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_landscape_slider.png deleted file mode 100644 index 7c651b24cd606..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_landscape_slider.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_landscape_spinner.png b/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_landscape_spinner.png deleted file mode 100644 index c211e0e20c697..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_landscape_spinner.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_landscape_switchPreference.png b/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_landscape_switchPreference.png deleted file mode 100644 index b6261253cd8ee..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_landscape_switchPreference.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_landscape_twoTargetSwitchPreference.png b/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_landscape_twoTargetSwitchPreference.png deleted file mode 100644 index a1657456cce0a..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_landscape_twoTargetSwitchPreference.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_portrait_mainSwitchPreference.png b/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_portrait_mainSwitchPreference.png index 9cd5d0aa42edb..b1676b3e01abf 100644 Binary files a/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_portrait_mainSwitchPreference.png and b/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_portrait_mainSwitchPreference.png differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_portrait_preference.png b/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_portrait_preference.png index 94e28437c04ea..4845ea8f32e92 100644 Binary files a/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_portrait_preference.png and b/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_portrait_preference.png differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_portrait_progressBar.png b/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_portrait_progressBar.png index f23d6d43d642e..7e579583051ae 100644 Binary files a/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_portrait_progressBar.png and b/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_portrait_progressBar.png differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_portrait_slider.png b/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_portrait_slider.png index b8411d4af2613..d1abaa6952eab 100644 Binary files a/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_portrait_slider.png and b/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_portrait_slider.png differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_portrait_switchPreference.png b/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_portrait_switchPreference.png index c5495cd64c753..9c57e332b2c94 100644 Binary files a/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_portrait_switchPreference.png and b/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_portrait_switchPreference.png differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_portrait_twoTargetSwitchPreference.png b/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_portrait_twoTargetSwitchPreference.png index 561efd83d4306..d416a0bbf3e09 100644 Binary files a/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_portrait_twoTargetSwitchPreference.png and b/packages/SettingsLib/Spa/screenshot/assets/tablet/dark_portrait_twoTargetSwitchPreference.png differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_landscape_actionButtons.png b/packages/SettingsLib/Spa/screenshot/assets/tablet/light_landscape_actionButtons.png deleted file mode 100644 index ba22324322e5d..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_landscape_actionButtons.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_landscape_barChart.png b/packages/SettingsLib/Spa/screenshot/assets/tablet/light_landscape_barChart.png deleted file mode 100644 index 57dbcc6806947..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_landscape_barChart.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_landscape_footer.png b/packages/SettingsLib/Spa/screenshot/assets/tablet/light_landscape_footer.png deleted file mode 100644 index 0c24b2a31d2f9..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_landscape_footer.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_landscape_imageIllustration.png b/packages/SettingsLib/Spa/screenshot/assets/tablet/light_landscape_imageIllustration.png deleted file mode 100644 index 126dae8275257..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_landscape_imageIllustration.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_landscape_lineChart.png b/packages/SettingsLib/Spa/screenshot/assets/tablet/light_landscape_lineChart.png deleted file mode 100644 index a48775dee3b56..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_landscape_lineChart.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_landscape_mainSwitchPreference.png b/packages/SettingsLib/Spa/screenshot/assets/tablet/light_landscape_mainSwitchPreference.png deleted file mode 100644 index 114da9637f07d..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_landscape_mainSwitchPreference.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_landscape_pieChart.png b/packages/SettingsLib/Spa/screenshot/assets/tablet/light_landscape_pieChart.png deleted file mode 100644 index f2a068c2c5e88..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_landscape_pieChart.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_landscape_preference.png b/packages/SettingsLib/Spa/screenshot/assets/tablet/light_landscape_preference.png deleted file mode 100644 index c71f07fe63c5c..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_landscape_preference.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_landscape_progressBar.png b/packages/SettingsLib/Spa/screenshot/assets/tablet/light_landscape_progressBar.png deleted file mode 100644 index ecb4b3d18e107..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_landscape_progressBar.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_landscape_slider.png b/packages/SettingsLib/Spa/screenshot/assets/tablet/light_landscape_slider.png deleted file mode 100644 index 12abcea43915b..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_landscape_slider.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_landscape_spinner.png b/packages/SettingsLib/Spa/screenshot/assets/tablet/light_landscape_spinner.png deleted file mode 100644 index 5637f5135c42c..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_landscape_spinner.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_landscape_switchPreference.png b/packages/SettingsLib/Spa/screenshot/assets/tablet/light_landscape_switchPreference.png deleted file mode 100644 index a638dc81c6198..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_landscape_switchPreference.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_landscape_twoTargetSwitchPreference.png b/packages/SettingsLib/Spa/screenshot/assets/tablet/light_landscape_twoTargetSwitchPreference.png deleted file mode 100644 index e795f0eabb1ad..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_landscape_twoTargetSwitchPreference.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_portrait_actionButtons.png b/packages/SettingsLib/Spa/screenshot/assets/tablet/light_portrait_actionButtons.png deleted file mode 100644 index ac0bba48eadd1..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_portrait_actionButtons.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_portrait_barChart.png b/packages/SettingsLib/Spa/screenshot/assets/tablet/light_portrait_barChart.png deleted file mode 100644 index 5286c8ada8680..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_portrait_barChart.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_portrait_footer.png b/packages/SettingsLib/Spa/screenshot/assets/tablet/light_portrait_footer.png deleted file mode 100644 index 0c24b2a31d2f9..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_portrait_footer.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_portrait_imageIllustration.png b/packages/SettingsLib/Spa/screenshot/assets/tablet/light_portrait_imageIllustration.png deleted file mode 100644 index 7b9dc03e80ad1..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_portrait_imageIllustration.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_portrait_lineChart.png b/packages/SettingsLib/Spa/screenshot/assets/tablet/light_portrait_lineChart.png deleted file mode 100644 index 6285b71da33c2..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_portrait_lineChart.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_portrait_mainSwitchPreference.png b/packages/SettingsLib/Spa/screenshot/assets/tablet/light_portrait_mainSwitchPreference.png deleted file mode 100644 index d0517fa97a1d7..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_portrait_mainSwitchPreference.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_portrait_pieChart.png b/packages/SettingsLib/Spa/screenshot/assets/tablet/light_portrait_pieChart.png deleted file mode 100644 index 483a697f06b06..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_portrait_pieChart.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_portrait_preference.png b/packages/SettingsLib/Spa/screenshot/assets/tablet/light_portrait_preference.png deleted file mode 100644 index 95f19da3c52cd..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_portrait_preference.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_portrait_progressBar.png b/packages/SettingsLib/Spa/screenshot/assets/tablet/light_portrait_progressBar.png deleted file mode 100644 index c510d9bb47b08..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_portrait_progressBar.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_portrait_slider.png b/packages/SettingsLib/Spa/screenshot/assets/tablet/light_portrait_slider.png deleted file mode 100644 index 55b7bec8e16a6..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_portrait_slider.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_portrait_spinner.png b/packages/SettingsLib/Spa/screenshot/assets/tablet/light_portrait_spinner.png deleted file mode 100644 index 5637f5135c42c..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_portrait_spinner.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_portrait_switchPreference.png b/packages/SettingsLib/Spa/screenshot/assets/tablet/light_portrait_switchPreference.png deleted file mode 100644 index 03c2e6c5a231e..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_portrait_switchPreference.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_portrait_twoTargetSwitchPreference.png b/packages/SettingsLib/Spa/screenshot/assets/tablet/light_portrait_twoTargetSwitchPreference.png deleted file mode 100644 index 7e7a8a3fd973c..0000000000000 Binary files a/packages/SettingsLib/Spa/screenshot/assets/tablet/light_portrait_twoTargetSwitchPreference.png and /dev/null differ diff --git a/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/button/ActionButtonsScreenshotTest.kt b/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/button/ActionButtonsScreenshotTest.kt index af76105ef7c9d..b2e0b181f88bf 100644 --- a/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/button/ActionButtonsScreenshotTest.kt +++ b/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/button/ActionButtonsScreenshotTest.kt @@ -34,7 +34,7 @@ class ActionButtonsScreenshotTest(emulationSpec: DeviceEmulationSpec) { companion object { @Parameterized.Parameters(name = "{0}") @JvmStatic - fun getTestSpecs() = DeviceEmulationSpec.PhoneAndTabletFull + fun getTestSpecs() = DeviceEmulationSpec.PhoneAndTabletMinimal } @get:Rule diff --git a/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/chart/BarChartScreenshotTest.kt b/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/chart/BarChartScreenshotTest.kt index 3180c9223a770..27d270c5d58ed 100644 --- a/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/chart/BarChartScreenshotTest.kt +++ b/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/chart/BarChartScreenshotTest.kt @@ -32,7 +32,7 @@ class BarChartScreenshotTest(emulationSpec: DeviceEmulationSpec) { companion object { @Parameterized.Parameters(name = "{0}") @JvmStatic - fun getTestSpecs() = DeviceEmulationSpec.PhoneAndTabletFull + fun getTestSpecs() = DeviceEmulationSpec.PhoneAndTabletMinimal } @get:Rule diff --git a/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/chart/LineChartScreenshotTest.kt b/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/chart/LineChartScreenshotTest.kt index 6ed3c8f7c7275..f9d93f878f2b1 100644 --- a/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/chart/LineChartScreenshotTest.kt +++ b/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/chart/LineChartScreenshotTest.kt @@ -33,7 +33,7 @@ class LineChartScreenshotTest(emulationSpec: DeviceEmulationSpec) { companion object { @Parameterized.Parameters(name = "{0}") @JvmStatic - fun getTestSpecs() = DeviceEmulationSpec.PhoneAndTabletFull + fun getTestSpecs() = DeviceEmulationSpec.PhoneAndTabletMinimal } @get:Rule diff --git a/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/chart/PieChartScreenshotTest.kt b/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/chart/PieChartScreenshotTest.kt index 28638f0ccf677..34ded3cb94d6c 100644 --- a/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/chart/PieChartScreenshotTest.kt +++ b/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/chart/PieChartScreenshotTest.kt @@ -31,7 +31,7 @@ class PieChartScreenshotTest(emulationSpec: DeviceEmulationSpec) { companion object { @Parameterized.Parameters(name = "{0}") @JvmStatic - fun getTestSpecs() = DeviceEmulationSpec.PhoneAndTabletFull + fun getTestSpecs() = DeviceEmulationSpec.PhoneAndTabletMinimal } @get:Rule diff --git a/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/illustration/ImageIllustrationScreenshotTest.kt b/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/illustration/ImageIllustrationScreenshotTest.kt index 66f66d6149564..91aca05a9cdf1 100644 --- a/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/illustration/ImageIllustrationScreenshotTest.kt +++ b/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/illustration/ImageIllustrationScreenshotTest.kt @@ -31,7 +31,7 @@ class ImageIllustrationScreenshotTest(emulationSpec: DeviceEmulationSpec) { companion object { @Parameterized.Parameters(name = "{0}") @JvmStatic - fun getTestSpecs() = DeviceEmulationSpec.PhoneAndTabletFull + fun getTestSpecs() = DeviceEmulationSpec.PhoneAndTabletMinimal } @get:Rule diff --git a/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/preference/MainSwitchPreferenceScreenshotTest.kt b/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/preference/MainSwitchPreferenceScreenshotTest.kt index 489fb99947459..a366b9e0e85bb 100644 --- a/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/preference/MainSwitchPreferenceScreenshotTest.kt +++ b/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/preference/MainSwitchPreferenceScreenshotTest.kt @@ -16,10 +16,10 @@ package com.android.settingslib.spa.screenshot +import androidx.compose.foundation.layout.Column import com.android.settingslib.spa.framework.compose.stateOf import com.android.settingslib.spa.widget.preference.MainSwitchPreference import com.android.settingslib.spa.widget.preference.SwitchPreferenceModel -import com.android.settingslib.spa.widget.scaffold.RegularScaffold import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith @@ -32,7 +32,7 @@ class MainSwitchPreferenceScreenshotTest(emulationSpec: DeviceEmulationSpec) { companion object { @Parameterized.Parameters(name = "{0}") @JvmStatic - fun getTestSpecs() = DeviceEmulationSpec.PhoneAndTabletFull + fun getTestSpecs() = DeviceEmulationSpec.PhoneAndTabletMinimal } @get:Rule @@ -45,7 +45,7 @@ class MainSwitchPreferenceScreenshotTest(emulationSpec: DeviceEmulationSpec) { @Test fun test() { screenshotRule.screenshotTest("mainSwitchPreference") { - RegularScaffold(title = "MainSwitchPreference") { + Column { MainSwitchPreference( object : SwitchPreferenceModel { override val title = "MainSwitchPreference" diff --git a/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/preference/PreferenceScreenshotTest.kt b/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/preference/PreferenceScreenshotTest.kt index 28e97ea5f5235..d72152c15af23 100644 --- a/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/preference/PreferenceScreenshotTest.kt +++ b/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/preference/PreferenceScreenshotTest.kt @@ -16,6 +16,7 @@ package com.android.settingslib.spa.screenshot +import androidx.compose.foundation.layout.Column import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.Autorenew import androidx.compose.material.icons.outlined.DisabledByDefault @@ -23,7 +24,6 @@ import androidx.compose.runtime.Composable import com.android.settingslib.spa.framework.compose.toState import com.android.settingslib.spa.widget.preference.Preference import com.android.settingslib.spa.widget.preference.PreferenceModel -import com.android.settingslib.spa.widget.scaffold.RegularScaffold import com.android.settingslib.spa.widget.ui.SettingsIcon import org.junit.Rule import org.junit.Test @@ -37,7 +37,7 @@ class PreferenceScreenshotTest(emulationSpec: DeviceEmulationSpec) { companion object { @Parameterized.Parameters(name = "{0}") @JvmStatic - fun getTestSpecs() = DeviceEmulationSpec.PhoneAndTabletFull + fun getTestSpecs() = DeviceEmulationSpec.PhoneAndTabletMinimal private const val TITLE = "Title" private const val SUMMARY = "Summary" private const val LONG_SUMMARY = @@ -54,7 +54,7 @@ class PreferenceScreenshotTest(emulationSpec: DeviceEmulationSpec) { @Test fun test() { screenshotRule.screenshotTest("preference") { - RegularScaffold(title = "Preference") { + Column { Preference(object : PreferenceModel { override val title = TITLE }) diff --git a/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/preference/ProgressBarPreferenceScreenshotTest.kt b/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/preference/ProgressBarPreferenceScreenshotTest.kt index c5b873fc25953..5fcaf85030959 100644 --- a/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/preference/ProgressBarPreferenceScreenshotTest.kt +++ b/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/preference/ProgressBarPreferenceScreenshotTest.kt @@ -16,6 +16,7 @@ package com.android.settingslib.spa.screenshot +import androidx.compose.foundation.layout.Column import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.Delete import androidx.compose.material.icons.outlined.SystemUpdate @@ -23,7 +24,6 @@ import androidx.compose.runtime.Composable import com.android.settingslib.spa.widget.preference.ProgressBarPreference import com.android.settingslib.spa.widget.preference.ProgressBarPreferenceModel import com.android.settingslib.spa.widget.preference.ProgressBarWithDataPreference -import com.android.settingslib.spa.widget.scaffold.RegularScaffold import com.android.settingslib.spa.widget.ui.CircularProgressBar import org.junit.Rule import org.junit.Test @@ -37,7 +37,7 @@ class ProgressBarPreferenceScreenshotTest(emulationSpec: DeviceEmulationSpec) { companion object { @Parameterized.Parameters(name = "{0}") @JvmStatic - fun getTestSpecs() = DeviceEmulationSpec.PhoneAndTabletFull + fun getTestSpecs() = DeviceEmulationSpec.PhoneAndTabletMinimal } @get:Rule @@ -50,7 +50,7 @@ class ProgressBarPreferenceScreenshotTest(emulationSpec: DeviceEmulationSpec) { @Test fun test() { screenshotRule.screenshotTest("progressBar") { - RegularScaffold(title = "ProgressBar") { + Column { LargeProgressBar() SimpleProgressBar() ProgressBarWithData() diff --git a/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/preference/SliderPreferenceScreenshotTest.kt b/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/preference/SliderPreferenceScreenshotTest.kt index 2da0ef2f91bb3..48c922dcf1a12 100644 --- a/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/preference/SliderPreferenceScreenshotTest.kt +++ b/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/preference/SliderPreferenceScreenshotTest.kt @@ -16,11 +16,11 @@ package com.android.settingslib.spa.screenshot +import androidx.compose.foundation.layout.Column import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.AccessAlarm import com.android.settingslib.spa.widget.preference.SliderPreference import com.android.settingslib.spa.widget.preference.SliderPreferenceModel -import com.android.settingslib.spa.widget.scaffold.RegularScaffold import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith @@ -33,7 +33,7 @@ class SliderPreferenceScreenshotTest(emulationSpec: DeviceEmulationSpec) { companion object { @Parameterized.Parameters(name = "{0}") @JvmStatic - fun getTestSpecs() = DeviceEmulationSpec.PhoneAndTabletFull + fun getTestSpecs() = DeviceEmulationSpec.PhoneAndTabletMinimal } @get:Rule @@ -46,7 +46,7 @@ class SliderPreferenceScreenshotTest(emulationSpec: DeviceEmulationSpec) { @Test fun test() { screenshotRule.screenshotTest("slider") { - RegularScaffold(title = "Slider") { + Column { SliderPreference(object : SliderPreferenceModel { override val title = "Simple Slider" override val initValue = 40 diff --git a/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/preference/SwitchPreferenceScreenshotTest.kt b/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/preference/SwitchPreferenceScreenshotTest.kt index 026b986e6627a..2c84a8e3f760c 100644 --- a/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/preference/SwitchPreferenceScreenshotTest.kt +++ b/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/preference/SwitchPreferenceScreenshotTest.kt @@ -16,13 +16,13 @@ package com.android.settingslib.spa.screenshot +import androidx.compose.foundation.layout.Column import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.AirplanemodeActive import androidx.compose.runtime.Composable import com.android.settingslib.spa.framework.compose.stateOf import com.android.settingslib.spa.widget.preference.SwitchPreference import com.android.settingslib.spa.widget.preference.SwitchPreferenceModel -import com.android.settingslib.spa.widget.scaffold.RegularScaffold import com.android.settingslib.spa.widget.ui.SettingsIcon import org.junit.Rule import org.junit.Test @@ -36,7 +36,7 @@ class SwitchPreferenceScreenshotTest(emulationSpec: DeviceEmulationSpec) { companion object { @Parameterized.Parameters(name = "{0}") @JvmStatic - fun getTestSpecs() = DeviceEmulationSpec.PhoneAndTabletFull + fun getTestSpecs() = DeviceEmulationSpec.PhoneAndTabletMinimal } @get:Rule @@ -49,7 +49,7 @@ class SwitchPreferenceScreenshotTest(emulationSpec: DeviceEmulationSpec) { @Test fun test() { screenshotRule.screenshotTest("switchPreference") { - RegularScaffold(title = "SwitchPreference") { + Column { SampleSwitchPreference() SampleSwitchPreferenceWithSummary() SampleNotChangeableSwitchPreference() diff --git a/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/preference/TwoTargetSwitchPreferenceScreenshotTest.kt b/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/preference/TwoTargetSwitchPreferenceScreenshotTest.kt index 833e98cc2660a..2c37212f1a717 100644 --- a/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/preference/TwoTargetSwitchPreferenceScreenshotTest.kt +++ b/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/preference/TwoTargetSwitchPreferenceScreenshotTest.kt @@ -16,10 +16,10 @@ package com.android.settingslib.spa.screenshot +import androidx.compose.foundation.layout.Column import com.android.settingslib.spa.framework.compose.stateOf import com.android.settingslib.spa.widget.preference.TwoTargetSwitchPreference import com.android.settingslib.spa.widget.preference.SwitchPreferenceModel -import com.android.settingslib.spa.widget.scaffold.RegularScaffold import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith @@ -32,7 +32,7 @@ class TwoTargetSwitchPreferenceScreenshotTest(emulationSpec: DeviceEmulationSpec companion object { @Parameterized.Parameters(name = "{0}") @JvmStatic - fun getTestSpecs() = DeviceEmulationSpec.PhoneAndTabletFull + fun getTestSpecs() = DeviceEmulationSpec.PhoneAndTabletMinimal } @get:Rule @@ -45,7 +45,7 @@ class TwoTargetSwitchPreferenceScreenshotTest(emulationSpec: DeviceEmulationSpec @Test fun test() { screenshotRule.screenshotTest("twoTargetSwitchPreference") { - RegularScaffold(title = "TwoTargetSwitchPreference") { + Column { TwoTargetSwitchPreference(object : SwitchPreferenceModel { override val title = "TwoTargetSwitchPreference" override val checked = stateOf(false) diff --git a/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/ui/FooterScreenshotTest.kt b/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/ui/FooterScreenshotTest.kt index 9e7964594e8f4..0a0faf6dd2c78 100644 --- a/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/ui/FooterScreenshotTest.kt +++ b/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/ui/FooterScreenshotTest.kt @@ -29,7 +29,7 @@ class FooterScreenshotTest(emulationSpec: DeviceEmulationSpec) { companion object { @Parameterized.Parameters(name = "{0}") @JvmStatic - fun getTestSpecs() = DeviceEmulationSpec.PhoneAndTabletFull + fun getTestSpecs() = DeviceEmulationSpec.PhoneAndTabletMinimal } @get:Rule diff --git a/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/ui/SpinnerScreenshotTest.kt b/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/ui/SpinnerScreenshotTest.kt index 318e4436ae23a..e9b5b306fc0a4 100644 --- a/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/ui/SpinnerScreenshotTest.kt +++ b/packages/SettingsLib/Spa/screenshot/src/com/android/settingslib/spa/screenshot/widget/ui/SpinnerScreenshotTest.kt @@ -29,7 +29,7 @@ class SpinnerScreenshotTest(emulationSpec: DeviceEmulationSpec) { companion object { @Parameterized.Parameters(name = "{0}") @JvmStatic - fun getTestSpecs() = DeviceEmulationSpec.PhoneAndTabletFull + fun getTestSpecs() = DeviceEmulationSpec.PhoneAndTabletMinimal } @get:Rule