Merge pull request #146 from cpeterso/cpeterso/stop-scanning-button

Rename "Stop Scanning & Upload" button to "Stop Scanning"
mozilla · Oct 29, 2013 · 0a43e1d · 0a43e1d
2 parents 22047c9 + b5490a1
commit 0a43e1d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -6,7 +6,6 @@
     <string name="mozilla_title">Mozilla</string>
     <string name="start_scanning">Start Scanning</string>
     <string name="stop_scanning">Stop Scanning</string>
-    <string name="stop_scanning_upload">Stop Scanning &amp; Upload</string>
     <string name="view_leaderboard">View Leaderboard</string>
     <string name="view_map">Test Mozilla Location Service</string>
     <string name="service_name">Mozilla Stumbler</string>

diff --git a/src/org/mozilla/mozstumbler/MainActivity.java b/src/org/mozilla/mozstumbler/MainActivity.java
@@ -191,7 +191,7 @@ protected void updateUI() {
 
         Button scanningBtn = (Button) findViewById(R.id.toggle_scanning);
         if (scanning) {
-            scanningBtn.setText(R.string.stop_scanning_upload);
+            scanningBtn.setText(R.string.stop_scanning);
         } else {
             scanningBtn.setText(R.string.start_scanning);
         }
@@ -231,7 +231,7 @@ public void onClick_ToggleScanning(View v) throws RemoteException {
             b.setText(R.string.start_scanning);
         } else {
             mConnectionRemote.startScanning();
-            b.setText(R.string.stop_scanning_upload);
+            b.setText(R.string.stop_scanning);
         }
     }