diff --git a/app/src/main/res/layout-land/drag_drop_interaction_item.xml b/app/src/main/res/layout-land/drag_drop_interaction_item.xml
deleted file mode 100644
index 09ad65110df..00000000000
--- a/app/src/main/res/layout-land/drag_drop_interaction_item.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/layout-sw600dp-land/drag_drop_interaction_item.xml b/app/src/main/res/layout-sw600dp-land/drag_drop_interaction_item.xml
deleted file mode 100644
index 131d15bd685..00000000000
--- a/app/src/main/res/layout-sw600dp-land/drag_drop_interaction_item.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/layout-sw600dp-port/drag_drop_interaction_item.xml b/app/src/main/res/layout-sw600dp-port/drag_drop_interaction_item.xml
deleted file mode 100644
index 54be4ef1a02..00000000000
--- a/app/src/main/res/layout-sw600dp-port/drag_drop_interaction_item.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/layout/drag_drop_interaction_item.xml b/app/src/main/res/layout/drag_drop_interaction_item.xml
index 7556d27d3ca..64170080db3 100644
--- a/app/src/main/res/layout/drag_drop_interaction_item.xml
+++ b/app/src/main/res/layout/drag_drop_interaction_item.xml
@@ -10,11 +10,7 @@
name="viewModel"
type="org.oppia.android.app.player.state.itemviewmodel.DragAndDropSortInteractionViewModel" />
-
-
-
-
-
+
+ app:questionViewMarginEnd="@{@dimen/interaction_item_question_view_margin_end}"
+ app:questionViewMarginStart="@{@dimen/interaction_item_question_view_margin_start}"
+ app:questionViewMarginTop="@{@dimen/interaction_item_question_view_margin_top}">
+ android:visibility="@{viewModel.getGroupingStatus()? View.VISIBLE : View.GONE}" />
+ android:layout_height="wrap_content">
diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml
index 60f28504a7c..b595561ea83 100644
--- a/app/src/main/res/values-land/dimens.xml
+++ b/app/src/main/res/values-land/dimens.xml
@@ -126,6 +126,17 @@
24dp
64dp
+
+ 16dp
+ 16dp
+ 16dp
+ 16dp
+
+ 4dp
+
+ 4dp
+ 4dp
+
16dp
16dp
diff --git a/app/src/main/res/values-sw600dp-land/dimens.xml b/app/src/main/res/values-sw600dp-land/dimens.xml
index dd3aeb29208..5fa2f4d5afe 100644
--- a/app/src/main/res/values-sw600dp-land/dimens.xml
+++ b/app/src/main/res/values-sw600dp-land/dimens.xml
@@ -145,6 +145,17 @@
24dp
192dp
+
+ 32dp
+ 16dp
+ 32dp
+ 16dp
+
+ 0dp
+
+ 8dp
+ 8dp
+
24dp
24dp
diff --git a/app/src/main/res/values-sw600dp-port/dimens.xml b/app/src/main/res/values-sw600dp-port/dimens.xml
index c0d809755d7..00c65c69fa2 100644
--- a/app/src/main/res/values-sw600dp-port/dimens.xml
+++ b/app/src/main/res/values-sw600dp-port/dimens.xml
@@ -148,6 +148,17 @@
24dp
128dp
+
+ 24dp
+ 16dp
+ 24dp
+ 16dp
+
+ 0dp
+
+ 8dp
+ 8dp
+
24dp
24dp
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 8cfcff03e35..3563597753b 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -280,6 +280,22 @@
24dp
32dp
+
+ 32dp
+ 24dp
+ 32dp
+
+
+ 16dp
+ 16dp
+ 16dp
+ 16dp
+
+ 4dp
+
+ 4dp
+ 4dp
+
16dp
16dp
diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/state/StateFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/state/StateFragmentTest.kt
index f79bed9e031..fbe7fe91d65 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/player/state/StateFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/player/state/StateFragmentTest.kt
@@ -119,7 +119,6 @@ import org.oppia.android.domain.topic.TEST_EXPLORATION_ID_5
import org.oppia.android.domain.topic.TEST_STORY_ID_0
import org.oppia.android.domain.topic.TEST_TOPIC_ID_0
import org.oppia.android.testing.AccessibilityTestRule
-import org.oppia.android.testing.DisableAccessibilityChecks
import org.oppia.android.testing.OppiaTestRule
import org.oppia.android.testing.RunOn
import org.oppia.android.testing.TestLogReportingModule
@@ -529,7 +528,6 @@ class StateFragmentTest {
}
@Test
- @DisableAccessibilityChecks // TODO(#3251): Enable AccessibilityChecks
fun testStateFragment_loadDragDropExp_mergeFirstTwoItems_worksCorrectly() {
launchForExploration(TEST_EXPLORATION_ID_4).use {
startPlayingExploration()
@@ -548,7 +546,6 @@ class StateFragmentTest {
}
@Test
- @DisableAccessibilityChecks // TODO(#3251): Enable AccessibilityChecks
fun testStateFragment_loadDragDropExp_mergeFirstTwoItems_invalidAnswer_correctItemCount() {
launchForExploration(TEST_EXPLORATION_ID_4).use {
startPlayingExploration()
@@ -569,7 +566,6 @@ class StateFragmentTest {
}
@Test
- @DisableAccessibilityChecks // TODO(#3251): Enable AccessibilityChecks
fun testStateFragment_loadDragDropExp_wrongAnswer_contentDescriptionIsCorrect() {
launchForExploration(TEST_EXPLORATION_ID_4).use {
startPlayingExploration()
@@ -589,7 +585,6 @@ class StateFragmentTest {
}
@Test
- @DisableAccessibilityChecks // TODO(#3251): Enable AccessibilityChecks
fun testStateFragment_loadDragDropExp_correctAnswer_contentDescriptionIsCorrect() {
launchForExploration(TEST_EXPLORATION_ID_2).use {
startPlayingExploration()
@@ -619,7 +614,6 @@ class StateFragmentTest {
@Test
@RunOn(TestPlatform.ESPRESSO) // TODO(#1612): Enable for Robolectric.
- @DisableAccessibilityChecks // TODO(#3251): Enable AccessibilityChecks
fun testStateFragment_loadDragDropExp_mergeFirstTwoItems_dragItem_worksCorrectly() {
// Note to self: current setup allows the user to drag the view without issues (now that
// event interception isn't a problem), however the view is going partly offscreen which
@@ -642,7 +636,6 @@ class StateFragmentTest {
}
@Test
- @DisableAccessibilityChecks // TODO(#3251): Enable AccessibilityChecks
fun testStateFragment_loadDragDropExp_mergeFirstTwoItems_unlinkFirstItem_worksCorrectly() {
launchForExploration(TEST_EXPLORATION_ID_4).use {
startPlayingExploration()
@@ -922,7 +915,6 @@ class StateFragmentTest {
@Test
@RunOn(TestPlatform.ESPRESSO) // TODO(#1612): Enable for Robolectric.
- @DisableAccessibilityChecks // TODO(#3251): Enable AccessibilityChecks
fun testStateFragment_loadExp_continueToEndExploration_hasReturnToTopicButton() {
launchForExploration(TEST_EXPLORATION_ID_2).use {
startPlayingExploration()
@@ -939,7 +931,6 @@ class StateFragmentTest {
@Test
@RunOn(TestPlatform.ESPRESSO) // TODO(#1612): Enable for Robolectric.
- @DisableAccessibilityChecks // TODO(#3251): Enable AccessibilityChecks
fun testStateFragment_loadExp_changeConfiguration_continueToEnd_hasReturnToTopicButton() {
launchForExploration(TEST_EXPLORATION_ID_2).use {
startPlayingExploration()
@@ -957,7 +948,6 @@ class StateFragmentTest {
@Test
@RunOn(TestPlatform.ESPRESSO) // TODO(#1612): Enable for Robolectric.
- @DisableAccessibilityChecks // TODO(#3251): Enable AccessibilityChecks
fun testStateFragment_loadExp_continueToEndExploration_clickReturnToTopic_destroysActivity() {
launchForExploration(TEST_EXPLORATION_ID_2).use {
startPlayingExploration()
@@ -972,7 +962,6 @@ class StateFragmentTest {
@Test
@RunOn(TestPlatform.ESPRESSO) // TODO(#1612): Enable for Robolectric.
- @DisableAccessibilityChecks // TODO(#3251): Enable AccessibilityChecks
fun testStateFragment_loadExp_changeConfig_continueToEnd_clickReturnToTopic_destroysActivity() {
launchForExploration(TEST_EXPLORATION_ID_2).use {
startPlayingExploration()
@@ -1320,7 +1309,6 @@ class StateFragmentTest {
@Test
@RunOn(TestPlatform.ESPRESSO) // TODO(#1612): Enable for Robolectric.
- @DisableAccessibilityChecks // TODO(#3251): Enable AccessibilityChecks
fun testStateFragment_interactions_dragAndDropNoGrouping_canSuccessfullySubmitAnswer() {
launchForExploration(TEST_EXPLORATION_ID_2).use {
startPlayingExploration()
@@ -1344,7 +1332,6 @@ class StateFragmentTest {
@Test
@RunOn(TestPlatform.ESPRESSO) // TODO(#1612): Enable for Robolectric.
- @DisableAccessibilityChecks // TODO(#3251): Enable AccessibilityChecks
fun testStateFragment_interactions_dragAndDropWithGrouping_canSuccessfullySubmitAnswer() {
launchForExploration(TEST_EXPLORATION_ID_2).use {
startPlayingExploration()