norohind/vanilla
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Fix some deprecation warnings

Browse Source
This commit is contained in:
Christopher Eby 2012-03-23 17:21:39 -05:00
parent cc582a2842
commit 0965430b64
6 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/android/support/v4/view/ViewPager.java
View File

@ -2088,7 +2088,7 @@ public class ViewPager extends ViewGroup {
public int gravity; public int gravity;
public LayoutParams() { public LayoutParams() {
super(FILL_PARENT, FILL_PARENT); super(MATCH_PARENT, MATCH_PARENT);
} }
public LayoutParams(Context context, AttributeSet attrs) { public LayoutParams(Context context, AttributeSet attrs) {

6
src/com/viewpagerindicator/TabPageIndicator.java
View File

@ -57,7 +57,7 @@ public class TabPageIndicator extends HorizontalScrollView
setHorizontalScrollBarEnabled(false); setHorizontalScrollBarEnabled(false);
mTabLayout = new LinearLayout(getContext()); mTabLayout = new LinearLayout(getContext());
addView(mTabLayout, new ViewGroup.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.FILL_PARENT)); addView(mTabLayout, new ViewGroup.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.MATCH_PARENT));
} }
@Override @Override
@ -129,7 +129,7 @@ public class TabPageIndicator extends HorizontalScrollView
tabView.setOnClickListener(this); tabView.setOnClickListener(this);
tabView.setText(text); tabView.setText(text);
mTabLayout.addView(tabView, new LinearLayout.LayoutParams(0, LayoutParams.FILL_PARENT, 1)); mTabLayout.addView(tabView, new LinearLayout.LayoutParams(0, LayoutParams.MATCH_PARENT, 1));
} }
@Override @Override
@ -186,7 +186,7 @@ public class TabPageIndicator extends HorizontalScrollView
final int tabCount = mTabLayout.getChildCount(); final int tabCount = mTabLayout.getChildCount();
for (int i = 0; i < tabCount; i++) { for (int i = 0; i < tabCount; i++) {
final View child = mTabLayout.getChildAt(i); final View child = mTabLayout.getChildAt(i);
final boolean isSelected = (i == item); final boolean isSelected = i == item;
child.setSelected(isSelected); child.setSelected(isSelected);
if (isSelected) { if (isSelected) {
animateToTab(item); animateToTab(item);

4
src/org/kreed/vanilla/FullPlaybackActivity.java
View File

@ -250,8 +250,8 @@ public class FullPlaybackActivity extends PlaybackActivity
view.setClickable(true); view.setClickable(true);
view.setOnClickListener(this); view.setOnClickListener(this);
addContentView(view, addContentView(view,
new ViewGroup.LayoutParams(LinearLayout.LayoutParams.FILL_PARENT, new ViewGroup.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,
LinearLayout.LayoutParams.FILL_PARENT)); LinearLayout.LayoutParams.MATCH_PARENT));
mOverlayText = view; mOverlayText = view;
} else { } else {
mOverlayText.setVisibility(View.VISIBLE); mOverlayText.setVisibility(View.VISIBLE);

2
src/org/kreed/vanilla/IdlePreference.java
View File

@ -69,7 +69,7 @@ public class IdlePreference extends DialogPreference implements SeekBar.OnSeekBa
protected void onPrepareDialogBuilder(Builder builder) protected void onPrepareDialogBuilder(Builder builder)
{ {
Context context = getContext(); Context context = getContext();
ViewGroup.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); ViewGroup.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
mValue = getPersistedInt(DEFAULT_VALUE); mValue = getPersistedInt(DEFAULT_VALUE);

2
src/org/kreed/vanilla/MediaAdapter.java
View File

@ -427,7 +427,7 @@ public class MediaAdapter
{ {
if (mSections == null) { if (mSections == null) {
if (mSortMode == 0) if (mSortMode == 0)
mSections = mIndexer.getSections(); mSections = MusicAlphabetIndexer.getSections();
else else
mSections = new String[] { " " }; mSections = new String[] { " " };
} }

15
src/org/kreed/vanilla/PlaybackService.java
View File

@ -685,8 +685,23 @@ public final class PlaybackService extends Service
/** /**
* Return true if audio would play through the speaker. * Return true if audio would play through the speaker.
*/ */
@SuppressWarnings("deprecation")
private boolean isSpeakerOn() private boolean isSpeakerOn()
{ {
// Android seems very intent on making this difficult to detect. In
// Android 1.5, this worked great with AudioManager.getRouting(),
// which definitively answered if audio would play through the speakers.
// Android 2.0 deprecated this method and made it no longer function.
// So this hacky alternative was created. But with Android 4.0,
// isWiredHeadsetOn() was deprecated, though it still works. But for
// how much longer?
//
// I'd like to remove this feature so I can avoid fighting Android to
// keep it working, but some users seem to really like it. I think the
// best solution to this problem is for Android to have separate media
// volumes for speaker, headphones, etc. That way the speakers can be
// muted system-wide. There is not much I can do about that here,
// though.
return !mAudioManager.isWiredHeadsetOn() && !mAudioManager.isBluetoothA2dpOn() && !mAudioManager.isBluetoothScoOn(); return !mAudioManager.isWiredHeadsetOn() && !mAudioManager.isBluetoothA2dpOn() && !mAudioManager.isBluetoothScoOn();
} }