Merge "Don't add SettingsLib to static_libs in Settings unit test." into sc-dev

This commit is contained in:
Hai Zhang
2021-05-11 22:44:09 +00:00
committed by Android (Google) Code Review
2 changed files with 4 additions and 5 deletions

View File

@@ -100,7 +100,8 @@ public class StorageSelectionPreferenceController extends BasePreferenceControll
if (mOnItemSelectedListener == null) { if (mOnItemSelectedListener == null) {
return; return;
} }
mOnItemSelectedListener.onItemSelected(mStorageAdapter.getItem(position)); mOnItemSelectedListener.onItemSelected(
(StorageEntry) mSpinnerPreference.getSelectedItem());
} }
@Override @Override

View File

@@ -32,10 +32,8 @@ android_test {
"platform-test-annotations", "platform-test-annotations",
"truth-prebuilt", "truth-prebuilt",
"ub-uiautomator", "ub-uiautomator",
"SettingsLibSettingsSpinner", // Don't add SettingsLib libraries here - you can use them directly as they are in the
"SettingsLibUsageProgressBarPreference", // instrumented Settings app.
"SettingsLibTwoTargetPreference",
"SettingsLibMainSwitchPreference",
], ],
// Include all test java files. // Include all test java files.