Assorted typo fixes.

Change-Id: I57f2200ea2dea6109751fb6774f93262573c7b49

diff --git a/src/com/andrew/apollo/MusicPlaybackService.java b/src/com/andrew/apollo/MusicPlaybackService.java
index b3adfbb..cc7ad86 100644 (file)
--- a/src/com/andrew/apollo/MusicPlaybackService.java
+++ b/src/com/andrew/apollo/MusicPlaybackService.java
@@ -290,12 +290,12 @@ public class MusicPlaybackService extends Service {
 
     /**
      * Used to save the queue as reverse hexadecimal numbers, which we can
-     * generate faster than normal decimal or // hexadecimal numbers, which in
-     * turn allows us to save the playlist // more often without worrying too
+     * generate faster than normal decimal or hexadecimal numbers, which in
+     * turn allows us to save the playlist more often without worrying too
      * much about performance
      */
     private static final char HEX_DIGITS[] = new char[] {
-            '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
+        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
     };
 
     /**
@@ -499,7 +499,7 @@ public class MusicPlaybackService extends Service {
         mRecentsCache = RecentStore.getInstance(this);
         mFavoritesCache = FavoritesStore.getInstance(this);
 
-        // Initialze the notification helper
+        // Initialize the notification helper
         mNotificationHelper = new NotificationHelper(this);
 
         // Initialize the image fetcher
@@ -519,7 +519,7 @@ public class MusicPlaybackService extends Service {
         mPlayerHandler = new MusicPlayerHandler(this, thread.getLooper());
         mDelayedStopHandler = new DelayedHandler(this);
 
-        // Initialze the audio manager and register any headset controls for
+        // Initialize the audio manager and register any headset controls for
         // playback
         mAudioManager = (AudioManager)getSystemService(Context.AUDIO_SERVICE);
         mMediaButtonReceiverComponent = new ComponentName(getPackageName(),
@@ -528,7 +528,7 @@ public class MusicPlaybackService extends Service {
 
         // Use the remote control APIs (if available and the user allows it) to
         // set the playback state
-        mEnableLockscreenControls = PreferenceUtils.getInstace(this).enableLockscreenControls();
+        mEnableLockscreenControls = PreferenceUtils.getInstance(this).enableLockscreenControls();
         setUpRemoteControlClient();
 
         // Initialize the preferences
@@ -537,11 +537,11 @@ public class MusicPlaybackService extends Service {
 
         registerExternalStorageListener();
 
-        // Initialze the media player
+        // Initialize the media player
         mPlayer = new MultiPlayer(this);
         mPlayer.setHandler(mPlayerHandler);
 
-        // Initialze the intent filter and each action
+        // Initialize the intent filter and each action
         final IntentFilter filter = new IntentFilter();
         filter.addAction(SERVICECMD);
         filter.addAction(TOGGLEPAUSE_ACTION);

diff --git a/src/com/andrew/apollo/cache/ImageFetcher.java b/src/com/andrew/apollo/cache/ImageFetcher.java
index c679bfd..2a5fc45 100644 (file)
--- a/src/com/andrew/apollo/cache/ImageFetcher.java
+++ b/src/com/andrew/apollo/cache/ImageFetcher.java
@@ -104,7 +104,7 @@ public class ImageFetcher extends ImageWorker {
         switch (imageType) {
             case ARTIST:
                 if (!TextUtils.isEmpty(artistName)) {
-                    if (PreferenceUtils.getInstace(mContext).downloadMissingArtistImages()) {
+                    if (PreferenceUtils.getInstance(mContext).downloadMissingArtistImages()) {
                         final PaginatedResult<Image> paginatedResult = Artist.getImages(mContext,
                                 artistName);
                         if (paginatedResult != null) {
@@ -122,7 +122,7 @@ public class ImageFetcher extends ImageWorker {
                 break;
             case ALBUM:
                 if (!TextUtils.isEmpty(artistName) && !TextUtils.isEmpty(albumName)) {
-                    if (PreferenceUtils.getInstace(mContext).downloadMissingArtwork()) {
+                    if (PreferenceUtils.getInstance(mContext).downloadMissingArtwork()) {
                         final Artist correction = Artist.getCorrection(mContext, artistName);
                         if (correction != null) {
                             final Album album = Album.getInfo(mContext, correction.getName(),

diff --git a/src/com/andrew/apollo/format/PrefixHighlighter.java b/src/com/andrew/apollo/format/PrefixHighlighter.java
index b58d45a..7a2783b 100644 (file)
--- a/src/com/andrew/apollo/format/PrefixHighlighter.java
+++ b/src/com/andrew/apollo/format/PrefixHighlighter.java
@@ -33,7 +33,7 @@ public class PrefixHighlighter {
      * @param prefixHighlightColor The color used to highlight the prefixes.
      */
     public PrefixHighlighter(final Context context) {
-        mPrefixHighlightColor = PreferenceUtils.getInstace(context).getDefaultThemeColor(context);
+        mPrefixHighlightColor = PreferenceUtils.getInstance(context).getDefaultThemeColor(context);
     }
 
     /**

diff --git a/src/com/andrew/apollo/loaders/AlbumLoader.java b/src/com/andrew/apollo/loaders/AlbumLoader.java
index 34bb0af..12543f6 100644 (file)
--- a/src/com/andrew/apollo/loaders/AlbumLoader.java
+++ b/src/com/andrew/apollo/loaders/AlbumLoader.java
@@ -111,6 +111,6 @@ public class AlbumLoader extends WrappedAsyncTaskLoader<List<Album>> {
                         AlbumColumns.NUMBER_OF_SONGS,
                         /* 4 */
                         AlbumColumns.FIRST_YEAR
-                }, null, null, PreferenceUtils.getInstace(context).getAlbumSortOrder());
+                }, null, null, PreferenceUtils.getInstance(context).getAlbumSortOrder());
     }
 }

diff --git a/src/com/andrew/apollo/loaders/AlbumSongLoader.java b/src/com/andrew/apollo/loaders/AlbumSongLoader.java
index 39fff97..ec0ceb9 100644 (file)
--- a/src/com/andrew/apollo/loaders/AlbumSongLoader.java
+++ b/src/com/andrew/apollo/loaders/AlbumSongLoader.java
@@ -125,7 +125,7 @@ public class AlbumSongLoader extends WrappedAsyncTaskLoader<List<Song>> {
                         /* 4 */
                         AudioColumns.DURATION
                 }, selection.toString(), null,
-                PreferenceUtils.getInstace(context).getAlbumSongSortOrder());
+                PreferenceUtils.getInstance(context).getAlbumSongSortOrder());
     }
 
 }

diff --git a/src/com/andrew/apollo/loaders/ArtistAlbumLoader.java b/src/com/andrew/apollo/loaders/ArtistAlbumLoader.java
index eb20a0e..d9bec68 100644 (file)
--- a/src/com/andrew/apollo/loaders/ArtistAlbumLoader.java
+++ b/src/com/andrew/apollo/loaders/ArtistAlbumLoader.java
@@ -116,6 +116,6 @@ public class ArtistAlbumLoader extends WrappedAsyncTaskLoader<List<Album>> {
                         AlbumColumns.NUMBER_OF_SONGS,
                         /* 4 */
                         AlbumColumns.FIRST_YEAR
-                }, null, null, PreferenceUtils.getInstace(context).getArtistAlbumSortOrder());
+                }, null, null, PreferenceUtils.getInstance(context).getArtistAlbumSortOrder());
     }
 }

diff --git a/src/com/andrew/apollo/loaders/ArtistLoader.java b/src/com/andrew/apollo/loaders/ArtistLoader.java
index 0b63dcb..ada201c 100644 (file)
--- a/src/com/andrew/apollo/loaders/ArtistLoader.java
+++ b/src/com/andrew/apollo/loaders/ArtistLoader.java
@@ -106,6 +106,6 @@ public class ArtistLoader extends WrappedAsyncTaskLoader<List<Artist>> {
                         ArtistColumns.NUMBER_OF_ALBUMS,
                         /* 3 */
                         ArtistColumns.NUMBER_OF_TRACKS
-                }, null, null, PreferenceUtils.getInstace(context).getArtistSortOrder());
+                }, null, null, PreferenceUtils.getInstance(context).getArtistSortOrder());
     }
 }

diff --git a/src/com/andrew/apollo/loaders/ArtistSongLoader.java b/src/com/andrew/apollo/loaders/ArtistSongLoader.java
index e71d374..76f3eb3 100644 (file)
--- a/src/com/andrew/apollo/loaders/ArtistSongLoader.java
+++ b/src/com/andrew/apollo/loaders/ArtistSongLoader.java
@@ -117,7 +117,7 @@ public class ArtistSongLoader extends WrappedAsyncTaskLoader<List<Song>> {
                         /* 3 */
                         AudioColumns.ALBUM
                 }, selection.toString(), null,
-                PreferenceUtils.getInstace(context).getArtistSongSortOrder());
+                PreferenceUtils.getInstance(context).getArtistSongSortOrder());
     }
 
 }

diff --git a/src/com/andrew/apollo/loaders/SongLoader.java b/src/com/andrew/apollo/loaders/SongLoader.java
index 9959302..071959f 100644 (file)
--- a/src/com/andrew/apollo/loaders/SongLoader.java
+++ b/src/com/andrew/apollo/loaders/SongLoader.java
@@ -109,6 +109,6 @@ public class SongLoader extends WrappedAsyncTaskLoader<List<Song>> {
                         /* 3 */
                         AudioColumns.ALBUM
                 }, mSelection.toString(), null,
-                PreferenceUtils.getInstace(context).getSongSortOrder());
+                PreferenceUtils.getInstance(context).getSongSortOrder());
     }
 }

diff --git a/src/com/andrew/apollo/ui/activities/ProfileActivity.java b/src/com/andrew/apollo/ui/activities/ProfileActivity.java
index b3c49f7..fc8b2ad 100644 (file)
--- a/src/com/andrew/apollo/ui/activities/ProfileActivity.java
+++ b/src/com/andrew/apollo/ui/activities/ProfileActivity.java
@@ -111,7 +111,7 @@ public class ProfileActivity extends BaseActivity implements OnPageChangeListene
         setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
 
         // Get the preferences
-        mPreferences = PreferenceUtils.getInstace(this);
+        mPreferences = PreferenceUtils.getInstance(this);
 
         // Initialze the image fetcher
         mImageFetcher = ApolloUtils.getImageFetcher(this);

diff --git a/src/com/andrew/apollo/ui/activities/SettingsActivity.java b/src/com/andrew/apollo/ui/activities/SettingsActivity.java
index 4021d5f..c2f947b 100644 (file)
--- a/src/com/andrew/apollo/ui/activities/SettingsActivity.java
+++ b/src/com/andrew/apollo/ui/activities/SettingsActivity.java
@@ -59,7 +59,7 @@ public class SettingsActivity extends PreferenceActivity {
         overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
 
         // Get the preferences
-        mPreferences = PreferenceUtils.getInstace(this);
+        mPreferences = PreferenceUtils.getInstance(this);
 
         // Initialze the image cache
         mImageCache = ImageCache.getInstance(this);

diff --git a/src/com/andrew/apollo/ui/activities/ShortcutActivity.java b/src/com/andrew/apollo/ui/activities/ShortcutActivity.java
index 679e6d0..32e562b 100644 (file)
--- a/src/com/andrew/apollo/ui/activities/ShortcutActivity.java
+++ b/src/com/andrew/apollo/ui/activities/ShortcutActivity.java
@@ -127,7 +127,7 @@ public class ShortcutActivity extends FragmentActivity implements ServiceConnect
                 // Make sure everthing is good-to-go
                 if (mService != null) {
 
-                    // Frist, check the artist MIME type
+                    // First, check the artist MIME type
                     if (getType(MediaStore.Audio.Artists.CONTENT_TYPE)) {
 
                         // Shuffle the artist track list

diff --git a/src/com/andrew/apollo/ui/fragments/AlbumFragment.java b/src/com/andrew/apollo/ui/fragments/AlbumFragment.java
index 55466a7..5ee70c7 100644 (file)
--- a/src/com/andrew/apollo/ui/fragments/AlbumFragment.java
+++ b/src/com/andrew/apollo/ui/fragments/AlbumFragment.java
@@ -452,12 +452,12 @@ public class AlbumFragment extends Fragment implements LoaderCallbacks<List<Albu
     }
 
     private boolean isSimpleLayout() {
-        return PreferenceUtils.getInstace(getActivity()).isSimpleLayout(ALBUM_LAYOUT,
+        return PreferenceUtils.getInstance(getActivity()).isSimpleLayout(ALBUM_LAYOUT,
                 getActivity());
     }
 
     private boolean isDetailedLayout() {
-        return PreferenceUtils.getInstace(getActivity()).isDetailedLayout(ALBUM_LAYOUT,
+        return PreferenceUtils.getInstance(getActivity()).isDetailedLayout(ALBUM_LAYOUT,
                 getActivity());
     }
 }

diff --git a/src/com/andrew/apollo/ui/fragments/ArtistFragment.java b/src/com/andrew/apollo/ui/fragments/ArtistFragment.java
index 3c3554b..45178fa 100644 (file)
--- a/src/com/andrew/apollo/ui/fragments/ArtistFragment.java
+++ b/src/com/andrew/apollo/ui/fragments/ArtistFragment.java
@@ -449,12 +449,12 @@ public class ArtistFragment extends Fragment implements LoaderCallbacks<List<Art
     }
 
     private boolean isSimpleLayout() {
-        return PreferenceUtils.getInstace(getActivity()).isSimpleLayout(ARTIST_LAYOUT,
+        return PreferenceUtils.getInstance(getActivity()).isSimpleLayout(ARTIST_LAYOUT,
                 getActivity());
     }
 
     private boolean isDetailedLayout() {
-        return PreferenceUtils.getInstace(getActivity()).isDetailedLayout(ARTIST_LAYOUT,
+        return PreferenceUtils.getInstance(getActivity()).isDetailedLayout(ARTIST_LAYOUT,
                 getActivity());
     }
 }

diff --git a/src/com/andrew/apollo/ui/fragments/RecentFragment.java b/src/com/andrew/apollo/ui/fragments/RecentFragment.java
index b32a6cf..f28aaaa 100644 (file)
--- a/src/com/andrew/apollo/ui/fragments/RecentFragment.java
+++ b/src/com/andrew/apollo/ui/fragments/RecentFragment.java
@@ -418,12 +418,12 @@ public class RecentFragment extends Fragment implements LoaderCallbacks<List<Alb
     }
 
     private boolean isSimpleLayout() {
-        return PreferenceUtils.getInstace(getActivity()).isSimpleLayout(RECENT_LAYOUT,
+        return PreferenceUtils.getInstance(getActivity()).isSimpleLayout(RECENT_LAYOUT,
                 getActivity());
     }
 
     private boolean isDetailedLayout() {
-        return PreferenceUtils.getInstace(getActivity()).isDetailedLayout(RECENT_LAYOUT,
+        return PreferenceUtils.getInstance(getActivity()).isDetailedLayout(RECENT_LAYOUT,
                 getActivity());
     }
 }

diff --git a/src/com/andrew/apollo/ui/fragments/phone/MusicBrowserPhoneFragment.java b/src/com/andrew/apollo/ui/fragments/phone/MusicBrowserPhoneFragment.java
index a25cebd..05a2ee4 100644 (file)
--- a/src/com/andrew/apollo/ui/fragments/phone/MusicBrowserPhoneFragment.java
+++ b/src/com/andrew/apollo/ui/fragments/phone/MusicBrowserPhoneFragment.java
@@ -80,7 +80,7 @@ public class MusicBrowserPhoneFragment extends Fragment implements
     public void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         // Get the preferences
-        mPreferences = PreferenceUtils.getInstace(getActivity());
+        mPreferences = PreferenceUtils.getInstance(getActivity());
     }
 
     /**

diff --git a/src/com/andrew/apollo/utils/ApolloUtils.java b/src/com/andrew/apollo/utils/ApolloUtils.java
index af5ecf3..dc9bcbb 100644 (file)
--- a/src/com/andrew/apollo/utils/ApolloUtils.java
+++ b/src/com/andrew/apollo/utils/ApolloUtils.java
@@ -135,7 +135,7 @@ public final class ApolloUtils {
         }
 
         boolean state = false;
-        final boolean onlyOnWifi = PreferenceUtils.getInstace(context).onlyOnWifi();
+        final boolean onlyOnWifi = PreferenceUtils.getInstance(context).onlyOnWifi();
 
         /* Monitor network connections */
         final ConnectivityManager connectivityManager = (ConnectivityManager)context
@@ -331,7 +331,7 @@ public final class ApolloUtils {
 
                     @Override
                     public void onClick(final DialogInterface dialog, final int which) {
-                        PreferenceUtils.getInstace(context).setDefaultThemeColor(
+                        PreferenceUtils.getInstance(context).setDefaultThemeColor(
                                 colorPickerView.getColor());
                     }
                 });

diff --git a/src/com/andrew/apollo/utils/PreferenceUtils.java b/src/com/andrew/apollo/utils/PreferenceUtils.java
index 5abb28b..b6724b0 100644 (file)
--- a/src/com/andrew/apollo/utils/PreferenceUtils.java
+++ b/src/com/andrew/apollo/utils/PreferenceUtils.java
@@ -96,9 +96,9 @@ public final class PreferenceUtils {
 
     /**
      * @param context The {@link Context} to use.
-     * @return A singelton of this class
+     * @return A singleton of this class
      */
-    public static final PreferenceUtils getInstace(final Context context) {
+    public static final PreferenceUtils getInstance(final Context context) {
         if (sInstance == null) {
             sInstance = new PreferenceUtils(context.getApplicationContext());
         }

diff --git a/src/com/andrew/apollo/utils/ThemeUtils.java b/src/com/andrew/apollo/utils/ThemeUtils.java
index 6925e6f..70e3160 100644 (file)
--- a/src/com/andrew/apollo/utils/ThemeUtils.java
+++ b/src/com/andrew/apollo/utils/ThemeUtils.java
@@ -127,7 +127,7 @@ public class ThemeUtils {
             setThemePackageName(APOLLO_PACKAGE);
         }
         // Get the current theme color
-        mCurrentThemeColor = PreferenceUtils.getInstace(context).getDefaultThemeColor(context);
+        mCurrentThemeColor = PreferenceUtils.getInstance(context).getDefaultThemeColor(context);
         // Inflate the custom layout
         mActionBarLayout = LayoutInflater.from(context).inflate(R.layout.action_bar, null);
     }

diff --git a/src/com/andrew/apollo/widgets/ColorSchemeDialog.java b/src/com/andrew/apollo/widgets/ColorSchemeDialog.java
index 30aeef2..a6912c2 100644 (file)
--- a/src/com/andrew/apollo/widgets/ColorSchemeDialog.java
+++ b/src/com/andrew/apollo/widgets/ColorSchemeDialog.java
@@ -61,7 +61,7 @@ public class ColorSchemeDialog extends AlertDialog implements
     public ColorSchemeDialog(final Context context) {
         super(context);
         getWindow().setFormat(PixelFormat.RGBA_8888);
-        mCurrentColor = PreferenceUtils.getInstace(context).getDefaultThemeColor(context);
+        mCurrentColor = PreferenceUtils.getInstance(context).getDefaultThemeColor(context);
         setUp(mCurrentColor);
     }