Merge "Add CTS for ProgressBar#getCurrentDrawable"
diff --git a/tests/tests/widget/src/android/widget/cts/ProgressBarTest.java b/tests/tests/widget/src/android/widget/cts/ProgressBarTest.java
index 1904710..d84a229 100644
--- a/tests/tests/widget/src/android/widget/cts/ProgressBarTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ProgressBarTest.java
@@ -220,6 +220,20 @@
@UiThreadTest
@Test
+ public void testAccessCurrentDrawable() {
+ final Drawable progressDrawable = new ColorDrawable(Color.BLUE);
+ final Drawable indeterminateDrawable = new ColorDrawable(Color.RED);
+ mProgressBarHorizontal.setProgressDrawable(progressDrawable);
+ mProgressBarHorizontal.setIndeterminateDrawable(indeterminateDrawable);
+
+ mProgressBarHorizontal.setIndeterminate(false);
+ assertSame(progressDrawable, mProgressBarHorizontal.getCurrentDrawable());
+ mProgressBarHorizontal.setIndeterminate(true);
+ assertSame(indeterminateDrawable, mProgressBarHorizontal.getCurrentDrawable());
+ }
+
+ @UiThreadTest
+ @Test
public void testAccessProgress() {
assertEquals(0, mProgressBarHorizontal.getProgress());