diff --git a/MyTracks/res/drawable-hdpi/tab_selected_focused_mytracks.9.png b/MyTracks/res/drawable-hdpi/tab_selected_focused_mytracks.9.png new file mode 100644 index 000000000..a6cd98a11 Binary files /dev/null and b/MyTracks/res/drawable-hdpi/tab_selected_focused_mytracks.9.png differ diff --git a/MyTracks/res/drawable-hdpi/tab_selected_mytracks.9.png b/MyTracks/res/drawable-hdpi/tab_selected_mytracks.9.png new file mode 100644 index 000000000..bc57ff292 Binary files /dev/null and b/MyTracks/res/drawable-hdpi/tab_selected_mytracks.9.png differ diff --git a/MyTracks/res/drawable-hdpi/tab_selected_pressed_mytracks.9.png b/MyTracks/res/drawable-hdpi/tab_selected_pressed_mytracks.9.png new file mode 100644 index 000000000..73055d4dd Binary files /dev/null and b/MyTracks/res/drawable-hdpi/tab_selected_pressed_mytracks.9.png differ diff --git a/MyTracks/res/drawable-hdpi/tab_unselected_focused_mytracks.9.png b/MyTracks/res/drawable-hdpi/tab_unselected_focused_mytracks.9.png new file mode 100644 index 000000000..9314c584d Binary files /dev/null and b/MyTracks/res/drawable-hdpi/tab_unselected_focused_mytracks.9.png differ diff --git a/MyTracks/res/drawable-hdpi/tab_unselected_mytracks.9.png b/MyTracks/res/drawable-hdpi/tab_unselected_mytracks.9.png new file mode 100644 index 000000000..d9dae1654 Binary files /dev/null and b/MyTracks/res/drawable-hdpi/tab_unselected_mytracks.9.png differ diff --git a/MyTracks/res/drawable-hdpi/tab_unselected_pressed_mytracks.9.png b/MyTracks/res/drawable-hdpi/tab_unselected_pressed_mytracks.9.png new file mode 100644 index 000000000..56a2e7408 Binary files /dev/null and b/MyTracks/res/drawable-hdpi/tab_unselected_pressed_mytracks.9.png differ diff --git a/MyTracks/res/drawable-mdpi/tab_selected_focused_mytracks.9.png b/MyTracks/res/drawable-mdpi/tab_selected_focused_mytracks.9.png new file mode 100644 index 000000000..c11de4d66 Binary files /dev/null and b/MyTracks/res/drawable-mdpi/tab_selected_focused_mytracks.9.png differ diff --git a/MyTracks/res/drawable-mdpi/tab_selected_mytracks.9.png b/MyTracks/res/drawable-mdpi/tab_selected_mytracks.9.png new file mode 100644 index 000000000..dd41ee448 Binary files /dev/null and b/MyTracks/res/drawable-mdpi/tab_selected_mytracks.9.png differ diff --git a/MyTracks/res/drawable-mdpi/tab_selected_pressed_mytracks.9.png b/MyTracks/res/drawable-mdpi/tab_selected_pressed_mytracks.9.png new file mode 100644 index 000000000..c1bd354b9 Binary files /dev/null and b/MyTracks/res/drawable-mdpi/tab_selected_pressed_mytracks.9.png differ diff --git a/MyTracks/res/drawable-mdpi/tab_unselected_focused_mytracks.9.png b/MyTracks/res/drawable-mdpi/tab_unselected_focused_mytracks.9.png new file mode 100644 index 000000000..271b6281a Binary files /dev/null and b/MyTracks/res/drawable-mdpi/tab_unselected_focused_mytracks.9.png differ diff --git a/MyTracks/res/drawable-mdpi/tab_unselected_mytracks.9.png b/MyTracks/res/drawable-mdpi/tab_unselected_mytracks.9.png new file mode 100644 index 000000000..4cfb70c49 Binary files /dev/null and b/MyTracks/res/drawable-mdpi/tab_unselected_mytracks.9.png differ diff --git a/MyTracks/res/drawable-mdpi/tab_unselected_pressed_mytracks.9.png b/MyTracks/res/drawable-mdpi/tab_unselected_pressed_mytracks.9.png new file mode 100644 index 000000000..a6bc7e457 Binary files /dev/null and b/MyTracks/res/drawable-mdpi/tab_unselected_pressed_mytracks.9.png differ diff --git a/MyTracks/res/drawable-xhdpi/tab_selected_focused_mytracks.9.png b/MyTracks/res/drawable-xhdpi/tab_selected_focused_mytracks.9.png new file mode 100644 index 000000000..786bc6df6 Binary files /dev/null and b/MyTracks/res/drawable-xhdpi/tab_selected_focused_mytracks.9.png differ diff --git a/MyTracks/res/drawable-xhdpi/tab_selected_mytracks.9.png b/MyTracks/res/drawable-xhdpi/tab_selected_mytracks.9.png new file mode 100644 index 000000000..496537d28 Binary files /dev/null and b/MyTracks/res/drawable-xhdpi/tab_selected_mytracks.9.png differ diff --git a/MyTracks/res/drawable-xhdpi/tab_selected_pressed_mytracks.9.png b/MyTracks/res/drawable-xhdpi/tab_selected_pressed_mytracks.9.png new file mode 100644 index 000000000..9752ac983 Binary files /dev/null and b/MyTracks/res/drawable-xhdpi/tab_selected_pressed_mytracks.9.png differ diff --git a/MyTracks/res/drawable-xhdpi/tab_unselected_focused_mytracks.9.png b/MyTracks/res/drawable-xhdpi/tab_unselected_focused_mytracks.9.png new file mode 100644 index 000000000..eed4aaa1c Binary files /dev/null and b/MyTracks/res/drawable-xhdpi/tab_unselected_focused_mytracks.9.png differ diff --git a/MyTracks/res/drawable-xhdpi/tab_unselected_mytracks.9.png b/MyTracks/res/drawable-xhdpi/tab_unselected_mytracks.9.png new file mode 100644 index 000000000..fd847c5ce Binary files /dev/null and b/MyTracks/res/drawable-xhdpi/tab_unselected_mytracks.9.png differ diff --git a/MyTracks/res/drawable-xhdpi/tab_unselected_pressed_mytracks.9.png b/MyTracks/res/drawable-xhdpi/tab_unselected_pressed_mytracks.9.png new file mode 100644 index 000000000..3540a88ec Binary files /dev/null and b/MyTracks/res/drawable-xhdpi/tab_unselected_pressed_mytracks.9.png differ diff --git a/MyTracks/res/drawable/tab_indicator_mytracks.xml b/MyTracks/res/drawable/tab_indicator_mytracks.xml new file mode 100644 index 000000000..7b76fa8cf --- /dev/null +++ b/MyTracks/res/drawable/tab_indicator_mytracks.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MyTracks/res/values-v11/styles.xml b/MyTracks/res/values-v11/styles.xml index ee9643069..171ea3343 100644 --- a/MyTracks/res/values-v11/styles.xml +++ b/MyTracks/res/values-v11/styles.xml @@ -15,6 +15,10 @@ See the License for the specific language governing permissions and limitations under the License. --> + - \ No newline at end of file diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java b/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java index 6eda0cd4a..3954f72aa 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java @@ -37,6 +37,7 @@ import com.google.android.apps.mytracks.io.sendtogoogle.SendRequest; import com.google.android.apps.mytracks.services.TrackRecordingServiceConnection; import com.google.android.apps.mytracks.settings.SettingsActivity; import com.google.android.apps.mytracks.util.AnalyticsUtils; +import com.google.android.apps.mytracks.util.ApiAdapterFactory; import com.google.android.apps.mytracks.util.GoogleFeedbackUtils; import com.google.android.apps.mytracks.util.IntentUtils; import com.google.android.apps.mytracks.util.PreferencesUtils; @@ -214,6 +215,10 @@ public class TrackDetailActivity extends AbstractSendToGoogleActivity if (savedInstanceState != null) { tabHost.setCurrentTabByTag(savedInstanceState.getString(CURRENT_TAB_TAG_KEY)); } + + // Set the background after all three tabs are added + ApiAdapterFactory.getApiAdapter().setTabBackground(tabHost.getTabWidget()); + trackController = new TrackController( this, trackRecordingServiceConnection, false, recordListener, stopListener); } 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 b97150faa..865de4192 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/util/Api11Adapter.java +++ b/MyTracks/src/com/google/android/apps/mytracks/util/Api11Adapter.java @@ -37,6 +37,7 @@ import android.widget.ArrayAdapter; import android.widget.ListView; import android.widget.SearchView; import android.widget.Spinner; +import android.widget.TabWidget; import android.widget.TextView; import java.util.ArrayList; @@ -241,4 +242,11 @@ public class Api11Adapter extends Api10Adapter { public boolean isSpinnerBackgroundLight() { return false; } + + @Override + public void setTabBackground(TabWidget tabWidget) { + for (int i = 0; i < tabWidget.getChildCount(); i++) { + tabWidget.getChildAt(i).setBackgroundResource(R.drawable.tab_indicator_mytracks); + } + } } 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 54bc09123..9206aada9 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/util/Api8Adapter.java +++ b/MyTracks/src/com/google/android/apps/mytracks/util/Api8Adapter.java @@ -35,6 +35,7 @@ import android.view.ViewTreeObserver.OnGlobalLayoutListener; import android.view.Window; import android.widget.ArrayAdapter; import android.widget.ListView; +import android.widget.TabWidget; import java.io.IOException; import java.lang.reflect.InvocationTargetException; @@ -142,6 +143,11 @@ public class Api8Adapter implements ApiAdapter { return true; } + @Override + public void setTabBackground(TabWidget tabWidget) { + // Do nothing + } + @Override public boolean handleSearchKey(MenuItem menuItem) { // Return false and allow the framework to handle the search key. 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 3cdcb4b94..eab22abcc 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/util/ApiAdapter.java +++ b/MyTracks/src/com/google/android/apps/mytracks/util/ApiAdapter.java @@ -28,6 +28,7 @@ import android.view.MenuItem; import android.view.ViewTreeObserver; import android.widget.ArrayAdapter; import android.widget.ListView; +import android.widget.TabWidget; import java.io.IOException; import java.util.List; @@ -173,7 +174,14 @@ public interface ApiAdapter { *

* Due to changes in API level 11. */ - public boolean isSpinnerBackgroundLight(); + public boolean isSpinnerBackgroundLight(); + + /** + * Sets the tab background. + * + * @param tabWidget the tab widget + */ + public void setTabBackground(TabWidget tabWidget); /** * Handles the search key press. Returns true if handled.