Revert to use Pair instead of Manage Conections

microbit-foundation · Apr 11, 2024 · bd8b863 · bd8b863
1 parent 84938ed
commit bd8b863
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml
@@ -59,10 +59,10 @@
         <Button
             android:id="@+id/connect_device_btn"
             style="@style/main_activity_button_style"
-            android:contentDescription="@string/desc_manage_connections"
+            android:contentDescription="@string/desc_connect_btn"
             android:drawableTop="@drawable/ic_connect"
             android:nextFocusDown="@+id/discover_btn"
-            android:text="@string/manage_connections" />
+            android:text="@string/connect_device" />
 
         <!-- Project Ideas -->
         <Button

diff --git a/app/src/main/res/layout-port/activity_main.xml b/app/src/main/res/layout-port/activity_main.xml
@@ -52,10 +52,10 @@
     <Button
         android:id="@+id/connect_device_btn"
         style="@style/main_activity_button_style"
-        android:contentDescription="@string/desc_manage_connections"
+        android:contentDescription="@string/desc_connect_btn"
         android:drawableEnd="@drawable/device_status_disconnected"
         android:nextFocusDown="@+id/discover_btn"
-        android:text="@string/manage_connections" />
+        android:text="@string/connect_device" />
 
     <!-- Project Ideas -->
     <Button

diff --git a/app/src/main/res/layout-sw600dp-port/activity_main.xml b/app/src/main/res/layout-sw600dp-port/activity_main.xml
@@ -76,10 +76,10 @@
             <Button
                 android:id="@+id/connect_device_btn"
                 style="@style/button_style"
-                android:contentDescription="@string/desc_manage_connections"
+                android:contentDescription="@string/desc_connect_btn"
                 android:drawableTop="@drawable/ic_connect"
                 android:nextFocusDown="@+id/discover_btn"
-                android:text="@string/manage_connections" />
+                android:text="@string/connect_device" />
 
             <!-- Project Ideas -->
             <Button

diff --git a/app/src/main/res/layout/pairing_toolbar.xml b/app/src/main/res/layout/pairing_toolbar.xml
@@ -31,10 +31,10 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_marginStart="16dp"
-        android:contentDescription="@string/desc_manage_connections"
+        android:contentDescription="@string/desc_connect_btn"
         android:nextFocusDown="@id/backBtn"
         android:nextFocusRight="@id/backBtn"
-        android:text="@string/manage_connections"
+        android:text="@string/connect_device"
         android:textSize="@dimen/app_bar_title_text_size"
         android:textColor="@color/white_color" />
 

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -276,7 +276,7 @@
     <string name="navigation_drawer_close">Close Menu</string>
     <string name="create_code">Create Code</string>
     <string name="my_programs">My Programs</string>
-    <string name="manage_connections">Manage Connections</string>
+    <string name="connect_device">Pair</string>
     <string name="project_ideas">Project Ideas</string>
 
     <string name="email_body" formatted="false">
@@ -306,7 +306,7 @@
     <string name="desc_subtitle_manage_and_remove_microbits_label">Follow the on-screen instructions to</string>
     <string name="manage_and_remove_microbit">How do I remove a paired micro:bit?</string>
     <string name="desc_homescreen_logo_img">Hello</string>
-    <string name="desc_manage_connections">Manage Connections</string>
+    <string name="desc_connect_btn">Pair</string>
     <string name="desc_my_programs">My Programs</string>
     <string name="desc_create_code">Create Code</string>
     <string name="desc_project_ideas">Project Ideas</string>