Merge change I425ca595 into eclair (7c1c4600) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/widget/SlidingTab.java

+23 −20

Original line number	Diff line number	Diff line
		@@ -201,7 +201,6 @@ public class SlidingTab extends ViewGroup {
		}

		void setHintText(int resId) {
		// TODO: Text should be blank if widget is vertical
		text.setText(resId);
		}

		@@ -564,8 +563,10 @@ public class SlidingTab extends ViewGroup {
		* @param resId
		*/
		public void setLeftHintText(int resId) {
		if (isHorizontal()) {
		mLeftSlider.setHintText(resId);
		}
		}

		/**
		* Sets the right handle icon to a given resource.
		@@ -592,8 +593,10 @@ public class SlidingTab extends ViewGroup {
		* @param resId
		*/
		public void setRightHintText(int resId) {
		if (isHorizontal()) {
		mRightSlider.setHintText(resId);
		}
		}

		/**
		* Triggers haptic feedback.