Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 207d00c1: am f2897fe4: Merge change Idc34a3f7 into eclair

Browse Source 
Merge commit '207d00c13c02d301ff4ec302b1ee8cd7c256a4a5' into eclair-mr2-plus-aosp

* commit '207d00c13c02d301ff4ec302b1ee8cd7c256a4a5':
  Fix 2209086: add drawables for SlidingTab states in PhoneApp. Update string file for new SlidingTab sound states.
This commit is contained in:
Jim Miller
2009-11-11 20:18:58 -08:00
committed by Android Git Automerger
parent 7bd2179f22 207d00c13c
commit 809b259488
6 changed files with 131 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/java/com/android/internal/widget/SlidingTab.java
View File

@@ -20,6 +20,7 @@ import android.content.Context;
import android.content.res.Resources;
import android.content.res.TypedArray;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.os.Handler;
import android.os.Message;
import android.os.Vibrator;
@@ -41,6 +42,7 @@ import com.android.internal.R;
*
*/
public class SlidingTab extends ViewGroup {
private static final int ANIMATION_DURATION = 250; // animation transition duration (in ms)
private static final String LOG_TAG = "SlidingTab";
private static final boolean DBG = false;
private static final int HORIZONTAL = 0; // as defined in attrs.xml
@@ -249,10 +251,12 @@ public class SlidingTab extends ViewGroup {
* @param alignment which side to align the widget to
*/
void layout(int l, int t, int r, int b, int alignment) {
final int handleWidth = tab.getBackground().getIntrinsicWidth();
final int handleHeight = tab.getBackground().getIntrinsicHeight();
final int targetWidth = target.getDrawable().getIntrinsicWidth();
final int targetHeight = target.getDrawable().getIntrinsicHeight();
final Drawable tabBackground = tab.getBackground();
final int handleWidth = tabBackground.getIntrinsicWidth();
final int handleHeight = tabBackground.getIntrinsicHeight();
final Drawable targetDrawable = target.getDrawable();
final int targetWidth = targetDrawable.getIntrinsicWidth();
final int targetHeight = targetDrawable.getIntrinsicHeight();
final int parentWidth = r - l;
final int parentHeight = b - t;
@@ -347,10 +351,11 @@ public class SlidingTab extends ViewGroup {
throw new RuntimeException(LOG_TAG + " cannot have UNSPECIFIED dimensions");
}
final int leftTabWidth = (int) (mDensity * mLeftSlider.getTabWidth() + 0.5f);
final int rightTabWidth = (int) (mDensity * mRightSlider.getTabWidth() + 0.5f);
final int leftTabHeight = (int) (mDensity * mLeftSlider.getTabHeight() + 0.5f);
final int rightTabHeight = (int) (mDensity * mRightSlider.getTabHeight() + 0.5f);
final float density = mDensity;
final int leftTabWidth = (int) (density * mLeftSlider.getTabWidth() + 0.5f);
final int rightTabWidth = (int) (density * mRightSlider.getTabWidth() + 0.5f);
final int leftTabHeight = (int) (density * mLeftSlider.getTabHeight() + 0.5f);
final int rightTabHeight = (int) (density * mRightSlider.getTabHeight() + 0.5f);
final int width;
final int height;
if (isHorizontal()) {
@@ -441,14 +446,14 @@ public class SlidingTab extends ViewGroup {
OnTriggerListener.LEFT_HANDLE : OnTriggerListener.RIGHT_HANDLE);
// TODO: This is a place holder for the real animation. It just holds
// the screen for 500ms.
// the screen for the duration of the animation for now.
mAnimating = true;
mHandler.postDelayed(new Runnable() {
public void run() {
resetView();
mAnimating = false;
}
}, 500);
}, ANIMATION_DURATION);
}
if (isHorizontal() && (y <= handle.getBottom() && y >= handle.getTop()) ||