From b593fa3550211083f4c867e3b9891b688560a79e Mon Sep 17 00:00:00 2001 From: Jimmy Shih Date: Tue, 30 Apr 2013 14:09:38 -0700 Subject: [PATCH] fix various lint warnings --- .../android/apps/mytracks/TabsAdapter.java | 9 ++-- .../apps/mytracks/TrackEditActivity.java | 1 + .../apps/mytracks/content/SearchEngine.java | 9 ++-- .../apps/mytracks/util/Api16Adapter.java | 11 ++--- .../apps/mytracks/util/Api17Adapter.java | 41 +++++++++++++++++++ .../apps/mytracks/util/ApiAdapterFactory.java | 4 +- .../widgets/TrackWidgetConfigActivity.java | 3 +- 7 files changed, 61 insertions(+), 17 deletions(-) create mode 100644 MyTracks/src/com/google/android/apps/mytracks/util/Api17Adapter.java diff --git a/MyTracks/src/com/google/android/apps/mytracks/TabsAdapter.java b/MyTracks/src/com/google/android/apps/mytracks/TabsAdapter.java index 75a8cd273..f7a696ee7 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/TabsAdapter.java +++ b/MyTracks/src/com/google/android/apps/mytracks/TabsAdapter.java @@ -59,12 +59,10 @@ public class TabsAdapter extends FragmentPagerAdapter */ private static final class TabInfo { - private final String tag; private final Class clss; private final Bundle bundle; - public TabInfo(String tag, Class clss, Bundle bunlde) { - this.tag = tag; + public TabInfo(Class clss, Bundle bunlde) { this.clss = clss; this.bundle = bunlde; } @@ -106,9 +104,8 @@ public class TabsAdapter extends FragmentPagerAdapter public void addTab(TabHost.TabSpec tabSpec, Class clss, Bundle bundle) { tabSpec.setContent(new DummyTabFactory(context)); - String tag = tabSpec.getTag(); - TabInfo info = new TabInfo(tag, clss, bundle); - + TabInfo info = new TabInfo(clss, bundle); + tabInfos.add(info); tabHost.addTab(tabSpec); notifyDataSetChanged(); diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackEditActivity.java b/MyTracks/src/com/google/android/apps/mytracks/TrackEditActivity.java index ec9f47b8f..0aa4a761f 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/TrackEditActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/TrackEditActivity.java @@ -226,6 +226,7 @@ public class TrackEditActivity extends AbstractMyTracksActivity * * @param value the icon value */ + @SuppressWarnings("unchecked") private void setActivityTypeIcon(String value) { iconValue = value; ArrayAdapter adapter = diff --git a/MyTracks/src/com/google/android/apps/mytracks/content/SearchEngine.java b/MyTracks/src/com/google/android/apps/mytracks/content/SearchEngine.java index 760e9b18e..c92175336 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/content/SearchEngine.java +++ b/MyTracks/src/com/google/android/apps/mytracks/content/SearchEngine.java @@ -25,6 +25,7 @@ import android.location.Location; import java.util.ArrayList; import java.util.Collection; import java.util.Comparator; +import java.util.Locale; import java.util.SortedSet; import java.util.TreeSet; @@ -80,7 +81,7 @@ public class SearchEngine { public static class SearchQuery { public SearchQuery(String textQuery, Location currentLocation, long currentTrackId, long currentTimestamp) { - this.textQuery = textQuery.toLowerCase(); + this.textQuery = textQuery.toLowerCase(Locale.getDefault()); this.currentLocation = currentLocation; this.currentTrackId = currentTrackId; this.currentTimestamp = currentTimestamp; @@ -333,13 +334,13 @@ public class SearchEngine { String name, String description, String category) { // Title boost: track name > description > category. double boost = 1.0; - if (name.toLowerCase().contains(query.textQuery)) { + if (name.toLowerCase(Locale.getDefault()).contains(query.textQuery)) { boost *= TRACK_NAME_PROMOTION; } - if (description.toLowerCase().contains(query.textQuery)) { + if (description.toLowerCase(Locale.getDefault()).contains(query.textQuery)) { boost *= TRACK_DESCRIPTION_PROMOTION; } - if (category.toLowerCase().contains(query.textQuery)) { + if (category.toLowerCase(Locale.getDefault()).contains(query.textQuery)) { boost *= TRACK_CATEGORY_PROMOTION; } return boost; diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/Api16Adapter.java b/MyTracks/src/com/google/android/apps/mytracks/util/Api16Adapter.java index 7ce6f17f5..c64f39094 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/util/Api16Adapter.java +++ b/MyTracks/src/com/google/android/apps/mytracks/util/Api16Adapter.java @@ -20,7 +20,6 @@ import com.google.android.apps.mytracks.widgets.TrackWidgetProvider; import android.annotation.TargetApi; import android.appwidget.AppWidgetManager; -import android.appwidget.AppWidgetProviderInfo; import android.os.Bundle; /** @@ -36,10 +35,12 @@ public class Api16Adapter extends Api14Adapter { @Override public int getAppWidgetSize(AppWidgetManager appWidgetManager, int appWidgetId) { Bundle bundle = appWidgetManager.getAppWidgetOptions(appWidgetId); - boolean isKeyguard = bundle.getInt(AppWidgetManager.OPTION_APPWIDGET_HOST_CATEGORY, -1) - == AppWidgetProviderInfo.WIDGET_CATEGORY_KEYGUARD; - return bundle.getInt(APP_WIDGET_SIZE_KEY, isKeyguard ? TrackWidgetProvider.KEYGUARD_DEFAULT_SIZE - : TrackWidgetProvider.HOME_SCREEN_DEFAULT_SIZE); + return bundle.getInt(APP_WIDGET_SIZE_KEY, getAppWidgetSizeDefault(bundle)); + } + + @SuppressWarnings("unused") + protected int getAppWidgetSizeDefault(Bundle bundle) { + return TrackWidgetProvider.HOME_SCREEN_DEFAULT_SIZE; } @Override diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/Api17Adapter.java b/MyTracks/src/com/google/android/apps/mytracks/util/Api17Adapter.java new file mode 100644 index 000000000..e791ebac4 --- /dev/null +++ b/MyTracks/src/com/google/android/apps/mytracks/util/Api17Adapter.java @@ -0,0 +1,41 @@ +/* + * Copyright 2013 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + +package com.google.android.apps.mytracks.util; + +import com.google.android.apps.mytracks.widgets.TrackWidgetProvider; + +import android.annotation.TargetApi; +import android.appwidget.AppWidgetManager; +import android.appwidget.AppWidgetProviderInfo; +import android.os.Bundle; + +/** + * API level 17 specific implementation of the {@link ApiAdapter}. + * + * @author Jimmy Shih + */ +@TargetApi(17) +public class Api17Adapter extends Api16Adapter { + + @Override + protected int getAppWidgetSizeDefault(Bundle bundle) { + boolean isKeyguard = bundle.getInt(AppWidgetManager.OPTION_APPWIDGET_HOST_CATEGORY, -1) + == AppWidgetProviderInfo.WIDGET_CATEGORY_KEYGUARD; + return isKeyguard ? TrackWidgetProvider.KEYGUARD_DEFAULT_SIZE + : TrackWidgetProvider.HOME_SCREEN_DEFAULT_SIZE; + } +} diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/ApiAdapterFactory.java b/MyTracks/src/com/google/android/apps/mytracks/util/ApiAdapterFactory.java index 5b60e1e5a..85edb5b28 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/util/ApiAdapterFactory.java +++ b/MyTracks/src/com/google/android/apps/mytracks/util/ApiAdapterFactory.java @@ -31,7 +31,9 @@ public class ApiAdapterFactory { */ public static ApiAdapter getApiAdapter() { if (apiAdapter == null) { - if (Build.VERSION.SDK_INT >= 16) { + if (Build.VERSION.SDK_INT >= 17) { + apiAdapter = new Api17Adapter(); + } else if (Build.VERSION.SDK_INT >= 16) { apiAdapter = new Api16Adapter(); } else if (Build.VERSION.SDK_INT >= 14) { apiAdapter = new Api14Adapter(); diff --git a/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetConfigActivity.java b/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetConfigActivity.java index 0d2e8562a..34631dc54 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetConfigActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetConfigActivity.java @@ -29,6 +29,7 @@ import android.widget.Spinner; import java.util.ArrayList; import java.util.List; +import java.util.Locale; /** * Activity to configure the track widget. @@ -124,7 +125,7 @@ public class TrackWidgetConfigActivity extends Activity { } private void addItem(List list, int id) { - list.add(getString(id).toUpperCase()); + list.add(getString(id).toUpperCase(Locale.getDefault())); } private void configSpinner(Spinner spinner, List list, int position) {