From 1c897a380ba6df56285f7a135cde66afee3d6ed7 Mon Sep 17 00:00:00 2001
From: Phillip Hsu <philliphsu@outlook.com>
Date: Tue, 13 Jun 2017 15:31:42 -0700
Subject: [PATCH] Fixes when building for release: add "translatable=false" to
 string resources not meant to be translated; remove content description
 string resources that are not translated for all supported languages.

---
 .../bsp_dialog_time_picker_grid.xml           |  1 -
 .../layout/bsp_date_picker_navigation_bar.xml |  3 --
 .../layout/bsp_dialog_time_picker_grid.xml    |  1 -
 .../src/main/res/values/strings.xml           | 29 ++++---------------
 sample/src/main/res/values/strings.xml        |  2 +-
 5 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/bottomsheetpickers/src/main/res/layout-land/bsp_dialog_time_picker_grid.xml b/bottomsheetpickers/src/main/res/layout-land/bsp_dialog_time_picker_grid.xml
index 22ce2bc..0515117 100644
--- a/bottomsheetpickers/src/main/res/layout-land/bsp_dialog_time_picker_grid.xml
+++ b/bottomsheetpickers/src/main/res/layout-land/bsp_dialog_time_picker_grid.xml
@@ -54,7 +54,6 @@
         <android.support.design.widget.FloatingActionButton
             android:id="@+id/bsp_fab"
             android:layout_gravity="center"
-            android:contentDescription="@string/bsp_desc_done"
             style="@style/BSP_GridTimePicker_FabStyle" />
 
     </LinearLayout>
diff --git a/bottomsheetpickers/src/main/res/layout/bsp_date_picker_navigation_bar.xml b/bottomsheetpickers/src/main/res/layout/bsp_date_picker_navigation_bar.xml
index 7e68624..00157cc 100644
--- a/bottomsheetpickers/src/main/res/layout/bsp_date_picker_navigation_bar.xml
+++ b/bottomsheetpickers/src/main/res/layout/bsp_date_picker_navigation_bar.xml
@@ -17,7 +17,6 @@
         android:minWidth="@dimen/bsp_month_navigation_bar_height"
         android:minHeight="@dimen/bsp_month_navigation_bar_height"
         android:visibility="invisible"
-        android:contentDescription="@string/bsp_date_picker_prev_month_button"
         android:nextFocusForward="@+id/bsp_month_year_title"
         android:nextFocusDown="@+id/bsp_month_view"
         app:srcCompat="@drawable/bsp_ic_chevron_start"
@@ -36,7 +35,6 @@
             android:layout_height="match_parent"
             android:layout_gravity="center"
             android:gravity="center"
-            android:contentDescription="@string/bsp_date_picker_month_year_title"
             android:nextFocusForward="@+id/bsp_next"
             android:nextFocusDown="@+id/bsp_month_view"
             android:textSize="@dimen/bsp_month_label_size"
@@ -52,7 +50,6 @@
         android:minWidth="@dimen/bsp_month_navigation_bar_height"
         android:minHeight="@dimen/bsp_month_navigation_bar_height"
         android:visibility="invisible"
-        android:contentDescription="@string/bsp_date_picker_next_month_button"
         android:nextFocusForward="@+id/bsp_month_view"
         android:nextFocusDown="@+id/bsp_month_view"
         app:srcCompat="@drawable/bsp_ic_chevron_end"
diff --git a/bottomsheetpickers/src/main/res/layout/bsp_dialog_time_picker_grid.xml b/bottomsheetpickers/src/main/res/layout/bsp_dialog_time_picker_grid.xml
index afa617d..fd89cf2 100644
--- a/bottomsheetpickers/src/main/res/layout/bsp_dialog_time_picker_grid.xml
+++ b/bottomsheetpickers/src/main/res/layout/bsp_dialog_time_picker_grid.xml
@@ -49,7 +49,6 @@
     <android.support.design.widget.FloatingActionButton
         android:id="@+id/bsp_fab"
         android:layout_gravity="center"
-        android:contentDescription="@string/bsp_desc_done"
         style="@style/BSP_GridTimePicker_FabStyle" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/bottomsheetpickers/src/main/res/values/strings.xml b/bottomsheetpickers/src/main/res/values/strings.xml
index ce73b96..ef19ada 100644
--- a/bottomsheetpickers/src/main/res/values/strings.xml
+++ b/bottomsheetpickers/src/main/res/values/strings.xml
@@ -58,34 +58,15 @@
     <string name="bsp_deleted_key"><xliff:g id="key" example="4">%1$s</xliff:g> deleted</string>
 
     <!-- DO NOT TRANSLATE -->
-    <string name="bsp_time_placeholder">--</string>
+    <string name="bsp_time_placeholder" translatable="false">--</string>
     <!-- DO NOT TRANSLATE -->
-    <string name="bsp_time_separator">:</string>
+    <string name="bsp_time_separator" translatable="false">:</string>
 
     <!-- DO NOT TRANSLATE -->
-    <string name="bsp_radial_numbers_typeface">sans-serif</string>
+    <string name="bsp_radial_numbers_typeface" translatable="false">sans-serif</string>
     <!-- DO NOT TRANSLATE -->
-    <string name="bsp_sans_serif">sans-serif</string>
+    <string name="bsp_sans_serif" translatable="false">sans-serif</string>
 
     <!-- DO NOT TRANSLATE -->
-    <string name="bsp_day_of_week_label_typeface">sans-serif</string>
-
-    <!--My stuff-->
-    <string name="bsp_left_alt_24hr">:00</string>
-    <string name="bsp_right_alt_24hr">:30</string>
-    <string name="bsp_hours_00_11">00 &#8211; 11</string>
-    <string name="bsp_hours_12_23">12 &#8211; 23</string>
-
-    <!-- Content description for '00-11' button. [CHAR_LIMIT=NONE] -->
-    <string name="bsp_desc_half_day_1">morning hours</string>
-    <!-- Content description for '12-23' button. [CHAR_LIMIT=NONE] -->
-    <string name="bsp_desc_half_day_2">noon to evening hours</string>
-    <!-- Content description for 'Done' floating action button. [CHAR_LIMIT=NONE] -->
-    <string name="bsp_desc_done">done</string>
-    <!-- Description of the button to move to the previous month. [CHAR LIMIT=NONE] -->
-    <string name="bsp_date_picker_prev_month_button">Previous month</string>
-    <!-- Description of the button to move to the next month. [CHAR LIMIT=NONE] -->
-    <string name="bsp_date_picker_next_month_button">Next month</string>
-    <!-- Description of the button that displays the month and year title and also accesses the month picker. [CHAR LIMIT=NONE] -->
-    <string name="bsp_date_picker_month_year_title">Switch to month picker</string>
+    <string name="bsp_day_of_week_label_typeface" translatable="false">sans-serif</string>
 </resources>
diff --git a/sample/src/main/res/values/strings.xml b/sample/src/main/res/values/strings.xml
index 3b54269..53975ba 100644
--- a/sample/src/main/res/values/strings.xml
+++ b/sample/src/main/res/values/strings.xml
@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">BottomSheetPickers</string>
+    <string name="app_name" translatable="false">BottomSheetPickers</string>
 </resources>