Remove 30 secs warning

microbit-foundation · Apr 11, 2024 · 1805517 · 1805517
1 parent 2f2255e
commit 1805517
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 30 deletions.
diff --git a/app/src/main/java/com/samsung/microbit/ui/activity/PairingActivity.java b/app/src/main/java/com/samsung/microbit/ui/activity/PairingActivity.java
@@ -731,9 +731,6 @@ private void setupFontStyle() {
         TextView stepThreeTitle = (TextView) findViewById(R.id.searching_microbit_step);
         stepThreeTitle.setTypeface(boldTypeface);
 
-        TextView stepThreeInstructions = (TextView) findViewById(R.id.searching_microbit_step_instructions);
-        stepThreeInstructions.setTypeface(robotoTypeface);
-
         Button cancelSearchMicroBit = (Button) findViewById(R.id.cancel_search_microbit_step_3_btn);
         cancelSearchMicroBit.setTypeface(robotoTypeface);
 
@@ -1107,7 +1104,6 @@ private void updateOnScanFound() {
         logi("updateOnScanFound");
         TextView textView = (TextView) findViewById(R.id.search_microbit_step_3_title);
         TextView tvSearchingStep = (TextView) findViewById(R.id.searching_microbit_step);
-        TextView tvSearchingInstructions = (TextView) findViewById(R.id.searching_microbit_step_instructions);
         if (textView != null) {
             textView.setText(getString(R.string.searchingTitle));
             //findViewById(R.id.searching_progress_spinner).setVisibility(View.GONE);
@@ -1118,15 +1114,13 @@ private void updateOnScanFound() {
 //            } else {
 //                tvSearchingStep.setText(R.string.searching_microbit_found_message);
 //            }
-//            tvSearchingInstructions.setText(R.string.searching_tip_text_instructions);
         }
     }
 
     private void updateOnConnected() {
         logi("updateOnConnected");
         TextView textView = (TextView) findViewById(R.id.search_microbit_step_3_title);
         TextView tvSearchingStep = (TextView) findViewById(R.id.searching_microbit_step);
-        TextView tvSearchingInstructions = (TextView) findViewById(R.id.searching_microbit_step_instructions);
         if (textView != null) {
             textView.setText(getString(R.string.searchingTitle));
             findViewById(R.id.searching_progress_spinner).setVisibility(View.GONE);
@@ -1137,7 +1131,6 @@ private void updateOnConnected() {
             } else {
                 tvSearchingStep.setText(R.string.searching_microbit_found_message);
             }
-            tvSearchingInstructions.setText(R.string.searching_tip_text_instructions);
         }
     }
 
@@ -1204,7 +1197,6 @@ private void displayScreen(PAIRING_STATE gotoState) {
                     TextView tvTitle = (TextView) findViewById(R.id.search_microbit_step_3_title);
                     TextView tvSearchingStep = (TextView) findViewById(R.id.searching_microbit_step);
                     tvSearchingStep.setContentDescription(tvSearchingStep.getText());
-                    TextView tvSearchingInstructions = (TextView) findViewById(R.id.searching_microbit_step_instructions);
                     if(tvTitle != null) {
                         tvTitle.setText(R.string.searchingTitle);
                         findViewById(R.id.searching_progress_spinner).setVisibility(View.VISIBLE);
@@ -1215,7 +1207,6 @@ private void displayScreen(PAIRING_STATE gotoState) {
                         } else {
                             tvSearchingStep.setText(R.string.searching_tip_step_text);
                         }
-                        tvSearchingInstructions.setText(R.string.searching_tip_text_instructions);
                     }
                     justPaired = true;
                 } else {
@@ -1694,7 +1685,6 @@ protected void onDestroy() {
         Utils.unbindDrawables(findViewById(R.id.ok_enter_pattern_step_2_btn));
         Utils.unbindDrawables(findViewById(R.id.search_microbit_step_3_title));
         Utils.unbindDrawables(findViewById(R.id.searching_microbit_step));
-        Utils.unbindDrawables(findViewById(R.id.searching_microbit_step_instructions));
         Utils.unbindDrawables(findViewById(R.id.cancel_search_microbit_step_3_btn));
         Utils.unbindDrawables(findViewById(R.id.searching_progress_spinner));
 

diff --git a/app/src/main/res/layout-land/view_pairing_searching_step.xml b/app/src/main/res/layout-land/view_pairing_searching_step.xml
@@ -15,11 +15,4 @@
         android:textSize="@dimen/pairing_step_title_text_size"
         android:text="@string/searching_tip_step_text_one_line" />
 
-    <TextView
-        android:id="@+id/searching_microbit_step_instructions"
-        android:layout_width="wrap_content"
-        style="@style/pairing_step_tip_text_style"
-        android:textSize="@dimen/pairing_step_tip_instruction_text_size"
-        android:contentDescription="@string/desc_searching_tip_text"
-        android:text="@string/searching_tip_text_instructions" />
 </LinearLayout>
diff --git a/app/src/main/res/layout-sw600dp-port/view_pairing_searching_step.xml b/app/src/main/res/layout-sw600dp-port/view_pairing_searching_step.xml
@@ -17,11 +17,6 @@
             style="@style/pairing_step_tip_text_style"
             android:text="@string/searching_tip_step_text" />
 
-        <TextView
-            android:id="@+id/searching_microbit_step_instructions"
-            style="@style/pairing_step_tip_text_style"
-            android:contentDescription="@string/desc_searching_tip_text"
-            android:text="@string/searching_tip_text_instructions" />
     </LinearLayout>
 
     <ImageView

diff --git a/app/src/main/res/layout/view_pairing_searching_step.xml b/app/src/main/res/layout/view_pairing_searching_step.xml
@@ -17,12 +17,6 @@
             android:paddingEnd="@dimen/pairing_step_searching_tip_text_padding_end"
             android:text="@string/searching_tip_step_text" />
 
-        <TextView
-            android:id="@+id/searching_microbit_step_instructions"
-            style="@style/pairing_step_tip_text_style"
-            android:contentDescription="@string/desc_searching_tip_text"
-            android:text="@string/searching_tip_text_instructions" />
-
     </LinearLayout>
 
     <ImageView

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -178,8 +178,6 @@
     <string name="enter_pattern_tip_text_one_line">Copy the pattern from your micro:bit onto this grid</string>
     <string name="desc_enter_pattern_tip_step_two">Step two</string>
     <string name="desc_enter_pattern_tip_text">Copy the pattern from your micro:bit onto this grid</string>
-    <string name="searching_tip_text_instructions">(you only have 30 seconds)</string>
-    <string name="desc_searching_tip_text">You only have 30 seconds</string>
     <string name="desc_searching_tip_step_three">If asked for a PIN, press button A</string>
     <string name="enter_pin_to_pair_text">Press button A, and\nenter the 6 digit PIN</string>
     <string name="step_enter_pin_to_pair_text">Step 4</string>