From ae456a498eb007678b7a9b50c2e5833c3ea7321f Mon Sep 17 00:00:00 2001 From: Jimmy Shih Date: Tue, 9 Jul 2013 11:12:13 -0700 Subject: [PATCH] Code cleanup: add ic_ prefix to track icons --- MyTracks/res/drawable-hdpi/blue_pushpin.png | Bin MyTracks/res/drawable-hdpi/green_dot.png | Bin .../ic_stat_notify_recording.png | Bin MyTracks/res/drawable-hdpi/ic_tab_chart.png | Bin ...ack_airplane.png => ic_track_airplane.png} | Bin .../{track_bike.png => ic_track_bike.png} | Bin .../{track_boat.png => ic_track_boat.png} | Bin .../{track_drive.png => ic_track_drive.png} | Bin .../{track_paused.png => ic_track_paused.png} | Bin ...k_recording.png => ic_track_recording.png} | Bin .../{track_run.png => ic_track_run.png} | Bin .../{track_ski.png => ic_track_ski.png} | Bin ...oarding.png => ic_track_snow_boarding.png} | Bin .../{track_walk.png => ic_track_walk.png} | Bin MyTracks/res/drawable-hdpi/red_dot.png | Bin MyTracks/res/drawable-hdpi/warning.png | Bin MyTracks/res/drawable-hdpi/yellow_pushpin.png | Bin ...ack_airplane.png => ic_track_airplane.png} | Bin .../{track_bike.png => ic_track_bike.png} | Bin .../{track_boat.png => ic_track_boat.png} | Bin .../{track_drive.png => ic_track_drive.png} | Bin .../{track_paused.png => ic_track_paused.png} | Bin ...k_recording.png => ic_track_recording.png} | Bin .../{track_run.png => ic_track_run.png} | Bin .../{track_ski.png => ic_track_ski.png} | Bin ...oarding.png => ic_track_snow_boarding.png} | Bin .../{track_walk.png => ic_track_walk.png} | Bin ...ack_airplane.png => ic_track_airplane.png} | Bin .../{track_bike.png => ic_track_bike.png} | Bin .../{track_boat.png => ic_track_boat.png} | Bin .../{track_drive.png => ic_track_drive.png} | Bin .../{track_paused.png => ic_track_paused.png} | Bin ...k_recording.png => ic_track_recording.png} | Bin .../{track_run.png => ic_track_run.png} | Bin .../{track_ski.png => ic_track_ski.png} | Bin ...oarding.png => ic_track_snow_boarding.png} | Bin .../{track_walk.png => ic_track_walk.png} | Bin .../apps/mytracks/TrackEditActivity.java | 2 +- .../ChooseActivityTypeDialogFragment.java | 2 +- .../apps/mytracks/util/ListItemUtils.java | 2 +- .../apps/mytracks/util/TrackIconUtils.java | 24 ++++++++++-------- 41 files changed, 17 insertions(+), 13 deletions(-) mode change 100755 => 100644 MyTracks/res/drawable-hdpi/blue_pushpin.png mode change 100755 => 100644 MyTracks/res/drawable-hdpi/green_dot.png mode change 100755 => 100644 MyTracks/res/drawable-hdpi/ic_stat_notify_recording.png mode change 100755 => 100644 MyTracks/res/drawable-hdpi/ic_tab_chart.png rename MyTracks/res/drawable-hdpi/{track_airplane.png => ic_track_airplane.png} (100%) rename MyTracks/res/drawable-hdpi/{track_bike.png => ic_track_bike.png} (100%) mode change 100755 => 100644 rename MyTracks/res/drawable-hdpi/{track_boat.png => ic_track_boat.png} (100%) rename MyTracks/res/drawable-hdpi/{track_drive.png => ic_track_drive.png} (100%) mode change 100755 => 100644 rename MyTracks/res/drawable-hdpi/{track_paused.png => ic_track_paused.png} (100%) rename MyTracks/res/drawable-hdpi/{track_recording.png => ic_track_recording.png} (100%) rename MyTracks/res/drawable-hdpi/{track_run.png => ic_track_run.png} (100%) mode change 100755 => 100644 rename MyTracks/res/drawable-hdpi/{track_ski.png => ic_track_ski.png} (100%) mode change 100755 => 100644 rename MyTracks/res/drawable-hdpi/{track_snow_boarding.png => ic_track_snow_boarding.png} (100%) rename MyTracks/res/drawable-hdpi/{track_walk.png => ic_track_walk.png} (100%) mode change 100755 => 100644 mode change 100755 => 100644 MyTracks/res/drawable-hdpi/red_dot.png mode change 100755 => 100644 MyTracks/res/drawable-hdpi/warning.png mode change 100755 => 100644 MyTracks/res/drawable-hdpi/yellow_pushpin.png rename MyTracks/res/drawable-mdpi/{track_airplane.png => ic_track_airplane.png} (100%) rename MyTracks/res/drawable-mdpi/{track_bike.png => ic_track_bike.png} (100%) rename MyTracks/res/drawable-mdpi/{track_boat.png => ic_track_boat.png} (100%) rename MyTracks/res/drawable-mdpi/{track_drive.png => ic_track_drive.png} (100%) rename MyTracks/res/drawable-mdpi/{track_paused.png => ic_track_paused.png} (100%) rename MyTracks/res/drawable-mdpi/{track_recording.png => ic_track_recording.png} (100%) rename MyTracks/res/drawable-mdpi/{track_run.png => ic_track_run.png} (100%) rename MyTracks/res/drawable-mdpi/{track_ski.png => ic_track_ski.png} (100%) rename MyTracks/res/drawable-mdpi/{track_snow_boarding.png => ic_track_snow_boarding.png} (100%) rename MyTracks/res/drawable-mdpi/{track_walk.png => ic_track_walk.png} (100%) rename MyTracks/res/drawable-xhdpi/{track_airplane.png => ic_track_airplane.png} (100%) rename MyTracks/res/drawable-xhdpi/{track_bike.png => ic_track_bike.png} (100%) rename MyTracks/res/drawable-xhdpi/{track_boat.png => ic_track_boat.png} (100%) rename MyTracks/res/drawable-xhdpi/{track_drive.png => ic_track_drive.png} (100%) rename MyTracks/res/drawable-xhdpi/{track_paused.png => ic_track_paused.png} (100%) rename MyTracks/res/drawable-xhdpi/{track_recording.png => ic_track_recording.png} (100%) rename MyTracks/res/drawable-xhdpi/{track_run.png => ic_track_run.png} (100%) rename MyTracks/res/drawable-xhdpi/{track_ski.png => ic_track_ski.png} (100%) rename MyTracks/res/drawable-xhdpi/{track_snow_boarding.png => ic_track_snow_boarding.png} (100%) rename MyTracks/res/drawable-xhdpi/{track_walk.png => ic_track_walk.png} (100%) diff --git a/MyTracks/res/drawable-hdpi/blue_pushpin.png b/MyTracks/res/drawable-hdpi/blue_pushpin.png old mode 100755 new mode 100644 diff --git a/MyTracks/res/drawable-hdpi/green_dot.png b/MyTracks/res/drawable-hdpi/green_dot.png old mode 100755 new mode 100644 diff --git a/MyTracks/res/drawable-hdpi/ic_stat_notify_recording.png b/MyTracks/res/drawable-hdpi/ic_stat_notify_recording.png old mode 100755 new mode 100644 diff --git a/MyTracks/res/drawable-hdpi/ic_tab_chart.png b/MyTracks/res/drawable-hdpi/ic_tab_chart.png old mode 100755 new mode 100644 diff --git a/MyTracks/res/drawable-hdpi/track_airplane.png b/MyTracks/res/drawable-hdpi/ic_track_airplane.png similarity index 100% rename from MyTracks/res/drawable-hdpi/track_airplane.png rename to MyTracks/res/drawable-hdpi/ic_track_airplane.png diff --git a/MyTracks/res/drawable-hdpi/track_bike.png b/MyTracks/res/drawable-hdpi/ic_track_bike.png old mode 100755 new mode 100644 similarity index 100% rename from MyTracks/res/drawable-hdpi/track_bike.png rename to MyTracks/res/drawable-hdpi/ic_track_bike.png diff --git a/MyTracks/res/drawable-hdpi/track_boat.png b/MyTracks/res/drawable-hdpi/ic_track_boat.png similarity index 100% rename from MyTracks/res/drawable-hdpi/track_boat.png rename to MyTracks/res/drawable-hdpi/ic_track_boat.png diff --git a/MyTracks/res/drawable-hdpi/track_drive.png b/MyTracks/res/drawable-hdpi/ic_track_drive.png old mode 100755 new mode 100644 similarity index 100% rename from MyTracks/res/drawable-hdpi/track_drive.png rename to MyTracks/res/drawable-hdpi/ic_track_drive.png diff --git a/MyTracks/res/drawable-hdpi/track_paused.png b/MyTracks/res/drawable-hdpi/ic_track_paused.png similarity index 100% rename from MyTracks/res/drawable-hdpi/track_paused.png rename to MyTracks/res/drawable-hdpi/ic_track_paused.png diff --git a/MyTracks/res/drawable-hdpi/track_recording.png b/MyTracks/res/drawable-hdpi/ic_track_recording.png similarity index 100% rename from MyTracks/res/drawable-hdpi/track_recording.png rename to MyTracks/res/drawable-hdpi/ic_track_recording.png diff --git a/MyTracks/res/drawable-hdpi/track_run.png b/MyTracks/res/drawable-hdpi/ic_track_run.png old mode 100755 new mode 100644 similarity index 100% rename from MyTracks/res/drawable-hdpi/track_run.png rename to MyTracks/res/drawable-hdpi/ic_track_run.png diff --git a/MyTracks/res/drawable-hdpi/track_ski.png b/MyTracks/res/drawable-hdpi/ic_track_ski.png old mode 100755 new mode 100644 similarity index 100% rename from MyTracks/res/drawable-hdpi/track_ski.png rename to MyTracks/res/drawable-hdpi/ic_track_ski.png diff --git a/MyTracks/res/drawable-hdpi/track_snow_boarding.png b/MyTracks/res/drawable-hdpi/ic_track_snow_boarding.png similarity index 100% rename from MyTracks/res/drawable-hdpi/track_snow_boarding.png rename to MyTracks/res/drawable-hdpi/ic_track_snow_boarding.png diff --git a/MyTracks/res/drawable-hdpi/track_walk.png b/MyTracks/res/drawable-hdpi/ic_track_walk.png old mode 100755 new mode 100644 similarity index 100% rename from MyTracks/res/drawable-hdpi/track_walk.png rename to MyTracks/res/drawable-hdpi/ic_track_walk.png diff --git a/MyTracks/res/drawable-hdpi/red_dot.png b/MyTracks/res/drawable-hdpi/red_dot.png old mode 100755 new mode 100644 diff --git a/MyTracks/res/drawable-hdpi/warning.png b/MyTracks/res/drawable-hdpi/warning.png old mode 100755 new mode 100644 diff --git a/MyTracks/res/drawable-hdpi/yellow_pushpin.png b/MyTracks/res/drawable-hdpi/yellow_pushpin.png old mode 100755 new mode 100644 diff --git a/MyTracks/res/drawable-mdpi/track_airplane.png b/MyTracks/res/drawable-mdpi/ic_track_airplane.png similarity index 100% rename from MyTracks/res/drawable-mdpi/track_airplane.png rename to MyTracks/res/drawable-mdpi/ic_track_airplane.png diff --git a/MyTracks/res/drawable-mdpi/track_bike.png b/MyTracks/res/drawable-mdpi/ic_track_bike.png similarity index 100% rename from MyTracks/res/drawable-mdpi/track_bike.png rename to MyTracks/res/drawable-mdpi/ic_track_bike.png diff --git a/MyTracks/res/drawable-mdpi/track_boat.png b/MyTracks/res/drawable-mdpi/ic_track_boat.png similarity index 100% rename from MyTracks/res/drawable-mdpi/track_boat.png rename to MyTracks/res/drawable-mdpi/ic_track_boat.png diff --git a/MyTracks/res/drawable-mdpi/track_drive.png b/MyTracks/res/drawable-mdpi/ic_track_drive.png similarity index 100% rename from MyTracks/res/drawable-mdpi/track_drive.png rename to MyTracks/res/drawable-mdpi/ic_track_drive.png diff --git a/MyTracks/res/drawable-mdpi/track_paused.png b/MyTracks/res/drawable-mdpi/ic_track_paused.png similarity index 100% rename from MyTracks/res/drawable-mdpi/track_paused.png rename to MyTracks/res/drawable-mdpi/ic_track_paused.png diff --git a/MyTracks/res/drawable-mdpi/track_recording.png b/MyTracks/res/drawable-mdpi/ic_track_recording.png similarity index 100% rename from MyTracks/res/drawable-mdpi/track_recording.png rename to MyTracks/res/drawable-mdpi/ic_track_recording.png diff --git a/MyTracks/res/drawable-mdpi/track_run.png b/MyTracks/res/drawable-mdpi/ic_track_run.png similarity index 100% rename from MyTracks/res/drawable-mdpi/track_run.png rename to MyTracks/res/drawable-mdpi/ic_track_run.png diff --git a/MyTracks/res/drawable-mdpi/track_ski.png b/MyTracks/res/drawable-mdpi/ic_track_ski.png similarity index 100% rename from MyTracks/res/drawable-mdpi/track_ski.png rename to MyTracks/res/drawable-mdpi/ic_track_ski.png diff --git a/MyTracks/res/drawable-mdpi/track_snow_boarding.png b/MyTracks/res/drawable-mdpi/ic_track_snow_boarding.png similarity index 100% rename from MyTracks/res/drawable-mdpi/track_snow_boarding.png rename to MyTracks/res/drawable-mdpi/ic_track_snow_boarding.png diff --git a/MyTracks/res/drawable-mdpi/track_walk.png b/MyTracks/res/drawable-mdpi/ic_track_walk.png similarity index 100% rename from MyTracks/res/drawable-mdpi/track_walk.png rename to MyTracks/res/drawable-mdpi/ic_track_walk.png diff --git a/MyTracks/res/drawable-xhdpi/track_airplane.png b/MyTracks/res/drawable-xhdpi/ic_track_airplane.png similarity index 100% rename from MyTracks/res/drawable-xhdpi/track_airplane.png rename to MyTracks/res/drawable-xhdpi/ic_track_airplane.png diff --git a/MyTracks/res/drawable-xhdpi/track_bike.png b/MyTracks/res/drawable-xhdpi/ic_track_bike.png similarity index 100% rename from MyTracks/res/drawable-xhdpi/track_bike.png rename to MyTracks/res/drawable-xhdpi/ic_track_bike.png diff --git a/MyTracks/res/drawable-xhdpi/track_boat.png b/MyTracks/res/drawable-xhdpi/ic_track_boat.png similarity index 100% rename from MyTracks/res/drawable-xhdpi/track_boat.png rename to MyTracks/res/drawable-xhdpi/ic_track_boat.png diff --git a/MyTracks/res/drawable-xhdpi/track_drive.png b/MyTracks/res/drawable-xhdpi/ic_track_drive.png similarity index 100% rename from MyTracks/res/drawable-xhdpi/track_drive.png rename to MyTracks/res/drawable-xhdpi/ic_track_drive.png diff --git a/MyTracks/res/drawable-xhdpi/track_paused.png b/MyTracks/res/drawable-xhdpi/ic_track_paused.png similarity index 100% rename from MyTracks/res/drawable-xhdpi/track_paused.png rename to MyTracks/res/drawable-xhdpi/ic_track_paused.png diff --git a/MyTracks/res/drawable-xhdpi/track_recording.png b/MyTracks/res/drawable-xhdpi/ic_track_recording.png similarity index 100% rename from MyTracks/res/drawable-xhdpi/track_recording.png rename to MyTracks/res/drawable-xhdpi/ic_track_recording.png diff --git a/MyTracks/res/drawable-xhdpi/track_run.png b/MyTracks/res/drawable-xhdpi/ic_track_run.png similarity index 100% rename from MyTracks/res/drawable-xhdpi/track_run.png rename to MyTracks/res/drawable-xhdpi/ic_track_run.png diff --git a/MyTracks/res/drawable-xhdpi/track_ski.png b/MyTracks/res/drawable-xhdpi/ic_track_ski.png similarity index 100% rename from MyTracks/res/drawable-xhdpi/track_ski.png rename to MyTracks/res/drawable-xhdpi/ic_track_ski.png diff --git a/MyTracks/res/drawable-xhdpi/track_snow_boarding.png b/MyTracks/res/drawable-xhdpi/ic_track_snow_boarding.png similarity index 100% rename from MyTracks/res/drawable-xhdpi/track_snow_boarding.png rename to MyTracks/res/drawable-xhdpi/ic_track_snow_boarding.png diff --git a/MyTracks/res/drawable-xhdpi/track_walk.png b/MyTracks/res/drawable-xhdpi/ic_track_walk.png similarity index 100% rename from MyTracks/res/drawable-xhdpi/track_walk.png rename to MyTracks/res/drawable-xhdpi/ic_track_walk.png diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackEditActivity.java b/MyTracks/src/com/google/android/apps/mytracks/TrackEditActivity.java index 0aa4a761f..6295c7a5e 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/TrackEditActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/TrackEditActivity.java @@ -122,7 +122,7 @@ public class TrackEditActivity extends AbstractMyTracksActivity // Add a border around the icon Options options = new BitmapFactory.Options(); options.inJustDecodeBounds = true; - BitmapFactory.decodeResource(getResources(), R.drawable.track_airplane, options); + BitmapFactory.decodeResource(getResources(), R.drawable.ic_track_airplane, options); final int padding = 4; final int width = options.outWidth + 2 * padding; final int height = options.outHeight + 2 * padding; 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 6211080ab..38689b358 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/fragments/ChooseActivityTypeDialogFragment.java +++ b/MyTracks/src/com/google/android/apps/mytracks/fragments/ChooseActivityTypeDialogFragment.java @@ -82,7 +82,7 @@ public class ChooseActivityTypeDialogFragment extends DialogFragment { Options options = new BitmapFactory.Options(); options.inJustDecodeBounds = true; - BitmapFactory.decodeResource(getResources(), R.drawable.track_airplane, options); + BitmapFactory.decodeResource(getResources(), R.drawable.ic_track_airplane, options); int padding = 32; int width = options.outWidth + 2 * padding; int height = options.outHeight + 2 * padding; diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/ListItemUtils.java b/MyTracks/src/com/google/android/apps/mytracks/util/ListItemUtils.java index 667119d30..5f0f1c324 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/util/ListItemUtils.java +++ b/MyTracks/src/com/google/android/apps/mytracks/util/ListItemUtils.java @@ -57,7 +57,7 @@ public class ListItemUtils { String totalDistance, long startTime, String description, String sharedOwner) { if (isRecording) { - iconId = isPaused ? R.drawable.track_paused : R.drawable.track_recording; + iconId = isPaused ? R.drawable.ic_track_paused : R.drawable.ic_track_recording; iconContentDescriptionId = isPaused ? R.string.icon_pause_recording : R.string.icon_record_track; } diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/TrackIconUtils.java b/MyTracks/src/com/google/android/apps/mytracks/util/TrackIconUtils.java index 190766861..5f503641a 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/util/TrackIconUtils.java +++ b/MyTracks/src/com/google/android/apps/mytracks/util/TrackIconUtils.java @@ -50,18 +50,22 @@ public class TrackIconUtils { new LinkedHashMap>(); static { - map.put(RUN, new Pair(R.string.activity_type_running, R.drawable.track_run)); map.put( - WALK, new Pair(R.string.activity_type_walking, R.drawable.track_walk)); - map.put(BIKE, new Pair(R.string.activity_type_biking, R.drawable.track_bike)); + RUN, new Pair(R.string.activity_type_running, R.drawable.ic_track_run)); map.put( - DRIVE, new Pair(R.string.activity_type_driving, R.drawable.track_drive)); - map.put(SKI, new Pair(R.string.activity_type_skiing, R.drawable.track_ski)); + WALK, new Pair(R.string.activity_type_walking, R.drawable.ic_track_walk)); + map.put( + BIKE, new Pair(R.string.activity_type_biking, R.drawable.ic_track_bike)); + map.put(DRIVE, + new Pair(R.string.activity_type_driving, R.drawable.ic_track_drive)); + map.put( + SKI, new Pair(R.string.activity_type_skiing, R.drawable.ic_track_ski)); map.put(SNOW_BOARDING, new Pair( - R.string.activity_type_snow_boarding, R.drawable.track_snow_boarding)); + R.string.activity_type_snow_boarding, R.drawable.ic_track_snow_boarding)); map.put(AIRPLANE, - new Pair(R.string.activity_type_airplane, R.drawable.track_airplane)); - map.put(BOAT, new Pair(R.string.activity_type_boat, R.drawable.track_boat)); + new Pair(R.string.activity_type_airplane, R.drawable.ic_track_airplane)); + map.put( + BOAT, new Pair(R.string.activity_type_boat, R.drawable.ic_track_boat)); } private static int[] airplane = new int[] { @@ -96,10 +100,10 @@ public class TrackIconUtils { */ public static int getIconDrawable(String iconValue) { if (iconValue == null || iconValue.equals("")) { - return R.drawable.track_walk; + return R.drawable.ic_track_walk; } Pair pair = map.get(iconValue); - return pair == null ? R.drawable.track_walk : pair.second; + return pair == null ? R.drawable.ic_track_walk : pair.second; } /**