diff --git a/src/ch/blinkenlights/android/vanilla/LibraryActivity.java b/src/ch/blinkenlights/android/vanilla/LibraryActivity.java index 41b86bec..44ebfe91 100644 --- a/src/ch/blinkenlights/android/vanilla/LibraryActivity.java +++ b/src/ch/blinkenlights/android/vanilla/LibraryActivity.java @@ -195,52 +195,14 @@ public class LibraryActivity mViewPager = pager; SharedPreferences settings = PlaybackService.getSettings(this); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { - pager.setOnPageChangeListener(pagerAdapter); + pager.setOnPageChangeListener(pagerAdapter); - View controls = getLayoutInflater().inflate(R.layout.actionbar_controls, null); - mTitle = (TextView)controls.findViewById(R.id.title); - mArtist = (TextView)controls.findViewById(R.id.artist); - mCover = (ImageView)controls.findViewById(R.id.cover); - controls.setOnClickListener(this); - mActionControls = controls; - } else { - TabPageIndicator tabs = new TabPageIndicator(this); - tabs.setViewPager(pager); - tabs.setOnPageChangeListener(pagerAdapter); - mTabs = tabs; - - LinearLayout content = (LinearLayout)findViewById(R.id.content); - content.addView(tabs, 0, new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT)); - - if (settings.getBoolean(PrefKeys.CONTROLS_IN_SELECTOR, false)) { - getLayoutInflater().inflate(R.layout.library_controls, content, true); - - mControls = findViewById(R.id.controls); - - mTitle = (TextView)mControls.findViewById(R.id.title); - mArtist = (TextView)mControls.findViewById(R.id.artist); - mCover = (ImageView)mControls.findViewById(R.id.cover); - View previous = mControls.findViewById(R.id.previous); - mPlayPauseButton = (ImageButton)mControls.findViewById(R.id.play_pause); - View next = mControls.findViewById(R.id.next); - - mCover.setOnClickListener(this); - previous.setOnClickListener(this); - mPlayPauseButton.setOnClickListener(this); - next.setOnClickListener(this); - - mShuffleButton = (ImageButton)findViewById(R.id.shuffle); - mShuffleButton.setOnClickListener(this); - registerForContextMenu(mShuffleButton); - mEndButton = (ImageButton)findViewById(R.id.end_action); - mEndButton.setOnClickListener(this); - registerForContextMenu(mEndButton); - - mEmptyQueue = findViewById(R.id.empty_queue); - mEmptyQueue.setOnClickListener(this); - } - } + View controls = getLayoutInflater().inflate(R.layout.actionbar_controls, null); + mTitle = (TextView)controls.findViewById(R.id.title); + mArtist = (TextView)controls.findViewById(R.id.artist); + mCover = (ImageView)controls.findViewById(R.id.cover); + controls.setOnClickListener(this); + mActionControls = controls; loadTabOrder(); int page = settings.getInt(PrefKeys.LIBRARY_PAGE, 0); @@ -279,11 +241,7 @@ public class LibraryActivity private void loadTabOrder() { if (mPagerAdapter.loadTabOrder()) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { - CompatHoneycomb.addActionBarTabs(this); - } else { - mTabs.notifyDataSetChanged(); - } + CompatHoneycomb.addActionBarTabs(this); } } @@ -892,16 +850,11 @@ public class LibraryActivity @Override public boolean onCreateOptionsMenu(Menu menu) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { - MenuItem controls = menu.add(null); - CompatHoneycomb.setActionView(controls, mActionControls); - CompatHoneycomb.setShowAsAction(controls, MenuItem.SHOW_AS_ACTION_ALWAYS); - MenuItem search = menu.add(0, MENU_SEARCH, 0, R.string.search).setIcon(R.drawable.ic_menu_search); - CompatHoneycomb.setShowAsAction(search, MenuItem.SHOW_AS_ACTION_IF_ROOM); - } else { - menu.add(0, MENU_SEARCH, 0, R.string.search).setIcon(R.drawable.ic_menu_search); - menu.add(0, MENU_PLAYBACK, 0, R.string.playback_view).setIcon(R.drawable.ic_menu_gallery); - } + MenuItem controls = menu.add(null); + CompatHoneycomb.setActionView(controls, mActionControls); + CompatHoneycomb.setShowAsAction(controls, MenuItem.SHOW_AS_ACTION_ALWAYS); + MenuItem search = menu.add(0, MENU_SEARCH, 0, R.string.search).setIcon(R.drawable.ic_menu_search); + CompatHoneycomb.setShowAsAction(search, MenuItem.SHOW_AS_ACTION_IF_ROOM); menu.add(0, MENU_SORT, 0, R.string.sort_by).setIcon(R.drawable.ic_menu_sort_alphabetically); return super.onCreateOptionsMenu(menu); } @@ -1140,9 +1093,7 @@ public class LibraryActivity mCurrentAdapter = adapter; mLastActedId = LibraryAdapter.INVALID_ID; updateLimiterViews(); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { - CompatHoneycomb.selectTab(this, position); - } + CompatHoneycomb.selectTab(this, position); if (adapter != null && adapter.getLimiter() == null) { // Save current page so it is opened on next startup. Don't save if // the page was expanded to, as the expanded page isn't the starting diff --git a/src/ch/blinkenlights/android/vanilla/LibraryPagerAdapter.java b/src/ch/blinkenlights/android/vanilla/LibraryPagerAdapter.java index 5b1c141c..0903a8e4 100644 --- a/src/ch/blinkenlights/android/vanilla/LibraryPagerAdapter.java +++ b/src/ch/blinkenlights/android/vanilla/LibraryPagerAdapter.java @@ -829,9 +829,7 @@ public class LibraryPagerAdapter { mActivity.mFakeTarget = true; list.setFastScrollEnabled(true); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { - CompatHoneycomb.setFastScrollAlwaysVisible(list); - } + CompatHoneycomb.setFastScrollAlwaysVisible(list); mActivity.mFakeTarget = false; } } diff --git a/src/ch/blinkenlights/android/vanilla/MediaButtonReceiver.java b/src/ch/blinkenlights/android/vanilla/MediaButtonReceiver.java index 5a5c85c5..dea34e13 100644 --- a/src/ch/blinkenlights/android/vanilla/MediaButtonReceiver.java +++ b/src/ch/blinkenlights/android/vanilla/MediaButtonReceiver.java @@ -219,7 +219,7 @@ public class MediaButtonReceiver extends BroadcastReceiver { */ public static void registerMediaButton(Context context) { - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.FROYO || !useHeadsetControls(context)) + if (!useHeadsetControls(context)) return; AudioManager audioManager = (AudioManager)context.getSystemService(Context.AUDIO_SERVICE); @@ -234,9 +234,6 @@ public class MediaButtonReceiver extends BroadcastReceiver { */ public static void unregisterMediaButton(Context context) { - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.FROYO) - return; - AudioManager audioManager = (AudioManager)context.getSystemService(Context.AUDIO_SERVICE); ComponentName receiver = new ComponentName(context.getPackageName(), MediaButtonReceiver.class.getName()); CompatFroyo.unregisterMediaButtonEventReceiver(audioManager, receiver); diff --git a/src/ch/blinkenlights/android/vanilla/MediaUtils.java b/src/ch/blinkenlights/android/vanilla/MediaUtils.java index 1ee81900..32e23afc 100644 --- a/src/ch/blinkenlights/android/vanilla/MediaUtils.java +++ b/src/ch/blinkenlights/android/vanilla/MediaUtils.java @@ -228,35 +228,14 @@ public class MediaUtils { public static long queryGenreForSong(ContentResolver resolver, long id) { String[] projection = { "_id" }; - - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { - Uri uri = CompatHoneycomb.getContentUriForAudioId((int)id); - Cursor cursor = resolver.query(uri, projection, null, null, null); - if (cursor != null) { - if (cursor.moveToNext()) - return cursor.getLong(0); - cursor.close(); - } - } else { - Uri uri = MediaStore.Audio.Genres.EXTERNAL_CONTENT_URI; - Cursor cursor = resolver.query(uri, projection, null, null, null); - if (cursor != null) { - String selection = "_id=" + id; - while (cursor.moveToNext()) { - // check if the given song belongs to this genre - long genreId = cursor.getLong(0); - Uri genreUri = MediaStore.Audio.Genres.Members.getContentUri("external", genreId); - Cursor c = resolver.query(genreUri, projection, selection, null, null); - if (c != null) { - if (c.getCount() == 1) - return genreId; - c.close(); - } - } - cursor.close(); - } + Uri uri = CompatHoneycomb.getContentUriForAudioId((int)id); + Cursor cursor = resolver.query(uri, projection, null, null, null); + + if (cursor != null) { + if (cursor.moveToNext()) + return cursor.getLong(0); + cursor.close(); } - return 0; }