diff --git a/app/src/main/res/layout-land/onboarding_slide_final.xml b/app/src/main/res/layout-land/onboarding_slide_final.xml
index 6881cdcbcce..a62021edc69 100644
--- a/app/src/main/res/layout-land/onboarding_slide_final.xml
+++ b/app/src/main/res/layout-land/onboarding_slide_final.xml
@@ -79,6 +79,7 @@
android:text="@string/get_started"
android:textColor="@color/component_color_shared_secondary_4_text_color"
android:textSize="14sp"
+ android:textAllCaps="false"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/slide_image_view"
app:layout_constraintTop_toBottomOf="@id/slide_description_text_view" />
diff --git a/app/src/main/res/layout-land/resume_lesson_fragment.xml b/app/src/main/res/layout-land/resume_lesson_fragment.xml
index 41675fc3d42..e317a2eff27 100644
--- a/app/src/main/res/layout-land/resume_lesson_fragment.xml
+++ b/app/src/main/res/layout-land/resume_lesson_fragment.xml
@@ -81,7 +81,7 @@
android:minWidth="144dp"
android:minHeight="@dimen/clickable_item_min_height"
android:text="@string/start_over_lesson_button"
- android:textAllCaps="true"
+ android:textAllCaps="false"
android:textColor="@color/component_color_shared_secondary_button_background_trim_color"
android:textSize="14sp"
app:backgroundTint="@null"
@@ -100,7 +100,7 @@
android:minWidth="144dp"
android:minHeight="@dimen/clickable_item_min_height"
android:text="@string/resume_lesson_button"
- android:textAllCaps="true"
+ android:textAllCaps="false"
android:textColor="@color/component_color_shared_secondary_4_text_color"
android:textSize="14sp"
app:backgroundTint="@null"
diff --git a/app/src/main/res/layout-sw600dp-land/onboarding_slide_final.xml b/app/src/main/res/layout-sw600dp-land/onboarding_slide_final.xml
index 2877085c736..b33f3480486 100644
--- a/app/src/main/res/layout-sw600dp-land/onboarding_slide_final.xml
+++ b/app/src/main/res/layout-sw600dp-land/onboarding_slide_final.xml
@@ -73,6 +73,7 @@
android:text="@string/get_started"
android:textColor="@color/component_color_shared_secondary_4_text_color"
android:textSize="14sp"
+ android:textAllCaps="false"
app:layout_constraintEnd_toEndOf="@+id/slide_title_text_view"
app:layout_constraintStart_toStartOf="@+id/slide_title_text_view"
app:layout_constraintTop_toBottomOf="@id/slide_description_text_view" />
diff --git a/app/src/main/res/layout-sw600dp-land/resume_lesson_fragment.xml b/app/src/main/res/layout-sw600dp-land/resume_lesson_fragment.xml
index bd3bad52c20..5997f1069a4 100644
--- a/app/src/main/res/layout-sw600dp-land/resume_lesson_fragment.xml
+++ b/app/src/main/res/layout-sw600dp-land/resume_lesson_fragment.xml
@@ -111,7 +111,7 @@
android:minWidth="144dp"
android:minHeight="@dimen/clickable_item_min_height"
android:text="@string/start_over_lesson_button"
- android:textAllCaps="true"
+ android:textAllCaps="false"
android:textColor="@color/component_color_shared_secondary_button_background_trim_color"
android:textSize="14sp"
app:backgroundTint="@null"
@@ -130,7 +130,7 @@
android:minWidth="144dp"
android:minHeight="@dimen/clickable_item_min_height"
android:text="@string/resume_lesson_button"
- android:textAllCaps="true"
+ android:textAllCaps="false"
android:textColor="@color/component_color_shared_secondary_4_text_color"
android:textSize="14sp"
app:backgroundTint="@null"
diff --git a/app/src/main/res/layout-sw600dp-port/onboarding_slide_final.xml b/app/src/main/res/layout-sw600dp-port/onboarding_slide_final.xml
index ce4f739f08d..7d56635942f 100644
--- a/app/src/main/res/layout-sw600dp-port/onboarding_slide_final.xml
+++ b/app/src/main/res/layout-sw600dp-port/onboarding_slide_final.xml
@@ -80,6 +80,7 @@
android:text="@string/get_started"
android:textColor="@color/component_color_shared_secondary_4_text_color"
android:textSize="20sp"
+ android:textAllCaps="false"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/slide_description_text_view" />
diff --git a/app/src/main/res/layout/add_profile_activity.xml b/app/src/main/res/layout/add_profile_activity.xml
index 6a0c53c3282..417092d77a1 100644
--- a/app/src/main/res/layout/add_profile_activity.xml
+++ b/app/src/main/res/layout/add_profile_activity.xml
@@ -237,7 +237,6 @@
android:enabled="@{viewModel.isButtonActive()}"
android:gravity="center"
android:text="@string/add_profile_create_btn"
- android:textAllCaps="true"
android:textColor="@{viewModel.isButtonActive() ? @color/component_color_shared_secondary_4_text_color : @color/component_color_shared_button_inactive_text_color }"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/add_profile_activity_pin_constraint_layout" />
diff --git a/app/src/main/res/layout/concept_card_fragment_test_activity.xml b/app/src/main/res/layout/concept_card_fragment_test_activity.xml
index 9fbbdcb7b6f..4894aac319d 100644
--- a/app/src/main/res/layout/concept_card_fragment_test_activity.xml
+++ b/app/src/main/res/layout/concept_card_fragment_test_activity.xml
@@ -7,11 +7,13 @@
android:id="@+id/open_dialog_0"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="Concept Card 1" />
+ android:text="Concept Card 1"
+ android:textAllCaps="false"/>
+ android:text="Concept Card 2"
+ android:textAllCaps="false" />
diff --git a/app/src/main/res/layout/exploration_test_activity.xml b/app/src/main/res/layout/exploration_test_activity.xml
index 3ecfb09afe5..d693b80a73c 100644
--- a/app/src/main/res/layout/exploration_test_activity.xml
+++ b/app/src/main/res/layout/exploration_test_activity.xml
@@ -10,7 +10,8 @@
android:id="@+id/play_exploration_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="Play exploration" />
+ android:text="Play exploration"
+ android:textAllCaps="false"/>
diff --git a/app/src/main/res/layout/onboarding_slide_final.xml b/app/src/main/res/layout/onboarding_slide_final.xml
index ea11c502df8..ee4bc712c2b 100644
--- a/app/src/main/res/layout/onboarding_slide_final.xml
+++ b/app/src/main/res/layout/onboarding_slide_final.xml
@@ -81,6 +81,7 @@
android:text="@string/get_started"
android:textColor="@color/component_color_shared_secondary_4_text_color"
android:textSize="14sp"
+ android:textAllCaps="false"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/slide_description_text_view" />
diff --git a/app/src/main/res/layout/profile_rename_fragment.xml b/app/src/main/res/layout/profile_rename_fragment.xml
index a295c823615..2c78c153a4b 100644
--- a/app/src/main/res/layout/profile_rename_fragment.xml
+++ b/app/src/main/res/layout/profile_rename_fragment.xml
@@ -61,7 +61,6 @@
android:clickable="@{viewModel.inputName.length > 0}"
android:enabled="@{viewModel.inputName.length > 0}"
android:text="@string/profile_rename_save"
- android:textAllCaps="true"
android:textColor="@{viewModel.inputName.length > 0 ? @color/component_color_shared_secondary_4_text_color : @color/component_color_shared_button_inactive_text_color }"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/profile_reset_pin_fragment.xml b/app/src/main/res/layout/profile_reset_pin_fragment.xml
index 98a19bb8e75..009f5ca5388 100644
--- a/app/src/main/res/layout/profile_reset_pin_fragment.xml
+++ b/app/src/main/res/layout/profile_reset_pin_fragment.xml
@@ -105,7 +105,6 @@
android:clickable="@{viewModel.isButtonActive()}"
android:enabled="@{viewModel.isButtonActive()}"
android:text="@string/profile_rename_save"
- android:textAllCaps="true"
android:textColor="@{viewModel.isButtonActive() ? @color/component_color_shared_secondary_4_text_color : @color/component_color_shared_button_inactive_text_color }"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/profile_reset_input_confirm_pin" />
diff --git a/app/src/main/res/layout/resume_lesson_fragment.xml b/app/src/main/res/layout/resume_lesson_fragment.xml
index 4a2ee1e4fd6..9b07c7743ba 100644
--- a/app/src/main/res/layout/resume_lesson_fragment.xml
+++ b/app/src/main/res/layout/resume_lesson_fragment.xml
@@ -96,7 +96,7 @@
android:minWidth="144dp"
android:minHeight="@dimen/clickable_item_min_height"
android:text="@string/start_over_lesson_button"
- android:textAllCaps="true"
+ android:textAllCaps="false"
android:textColor="@color/component_color_shared_secondary_button_background_trim_color"
android:textSize="14sp"
app:backgroundTint="@null"
@@ -114,7 +114,7 @@
android:minWidth="144dp"
android:minHeight="@dimen/clickable_item_min_height"
android:text="@string/resume_lesson_button"
- android:textAllCaps="true"
+ android:textAllCaps="false"
android:textColor="@color/component_color_shared_secondary_4_text_color"
android:textSize="14sp"
app:backgroundTint="@null"
diff --git a/app/src/main/res/layout/solution_summary.xml b/app/src/main/res/layout/solution_summary.xml
index 4c71087fc2f..9a6e50ed026 100644
--- a/app/src/main/res/layout/solution_summary.xml
+++ b/app/src/main/res/layout/solution_summary.xml
@@ -80,6 +80,7 @@
android:text="@string/show_solution"
android:textColor="@color/component_color_hints_and_solution_summary_button_text_color"
android:textSize="14sp"
+ android:textAllCaps="false"
android:visibility="@{viewModel.isSolutionRevealed()? View.GONE : View.VISIBLE}"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/state_fragment_test_activity.xml b/app/src/main/res/layout/state_fragment_test_activity.xml
index ed973f239e2..168334e4845 100644
--- a/app/src/main/res/layout/state_fragment_test_activity.xml
+++ b/app/src/main/res/layout/state_fragment_test_activity.xml
@@ -32,6 +32,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="Play exploration"
+ android:textAllCaps="false"
android:visibility="@{viewModel.hasExplorationStarted ? View.GONE : View.VISIBLE}" />
diff --git a/app/src/main/res/values-v21/themes.xml b/app/src/main/res/values-v21/themes.xml
index dea4baa8df3..4b80e568427 100644
--- a/app/src/main/res/values-v21/themes.xml
+++ b/app/src/main/res/values-v21/themes.xml
@@ -42,5 +42,6 @@
- @color/component_color_shared_primary_dark_text_color
- @style/textAllCaps
- @style/textAllCaps
+ - false
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3f48fef86cc..91bddd9bb59 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -15,13 +15,13 @@
Play audio
Pause audio
%s audio is unavailable.
- OK
+ Ok
Cancel
Audio Language
Currently Offline
Make sure Wi-Fi or cellular data is turned on, then try again.
- OK
- OK
+ Ok
+ Ok
Cancel
Currently on Cellular Data
Streaming audio may use a lot of cellular data.
@@ -376,7 +376,7 @@
Rename Profile
New Name
- save
+ Save
Reset PIN
Enter a new PIN for the user to enter when accessing their profile.
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 149d87fd1d1..815ceccc4b7 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -68,7 +68,7 @@
- @drawable/state_button_primary_background
- sans-serif-medium
- @dimen/clickable_item_min_height
- - true
+ - false
- @color/component_color_shared_secondary_4_text_color
- 14sp
@@ -125,7 +125,7 @@
- wrap_content
- wrap_content
- 8dp
- - true
+ - false
- @android:color/transparent
- #56000000
- 14sp
@@ -418,7 +418,7 @@
- 144dp
- 4dp
- @color/component_color_shared_secondary_button_background_trim_color
- - true
+ - false
- @color/component_color_shared_secondary_button_background_trim_color
- 14sp
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 133c3165692..53afcd7a7db 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -38,6 +38,7 @@
- @color/component_color_shared_primary_dark_text_color
- @color/component_color_shared_dialogs_radio_button_unchecked_color
- @color/component_color_shared_dialogs_radio_button_checked_color
+ - false