diff --git a/MyTracks/res/layout/choose_activity_type.xml b/MyTracks/res/layout/choose_activity_type.xml index 7f668b497..afad6a68f 100644 --- a/MyTracks/res/layout/choose_activity_type.xml +++ b/MyTracks/res/layout/choose_activity_type.xml @@ -40,30 +40,16 @@ limitations under the License. android:layout_marginTop="4dp" android:paddingLeft="12dp" style="@style/TextMedium" /> - - - - + \ No newline at end of file diff --git a/MyTracks/src/com/google/android/apps/mytracks/fragments/ChooseActivityTypeDialogFragment.java b/MyTracks/src/com/google/android/apps/mytracks/fragments/ChooseActivityTypeDialogFragment.java index 3bd8f002b..a077ba835 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/fragments/ChooseActivityTypeDialogFragment.java +++ b/MyTracks/src/com/google/android/apps/mytracks/fragments/ChooseActivityTypeDialogFragment.java @@ -16,12 +16,10 @@ package com.google.android.apps.mytracks.fragments; -import com.google.android.apps.mytracks.util.ApiAdapterFactory; import com.google.android.apps.mytracks.util.DialogUtils; import com.google.android.apps.mytracks.util.PreferencesUtils; import com.google.android.apps.mytracks.util.StringUtils; import com.google.android.apps.mytracks.util.TrackIconUtils; -import com.google.android.apps.mytracks.util.UnitConversions; import com.google.android.maps.mytracks.R; import android.app.Activity; @@ -36,7 +34,6 @@ import android.view.View; import android.widget.AdapterView; import android.widget.AdapterView.OnItemClickListener; import android.widget.GridView; -import android.widget.ImageButton; import android.widget.TextView; import java.util.ArrayList; @@ -106,24 +103,6 @@ public class ChooseActivityTypeDialogFragment extends DialogFragment { final TextView weight = (TextView) view.findViewById(R.id.choose_activity_type_weight); - ImageButton imageButton = (ImageButton) view.findViewById( - R.id.choose_activity_type_weight_image_button); - if (ApiAdapterFactory.getApiAdapter().showEditTextClearButton()) { - imageButton.setVisibility(View.VISIBLE); - imageButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - double weightDefault = PreferencesUtils.WEIGHT_DEFAULT; - if (!PreferencesUtils.isMetricUnits(activity)) { - weightDefault *= UnitConversions.KG_TO_LB; - } - weight.setText(StringUtils.formatWeight(weightDefault)); - } - }); - } else { - imageButton.setVisibility(View.GONE); - } - List imageIds = new ArrayList(); for (String iconValue : TrackIconUtils.getAllIconValues()) { imageIds.add(TrackIconUtils.getIconDrawable(iconValue)); diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/Api11Adapter.java b/MyTracks/src/com/google/android/apps/mytracks/util/Api11Adapter.java index 7831aa02e..1bda584c3 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/util/Api11Adapter.java +++ b/MyTracks/src/com/google/android/apps/mytracks/util/Api11Adapter.java @@ -172,11 +172,6 @@ public class Api11Adapter extends Api10Adapter { public void invalidMenu(Activity activity) { activity.invalidateOptionsMenu(); } - - @Override - public boolean showEditTextClearButton() { - return true; - } @Override public void setTabBackground(TabWidget tabWidget) { diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/Api8Adapter.java b/MyTracks/src/com/google/android/apps/mytracks/util/Api8Adapter.java index 607d894f3..ccfcd13ef 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/util/Api8Adapter.java +++ b/MyTracks/src/com/google/android/apps/mytracks/util/Api8Adapter.java @@ -145,11 +145,6 @@ public class Api8Adapter implements ApiAdapter { // Do nothing } - @Override - public boolean showEditTextClearButton() { - return false; - } - @Override public void setTabBackground(TabWidget tabWidget) { // Do nothing diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/ApiAdapter.java b/MyTracks/src/com/google/android/apps/mytracks/util/ApiAdapter.java index 0e51f7fdd..627f4764c 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/util/ApiAdapter.java +++ b/MyTracks/src/com/google/android/apps/mytracks/util/ApiAdapter.java @@ -176,13 +176,6 @@ public interface ApiAdapter { */ public void invalidMenu(Activity activity); - /** - * True to display a clear button on the right of the edit text. - *

- * Due to changes in API level 11. - */ - public boolean showEditTextClearButton(); - /** * Sets the tab background. *