karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Automated code cleanup using Android Studio.

Browse Source
This commit is contained in:
Dennis Guse
2019-07-02 22:13:49 +02:00
parent ca7e741304
commit 3e728e0d91
23 changed files with 74 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
myTracks/src/main/java/com/google/android/apps/mytracks/ChartView.java
+3 -3
View File
@@ -624,7 +624,7 @@ public class ChartView extends View {
canvas.drawLine(x, y, x + effectiveWidth, y, axisPaint);
String label = getXAxisLabel();
Rect rect = getRect(axisPaint, label);
int yOffset = (int) rect.height() / 2;
int yOffset = rect.height() / 2;
canvas.drawText(label, x + effectiveWidth + spacer, y + yOffset, axisPaint);
double interval = getXAxisInterval();
@@ -750,7 +750,7 @@ public class ChartView extends View {
String marker = chartValueSeries.formatMarker(yValue);
Paint paint = chartValueSeries.getMarkerPaint();
Rect rect = getRect(paint, marker);
int yPosition = getY(chartValueSeries, yValue) + (int) (rect.height() / 2);
int yPosition = getY(chartValueSeries, yValue) + (rect.height() / 2);
canvas.drawText(marker, xPosition, yPosition, paint);
return paint.measureText(marker);
}
@@ -883,7 +883,7 @@ public class ChartView extends View {
Rect xAxisLabelRect = getRect(axisPaint, getXAxisLabel());
// border + x axis marker + spacer + .5 x axis label
bottomBorder = (int) (density * BORDER + getRect(xAxisMarkerPaint, "1").height() + spacer
+ (int) (xAxisLabelRect.height() / 2));
+ (xAxisLabelRect.height() / 2));
rightBorder = (int) (density * BORDER + xAxisLabelRect.width() + spacer);
updateEffectiveDimensions();
}
myTracks/src/main/java/com/google/android/apps/mytracks/MarkerDetailActivity.java
+1 -1
View File
@@ -85,7 +85,7 @@ public class MarkerDetailActivity extends AbstractMyTracksActivity implements De
}
}
ViewPager viewPager = (ViewPager) findViewById(R.id.maker_detail_activity_view_pager);
ViewPager viewPager = findViewById(R.id.maker_detail_activity_view_pager);
viewPager.setAdapter(new MarkerDetailPagerAdapter(getSupportFragmentManager()));
if (markerIndex != -1) {
viewPager.setCurrentItem(markerIndex);
myTracks/src/main/java/com/google/android/apps/mytracks/MarkerEditActivity.java
+6 -6
View File
@@ -71,24 +71,24 @@ public class MarkerEditActivity extends AbstractMyTracksActivity {
// Setup UI elements
statisticsSection = findViewById(R.id.marker_edit_statistics_section);
statisticsName = (EditText) findViewById(R.id.marker_edit_statistics_name);
statisticsName = findViewById(R.id.marker_edit_statistics_name);
waypointSection = findViewById(R.id.marker_edit_waypoint_section);
waypointName = (EditText) findViewById(R.id.marker_edit_waypoint_name);
waypointMarkerType = (AutoCompleteTextView) findViewById(R.id.marker_edit_waypoint_marker_type);
waypointName = findViewById(R.id.marker_edit_waypoint_name);
waypointMarkerType = findViewById(R.id.marker_edit_waypoint_marker_type);
ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(
this, R.array.waypoint_types, android.R.layout.simple_dropdown_item_1line);
waypointMarkerType.setAdapter(adapter);
waypointDescription = (EditText) findViewById(R.id.marker_edit_waypoint_description);
waypointDescription = findViewById(R.id.marker_edit_waypoint_description);
Button cancel = (Button) findViewById(R.id.marker_edit_cancel);
Button cancel = findViewById(R.id.marker_edit_cancel);
cancel.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
finish();
}
});
done = (Button) findViewById(R.id.marker_edit_done);
done = findViewById(R.id.marker_edit_done);
updateUiByMarkerId();
}
myTracks/src/main/java/com/google/android/apps/mytracks/MarkerListActivity.java
+1 -1
View File
@@ -155,7 +155,7 @@ public class MarkerListActivity extends AbstractMyTracksActivity implements Dele
setDefaultKeyMode(DEFAULT_KEYS_SEARCH_LOCAL);
listView = (ListView) findViewById(R.id.marker_list);
listView = findViewById(R.id.marker_list);
listView.setEmptyView(findViewById(R.id.marker_list_empty));
listView.setOnItemClickListener(new OnItemClickListener() {
@Override
myTracks/src/main/java/com/google/android/apps/mytracks/SearchListActivity.java
+1 -1
View File
@@ -192,7 +192,7 @@ public class SearchListActivity extends AbstractSendToGoogleActivity implements
searchEngine = new SearchEngine(myTracksProviderUtils);
searchRecentSuggestions = SearchEngineProvider.newHelper(this);
listView = (ListView) findViewById(R.id.search_list);
listView = findViewById(R.id.search_list);
listView.setEmptyView(findViewById(R.id.search_list_empty));
listView.setOnItemClickListener(new OnItemClickListener() {
@Override
myTracks/src/main/java/com/google/android/apps/mytracks/TrackController.java
+5 -5
View File
@@ -80,12 +80,12 @@ public class TrackController {
this.trackRecordingServiceConnection = trackRecordingServiceConnection;
this.alwaysShow = alwaysShow;
handler = new Handler();
containerView = (View) activity.findViewById(R.id.track_controler_container);
statusTextView = (TextView) activity.findViewById(R.id.track_controller_status);
totalTimeTextView = (TextView) activity.findViewById(R.id.track_controller_total_time);
recordImageButton = (ImageButton) activity.findViewById(R.id.track_controller_record);
containerView = activity.findViewById(R.id.track_controler_container);
statusTextView = activity.findViewById(R.id.track_controller_status);
totalTimeTextView = activity.findViewById(R.id.track_controller_total_time);
recordImageButton = activity.findViewById(R.id.track_controller_record);
recordImageButton.setOnClickListener(recordListener);
stopImageButton = (ImageButton) activity.findViewById(R.id.track_controller_stop);
stopImageButton = activity.findViewById(R.id.track_controller_stop);
stopImageButton.setOnClickListener(stopListener);
}
myTracks/src/main/java/com/google/android/apps/mytracks/TrackDetailActivity.java
+3 -3
View File
@@ -215,10 +215,10 @@ public class TrackDetailActivity extends AbstractSendToGoogleActivity
this, bindChangedCallback);
trackDataHub = TrackDataHub.newInstance(this);
tabHost = (TabHost) findViewById(android.R.id.tabhost);
tabHost = findViewById(android.R.id.tabhost);
tabHost.setup();
viewPager = (ViewPager) findViewById(R.id.pager);
viewPager = findViewById(R.id.pager);
tabsAdapter = new TabsAdapter(this, tabHost, viewPager);
@@ -332,7 +332,7 @@ public class TrackDetailActivity extends AbstractSendToGoogleActivity
getMenuInflater().inflate(R.menu.track_detail, menu);
Track track = myTracksProviderUtils.getTrack(trackId);
boolean isSharedWithMe = track != null ? track.isSharedWithMe() : true;
boolean isSharedWithMe = track == null || track.isSharedWithMe();
menu.findItem(R.id.track_detail_edit).setVisible(!isSharedWithMe);
myTracks/src/main/java/com/google/android/apps/mytracks/TrackEditActivity.java
+6 -6
View File
@@ -88,10 +88,10 @@ public class TrackEditActivity extends AbstractMyTracksActivity implements Choos
return;
}
name = (EditText) findViewById(R.id.track_edit_name);
name = findViewById(R.id.track_edit_name);
name.setText(track.getName());
activityType = (AutoCompleteTextView) findViewById(R.id.track_edit_activity_type);
activityType = findViewById(R.id.track_edit_activity_type);
activityType.setText(track.getCategory());
ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(
@@ -122,7 +122,7 @@ public class TrackEditActivity extends AbstractMyTracksActivity implements Choos
iconValue = track.getIcon();
}
activityTypeIcon = (Spinner) findViewById(R.id.track_edit_activity_type_icon);
activityTypeIcon = findViewById(R.id.track_edit_activity_type_icon);
activityTypeIcon.setAdapter(TrackIconUtils.getIconSpinnerAdapter(this, iconValue));
activityTypeIcon.setOnTouchListener(new View.OnTouchListener() {
@Override
@@ -147,10 +147,10 @@ public class TrackEditActivity extends AbstractMyTracksActivity implements Choos
}
});
description = (EditText) findViewById(R.id.track_edit_description);
description = findViewById(R.id.track_edit_description);
description.setText(track.getDescription());
Button save = (Button) findViewById(R.id.track_edit_save);
Button save = findViewById(R.id.track_edit_save);
save.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -160,7 +160,7 @@ public class TrackEditActivity extends AbstractMyTracksActivity implements Choos
}
});
Button cancel = (Button) findViewById(R.id.track_edit_cancel);
Button cancel = findViewById(R.id.track_edit_cancel);
if (getIntent().getBooleanExtra(EXTRA_NEW_TRACK, false)) {
setTitle(R.string.track_edit_new_track_title);
cancel.setVisibility(View.GONE);
myTracks/src/main/java/com/google/android/apps/mytracks/TrackListActivity.java
+1 -1
View File
@@ -325,7 +325,7 @@ public class TrackListActivity extends AbstractSendToGoogleActivity implements F
}
});
listView = (ListView) findViewById(R.id.track_list);
listView = findViewById(R.id.track_list);
listView.setEmptyView(findViewById(R.id.track_list_empty_view));
listView.setOnItemClickListener(new OnItemClickListener() {
@Override
myTracks/src/main/java/com/google/android/apps/mytracks/fragments/ChartFragment.java
+4 -4
View File
@@ -111,7 +111,7 @@ public class ChartFragment extends Fragment implements TrackDataListener {
public View onCreateView(
LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.chart, container, false);
zoomControls = (ZoomControls) view.findViewById(R.id.chart_zoom_controls);
zoomControls = view.findViewById(R.id.chart_zoom_controls);
zoomControls.setOnZoomInClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -130,7 +130,7 @@ public class ChartFragment extends Fragment implements TrackDataListener {
@Override
public void onStart() {
super.onStart();
ViewGroup layout = (ViewGroup) getActivity().findViewById(R.id.chart_view_layout);
ViewGroup layout = getActivity().findViewById(R.id.chart_view_layout);
LayoutParams layoutParams = new LayoutParams(
LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
layout.addView(chartView, layoutParams);
@@ -153,7 +153,7 @@ public class ChartFragment extends Fragment implements TrackDataListener {
@Override
public void onStop() {
super.onStop();
ViewGroup layout = (ViewGroup) getActivity().findViewById(R.id.chart_view_layout);
ViewGroup layout = getActivity().findViewById(R.id.chart_view_layout);
layout.removeView(chartView);
}
@@ -448,7 +448,7 @@ public class ChartFragment extends Fragment implements TrackDataListener {
* @param data the data point to fill in, can be null
*/
@VisibleForTesting
void fillDataPoint(Location location, double data[]) {
void fillDataPoint(Location location, double[] data) {
double timeOrDistance = Double.NaN;
double elevation = Double.NaN;
double speed = Double.NaN;
myTracks/src/main/java/com/google/android/apps/mytracks/fragments/ChooseActivityDialogFragment.java
+3 -3
View File
@@ -101,9 +101,9 @@ public class ChooseActivityDialogFragment extends AbstractMyTracksDialogFragment
view = getActivity().getLayoutInflater()
.inflate(R.layout.choose_activity_list_item, parent, false);
viewHolder = new ViewHolder();
viewHolder.text1 = (TextView) view.findViewById(R.id.choose_activity_list_item_text1);
viewHolder.text2 = (TextView) view.findViewById(R.id.choose_activity_list_item_text2);
viewHolder.icon = (ImageView) view.findViewById(R.id.choose_activity_list_item_icon);
viewHolder.text1 = view.findViewById(R.id.choose_activity_list_item_text1);
viewHolder.text2 = view.findViewById(R.id.choose_activity_list_item_text2);
viewHolder.icon = view.findViewById(R.id.choose_activity_list_item_icon);
view.setTag(viewHolder);
} else {
view = convertView;
myTracks/src/main/java/com/google/android/apps/mytracks/fragments/ChooseActivityTypeDialogFragment.java
+3 -3
View File
@@ -93,15 +93,15 @@ public class ChooseActivityTypeDialogFragment extends DialogFragment {
public static Dialog getDialog(
final Activity activity, final String category, final ChooseActivityTypeCaller caller) {
View view = activity.getLayoutInflater().inflate(R.layout.choose_activity_type, null);
GridView gridView = (GridView) view.findViewById(R.id.choose_activity_type_grid_view);
GridView gridView = view.findViewById(R.id.choose_activity_type_grid_view);
final View weightContainer = view.findViewById(R.id.choose_activity_type_weight_container);
TextView weightLabel = (TextView) view.findViewById(R.id.choose_activity_type_weight_label);
TextView weightLabel = view.findViewById(R.id.choose_activity_type_weight_label);
weightLabel.setText(
PreferencesUtils.isMetricUnits(activity) ? R.string.description_weight_metric
: R.string.description_weight_imperial);
final TextView weight = (TextView) view.findViewById(R.id.choose_activity_type_weight);
final TextView weight = view.findViewById(R.id.choose_activity_type_weight);
List<Integer> imageIds = new ArrayList<Integer>();
for (String iconValue : TrackIconUtils.getAllIconValues()) {
myTracks/src/main/java/com/google/android/apps/mytracks/fragments/MarkerDetailFragment.java
+8 -8
View File
@@ -126,9 +126,9 @@ public class MarkerDetailFragment extends Fragment {
LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.marker_detail_fragment, container, false);
photo = (ImageView) view.findViewById(R.id.marker_detail_waypoint_photo);
textGradient = (ImageView) view.findViewById(R.id.marker_detail_waypoint_text_gradient);
waypointInfo = (LinearLayout) view.findViewById(R.id.marker_detail_waypoint_info);
photo = view.findViewById(R.id.marker_detail_waypoint_photo);
textGradient = view.findViewById(R.id.marker_detail_waypoint_text_gradient);
waypointInfo = view.findViewById(R.id.marker_detail_waypoint_info);
photo.setOnClickListener(new View.OnClickListener() {
@Override
@@ -192,7 +192,7 @@ public class MarkerDetailFragment extends Fragment {
updateWaypoint(false);
Track track = myTracksProviderUtils.getTrack(waypoint.getTrackId());
boolean isSharedWithMe = track != null ? track.isSharedWithMe() : true;
boolean isSharedWithMe = track == null || track.isSharedWithMe();
menu.findItem(R.id.marker_detail_edit).setVisible(!isSharedWithMe);
menu.findItem(R.id.marker_detail_delete).setVisible(!isSharedWithMe);
@@ -280,11 +280,11 @@ public class MarkerDetailFragment extends Fragment {
setName(R.id.marker_detail_waypoint_name, hasPhoto);
TextView category = (TextView) getView().findViewById(R.id.marker_detail_waypoint_category);
TextView category = getView().findViewById(R.id.marker_detail_waypoint_category);
ListItemUtils.setTextView(
getActivity(), category, StringUtils.getCategory(waypoint.getCategory()), hasPhoto);
TextView description = (TextView) getView()
TextView description = getView()
.findViewById(R.id.marker_detail_waypoint_description);
ListItemUtils.setTextView(getActivity(), description, waypoint.getDescription(), hasPhoto);
@@ -305,12 +305,12 @@ public class MarkerDetailFragment extends Fragment {
}
private void setName(int resId, boolean addShadow) {
TextView textView = (TextView) getView().findViewById(resId);
TextView textView = getView().findViewById(resId);
ListItemUtils.setTextView(getActivity(), textView, waypoint.getName(), addShadow);
}
private void setLocation(int resId, boolean addShadow) {
TextView textView = (TextView) getView().findViewById(resId);
TextView textView = getView().findViewById(resId);
Location location = waypoint.getLocation();
String value;
if (location == null) {
myTracks/src/main/java/com/google/android/apps/mytracks/fragments/StatsFragment.java
+1 -1
View File
@@ -91,7 +91,7 @@ public class StatsFragment extends Fragment implements TrackDataListener {
super.onActivityCreated(savedInstanceState);
handler = new Handler();
Spinner activityTypeIcon = (Spinner) getView().findViewById(R.id.stats_activity_type_icon);
Spinner activityTypeIcon = getView().findViewById(R.id.stats_activity_type_icon);
activityTypeIcon.setAdapter(TrackIconUtils.getIconSpinnerAdapter(getActivity(), ""));
activityTypeIcon.setOnTouchListener(new View.OnTouchListener() {
@Override
myTracks/src/main/java/com/google/android/apps/mytracks/io/file/importer/KmlFileTrackImporter.java
+2 -2
View File
@@ -202,7 +202,7 @@ public class KmlFileTrackImporter extends AbstractFileTrackImporter {
*/
private void onWaypointLocationEnd() {
if (content != null) {
String parts[] = content.trim().split(",");
String[] parts = content.trim().split(",");
if (parts.length != 2 && parts.length != 3) {
return;
}
@@ -264,7 +264,7 @@ public class KmlFileTrackImporter extends AbstractFileTrackImporter {
if (content == null) {
return;
}
String parts[] = content.trim().split(" ");
String[] parts = content.trim().split(" ");
if (parts.length != 2 && parts.length != 3) {
return;
}
myTracks/src/main/java/com/google/android/apps/mytracks/settings/ActivityTypePreference.java
+2 -2
View File
@@ -57,8 +57,8 @@ public class ActivityTypePreference extends DialogPreference {
@Override
protected View onCreateDialogView() {
View view = super.onCreateDialogView();
textView = (AutoCompleteTextView) view.findViewById(R.id.activity_type_preference_text_view);
spinner = (Spinner) view.findViewById(R.id.activity_type_preference_spinner);
textView = view.findViewById(R.id.activity_type_preference_text_view);
spinner = view.findViewById(R.id.activity_type_preference_spinner);
String category = PreferencesUtils.getString(
getContext(), R.string.default_activity_key, PreferencesUtils.DEFAULT_ACTIVITY_DEFAULT);
myTracks/src/main/java/com/google/android/apps/mytracks/settings/StatsSettingsActivity.java
+1 -1
View File
@@ -55,7 +55,7 @@ public class StatsSettingsActivity extends AbstractSettingsActivity {
@Override
public boolean onPreferenceChange(Preference pref, Object newValue) {
boolean metricUnits = PreferencesUtils.STATS_UNITS_DEFAULT.equals((String) newValue);
boolean metricUnits = PreferencesUtils.STATS_UNITS_DEFAULT.equals(newValue);
configRateListPreference(metricUnits);
return true;
}
myTracks/src/main/java/com/google/android/apps/mytracks/util/ListItemUtils.java
+10 -10
View File
@@ -69,8 +69,8 @@ public class ListItemUtils {
boolean useRelativeTime, String category, String description, String photoUrl) {
// Set photo
ImageView photo = (ImageView) view.findViewById(R.id.list_item_photo);
ImageView textGradient = (ImageView) view.findViewById(R.id.list_item_text_gradient);
ImageView photo = view.findViewById(R.id.list_item_photo);
ImageView textGradient = view.findViewById(R.id.list_item_text_gradient);
boolean hasPhoto = photoUrl != null && !photoUrl.equals("");
photo.setVisibility(hasPhoto ? View.VISIBLE : View.GONE);
@@ -91,16 +91,16 @@ public class ListItemUtils {
iconContentDescriptionId = isPaused ? R.string.image_pause : R.string.image_record;
}
ImageView iconImageView = (ImageView) view.findViewById(R.id.list_item_icon);
ImageView iconImageView = view.findViewById(R.id.list_item_icon);
iconImageView.setImageResource(iconId);
iconImageView.setContentDescription(activity.getString(iconContentDescriptionId));
// Set name
TextView nameTextView = (TextView) view.findViewById(R.id.list_item_name);
TextView nameTextView = view.findViewById(R.id.list_item_name);
setTextView(activity, nameTextView, name, hasPhoto);
// Set sharedOwner/totalTime/totalDistance
TextView ownerTimeDistanceTextView = (TextView) view.findViewById(
TextView ownerTimeDistanceTextView = view.findViewById(
R.id.list_item_owner_time_distance);
String ownerTimeDistance;
if (isRecording) {
@@ -119,8 +119,8 @@ public class ListItemUtils {
setTextView(activity, ownerTimeDistanceTextView, ownerTimeDistance, hasPhoto);
// Set markerCount
ImageView markerCountIcon = (ImageView) view.findViewById(R.id.list_item_marker_count_icon);
TextView markerCountTextView = (TextView) view.findViewById(R.id.list_item_marker_count);
ImageView markerCountIcon = view.findViewById(R.id.list_item_marker_count_icon);
TextView markerCountTextView = view.findViewById(R.id.list_item_marker_count);
boolean hasMarker = markerCount > 0;
markerCountIcon.setVisibility(hasMarker ? View.VISIBLE : View.GONE);
String markerCountValue = hasMarker ? String.valueOf(markerCount) : null;
@@ -135,14 +135,14 @@ public class ListItemUtils {
// Set date/time
String[] dateTime = getDateTime(isRecording, activity, startTime, useRelativeTime);
TextView dateTextView = (TextView) view.findViewById(R.id.list_item_date);
TextView dateTextView = view.findViewById(R.id.list_item_date);
setTextView(activity, dateTextView, dateTime[0], hasPhoto);
TextView timeTextView = (TextView) view.findViewById(R.id.list_item_time);
TextView timeTextView = view.findViewById(R.id.list_item_time);
setTextView(activity, timeTextView, dateTime[1], hasPhoto);
// Set category and description
TextView categoryDescriptionTextView = (TextView) view.findViewById(
TextView categoryDescriptionTextView = view.findViewById(
R.id.list_item_category_description);
String categoryDescription = isRecording ? null
: StringUtils.getCategoryDescription(category, description);
myTracks/src/main/java/com/google/android/apps/mytracks/util/StatsUtils.java
+5 -5
View File
@@ -221,7 +221,7 @@ public class StatsUtils {
*/
private static void setSpeed(Context context, View view, int speedLabelId, int paceLabelId,
double speed, boolean metricUnits, boolean reportSpeed) {
String parts[] = StringUtils.getSpeedParts(context, speed, metricUnits, reportSpeed);
String[] parts = StringUtils.getSpeedParts(context, speed, metricUnits, reportSpeed);
setItem(context, view, reportSpeed ? speedLabelId : paceLabelId, parts[0], parts[1]);
}
@@ -248,7 +248,7 @@ public class StatsUtils {
*/
private static void setDistanceValue(
Context context, View view, double distance, boolean metricUnits) {
String parts[] = StringUtils.getDistanceParts(context, distance, metricUnits);
String[] parts = StringUtils.getDistanceParts(context, distance, metricUnits);
setItem(context, view, R.string.stats_distance, parts[0], parts[1]);
}
@@ -334,9 +334,9 @@ public class StatsUtils {
*/
private static void setItem(
Context context, View view, int labelId, CharSequence value, CharSequence unit) {
TextView labelTextView = (TextView) view.findViewById(R.id.stats_label);
TextView valueTextView = (TextView) view.findViewById(R.id.stats_value);
TextView unitTextView = (TextView) view.findViewById(R.id.stats_unit);
TextView labelTextView = view.findViewById(R.id.stats_label);
TextView valueTextView = view.findViewById(R.id.stats_value);
TextView unitTextView = view.findViewById(R.id.stats_unit);
if (labelTextView == null || valueTextView == null || unitTextView == null) {
return;
}
myTracks/src/main/java/com/google/android/apps/mytracks/util/StringUtils.java
+1 -1
View File
@@ -63,7 +63,7 @@ public class StringUtils {
public static String formatDateTime(Context context, long time) {
return DateUtils.formatDateTime(
context, time, DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_NUMERIC_DATE) + " "
+ DateUtils.formatDateTime(context, time, DateUtils.FORMAT_SHOW_TIME).toString();
+ DateUtils.formatDateTime(context, time, DateUtils.FORMAT_SHOW_TIME);
}
/**
myTracks/src/main/java/com/google/android/apps/mytracks/widgets/TrackWidgetConfigActivity.java
+4 -4
View File
@@ -55,10 +55,10 @@ public class TrackWidgetConfigActivity extends Activity {
setResult(RESULT_CANCELED);
setContentView(R.layout.track_widget_config);
item1 = (Spinner) findViewById(R.id.track_widget_config_item1);
item2 = (Spinner) findViewById(R.id.track_widget_config_item2);
item3 = (Spinner) findViewById(R.id.track_widget_config_item3);
item4 = (Spinner) findViewById(R.id.track_widget_config_item4);
item1 = findViewById(R.id.track_widget_config_item1);
item2 = findViewById(R.id.track_widget_config_item2);
item3 = findViewById(R.id.track_widget_config_item3);
item4 = findViewById(R.id.track_widget_config_item4);
boolean reportSpeed = PreferencesUtils.isReportSpeed(this);
myTracksLib/src/main/java/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImpl.java
+1
View File
@@ -671,6 +671,7 @@ public class MyTracksProviderUtilsImpl implements MyTracksProviderUtils {
cursor.moveToFirst();
int count = cursor.getInt(0);
cursor.close();
// not count the first waypoint
return count > 0 ? count - 1 : 0;
}
myTracksLib/src/main/java/com/google/android/apps/mytracks/content/Sensor.java
+2 -3
View File
@@ -88,8 +88,7 @@ public final class Sensor {
state_ = com.google.android.apps.mytracks.content.Sensor.SensorState.NONE;
}
public final boolean isInitialized() {
if (!hasState) return false;
return true;
return hasState;
}
public void writeTo(com.google.protobuf.CodedOutputStream output)
@@ -422,7 +421,7 @@ public final class Sensor {
if (!getPower().isInitialized()) return false;
}
if (hasBatteryLevel()) {
if (!getBatteryLevel().isInitialized()) return false;
return getBatteryLevel().isInitialized();
}
return true;
}