Skip to content

Commit bd8b863

Browse files
Revert to use Pair instead of Manage Conections
1 parent 84938ed commit bd8b863

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

app/src/main/res/layout-land/activity_main.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@
5959
<Button
6060
android:id="@+id/connect_device_btn"
6161
style="@style/main_activity_button_style"
62-
android:contentDescription="@string/desc_manage_connections"
62+
android:contentDescription="@string/desc_connect_btn"
6363
android:drawableTop="@drawable/ic_connect"
6464
android:nextFocusDown="@+id/discover_btn"
65-
android:text="@string/manage_connections" />
65+
android:text="@string/connect_device" />
6666

6767
<!-- Project Ideas -->
6868
<Button

app/src/main/res/layout-port/activity_main.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@
5252
<Button
5353
android:id="@+id/connect_device_btn"
5454
style="@style/main_activity_button_style"
55-
android:contentDescription="@string/desc_manage_connections"
55+
android:contentDescription="@string/desc_connect_btn"
5656
android:drawableEnd="@drawable/device_status_disconnected"
5757
android:nextFocusDown="@+id/discover_btn"
58-
android:text="@string/manage_connections" />
58+
android:text="@string/connect_device" />
5959

6060
<!-- Project Ideas -->
6161
<Button

app/src/main/res/layout-sw600dp-port/activity_main.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@
7676
<Button
7777
android:id="@+id/connect_device_btn"
7878
style="@style/button_style"
79-
android:contentDescription="@string/desc_manage_connections"
79+
android:contentDescription="@string/desc_connect_btn"
8080
android:drawableTop="@drawable/ic_connect"
8181
android:nextFocusDown="@+id/discover_btn"
82-
android:text="@string/manage_connections" />
82+
android:text="@string/connect_device" />
8383

8484
<!-- Project Ideas -->
8585
<Button

app/src/main/res/layout/pairing_toolbar.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@
3131
android:layout_height="wrap_content"
3232
android:layout_gravity="center_vertical"
3333
android:layout_marginStart="16dp"
34-
android:contentDescription="@string/desc_manage_connections"
34+
android:contentDescription="@string/desc_connect_btn"
3535
android:nextFocusDown="@id/backBtn"
3636
android:nextFocusRight="@id/backBtn"
37-
android:text="@string/manage_connections"
37+
android:text="@string/connect_device"
3838
android:textSize="@dimen/app_bar_title_text_size"
3939
android:textColor="@color/white_color" />
4040

app/src/main/res/values/strings.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@
276276
<string name="navigation_drawer_close">Close Menu</string>
277277
<string name="create_code">Create Code</string>
278278
<string name="my_programs">My Programs</string>
279-
<string name="manage_connections">Manage Connections</string>
279+
<string name="connect_device">Pair</string>
280280
<string name="project_ideas">Project Ideas</string>
281281

282282
<string name="email_body" formatted="false">
@@ -306,7 +306,7 @@
306306
<string name="desc_subtitle_manage_and_remove_microbits_label">Follow the on-screen instructions to</string>
307307
<string name="manage_and_remove_microbit">How do I remove a paired micro:bit?</string>
308308
<string name="desc_homescreen_logo_img">Hello</string>
309-
<string name="desc_manage_connections">Manage Connections</string>
309+
<string name="desc_connect_btn">Pair</string>
310310
<string name="desc_my_programs">My Programs</string>
311311
<string name="desc_create_code">Create Code</string>
312312
<string name="desc_project_ideas">Project Ideas</string>

0 commit comments

Comments
 (0)