Permalink
Browse files

Remove the view map button.

This is now on the action bar.
  • Loading branch information...
1 parent fc8270e commit 55218a9805b41665378a2b04cb48f58a67544848 @jpeddicord committed Jun 1, 2012
@@ -52,11 +52,4 @@
android:layout_height="wrap_content"
android:text="@string/disabled_text" />
- <Button
- android:id="@+id/buttonMap"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="right"
- android:text="@string/map_bttn" />
-
</LinearLayout>
@@ -7,7 +7,7 @@
<string name="volume_header_low">So we have your volume at the minimum:</string>
<string name="volume_header_high">So we have your volume set to the maximum:</string>
<string name="enabled">Enable Speed of Sound</string>
- <string name="disabled_text">Speed of Sound is currently <i>disabled</i>. Tap the box above to start, or go to <b>Settings</b> from the menu to customize your speed and volume settings.</string>
+ <string name="disabled_text">Speed of Sound is currently <i>disabled</i>. Tap the box above to start, or go to <b>Settings</b> from the wrench above to customize your speed and volume. You can also tap the map to look at your last drive and the songs that were played.</string>
<string name="waiting">(Waiting for GPS signal)</string>
<string name="notification_text">Matching your volume to your speed</string>
<string name="ticker_text">Speed of Sound is running</string>
@@ -18,7 +18,6 @@
import android.support.v4.content.LocalBroadcastManager;
import android.util.Log;
import android.view.View;
-import android.view.View.OnClickListener;
import android.widget.CheckBox;
import android.widget.CompoundButton;
import android.widget.CompoundButton.OnCheckedChangeListener;
@@ -33,7 +32,7 @@
* Main status activity. Displays the current speed and set volume. Does not
* actually track the volume itself; that is handled in SoundService.
*/
-public class SpeedActivity extends SherlockActivity implements OnCheckedChangeListener, OnClickListener
+public class SpeedActivity extends SherlockActivity implements OnCheckedChangeListener
{
private static final String TAG = "SpeedActivity";
@@ -58,9 +57,6 @@ public void onCreate(Bundle savedInstanceState)
this.enabledCheckBox = (CheckBox) findViewById(R.id.checkbox_enabled);
this.enabledCheckBox.setOnCheckedChangeListener(this);
- View btnMap = findViewById(R.id.buttonMap);
- btnMap.setOnClickListener(this);
-
this.startupMessages();
}
@@ -353,18 +349,4 @@ public boolean onOptionsItemSelected(MenuItem item)
}
return true;
}
-
- /**
- * Handle button click actions.
- */
- public void onClick(View v)
- {
- switch (v.getId())
- {
- case R.id.buttonMap:
- startActivity(new Intent(this, DrawMapActivity.class));
- break;
- }
- }
-
}

0 comments on commit 55218a9

Please sign in to comment.