diff options
| author | Budi Kusmiantoro <budi@google.com> | 2014-12-09 17:00:58 -0800 |
|---|---|---|
| committer | Budi Kusmiantoro <budi@google.com> | 2014-12-09 17:31:06 -0800 |
| commit | 33d935bc8801c8a334265ec9c66e7c67f19145a5 (patch) | |
| tree | fb6068aae3c8f66460236a7062639760576ecb0b /src | |
| parent | f30efd1146961d161efd3334a4996e46ccdea442 (diff) | |
| download | android_packages_apps_DeskClock-33d935bc8801c8a334265ec9c66e7c67f19145a5.tar.gz android_packages_apps_DeskClock-33d935bc8801c8a334265ec9c66e7c67f19145a5.tar.bz2 android_packages_apps_DeskClock-33d935bc8801c8a334265ec9c66e7c67f19145a5.zip | |
Improve talkback strings on Alarm firing page
Bug: 18689429
Change-Id: I3bd5a47e72e079d942ca82707d4096068ad5b1e5
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/deskclock/alarms/AlarmActivity.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/com/android/deskclock/alarms/AlarmActivity.java b/src/com/android/deskclock/alarms/AlarmActivity.java index 753d5d96d..4b1909980 100644 --- a/src/com/android/deskclock/alarms/AlarmActivity.java +++ b/src/com/android/deskclock/alarms/AlarmActivity.java @@ -41,7 +41,7 @@ import android.view.ViewGroupOverlay; import android.view.WindowManager; import android.view.animation.Interpolator; import android.view.animation.PathInterpolator; -import android.widget.ImageButton; +import android.widget.ImageView; import android.widget.TextClock; import android.widget.TextView; @@ -123,9 +123,9 @@ public class AlarmActivity extends Activity implements View.OnClickListener, Vie private TextView mAlertInfoView; private ViewGroup mContentView; - private ImageButton mAlarmButton; - private ImageButton mSnoozeButton; - private ImageButton mDismissButton; + private ImageView mAlarmButton; + private ImageView mSnoozeButton; + private ImageView mDismissButton; private TextView mHintView; private ValueAnimator mAlarmAnimator; @@ -182,9 +182,9 @@ public class AlarmActivity extends Activity implements View.OnClickListener, Vie mAlertInfoView = (TextView) mAlertView.findViewById(R.id.alert_info); mContentView = (ViewGroup) mContainerView.findViewById(R.id.content); - mAlarmButton = (ImageButton) mContentView.findViewById(R.id.alarm); - mSnoozeButton = (ImageButton) mContentView.findViewById(R.id.snooze); - mDismissButton = (ImageButton) mContentView.findViewById(R.id.dismiss); + mAlarmButton = (ImageView) mContentView.findViewById(R.id.alarm); + mSnoozeButton = (ImageView) mContentView.findViewById(R.id.snooze); + mDismissButton = (ImageView) mContentView.findViewById(R.id.dismiss); mHintView = (TextView) mContentView.findViewById(R.id.hint); final TextView titleView = (TextView) mContentView.findViewById(R.id.title); @@ -390,7 +390,7 @@ public class AlarmActivity extends Activity implements View.OnClickListener, Vie return Math.max(Math.min((x - x0) / (x1 - x0), 1.0f), 0.0f); } - private ValueAnimator getButtonAnimator(ImageButton button, int tintColor) { + private ValueAnimator getButtonAnimator(ImageView button, int tintColor) { return ObjectAnimator.ofPropertyValuesHolder(button, PropertyValuesHolder.ofFloat(View.SCALE_X, BUTTON_SCALE_DEFAULT, 1.0f), PropertyValuesHolder.ofFloat(View.SCALE_Y, BUTTON_SCALE_DEFAULT, 1.0f), |