Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e83d49e authored by Justin Klaassen's avatar Justin Klaassen Committed by Android Git Automerger
Browse files

am 2c7f69cf: Increase touch target for swiping alarm 

* commit '2c7f69cf':
  Increase touch target for swiping alarm
parents ceae200a 2c7f69cf

res/layout/alarm_activity.xml

+4 −0
Original line number Diff line number Diff line
@@ -125,6 +125,10 @@ 
            android:layout_gravity="center"

            android:background="@android:color/transparent"

            android:contentDescription="@string/swipe_dismiss_instruction"

            android:paddingLeft="@dimen/alarm_lockscreen_alarm_horizontal_padding"

            android:paddingRight="@dimen/alarm_lockscreen_alarm_horizontal_padding"

            android:paddingTop="@dimen/alarm_lockscreen_alarm_vertical_padding"

            android:paddingBottom="@dimen/alarm_lockscreen_alarm_vertical_padding"

            android:src="@drawable/ic_fab_alarm" />



        <TextView

res/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ 
    <dimen name="circletimer_circle_size">4dip</dimen>

    <dimen name="circletimer_marker_size">16dip</dimen>



    <dimen name="alarm_lockscreen_alarm_horizontal_padding">16dp</dimen>

    <dimen name="alarm_lockscreen_alarm_vertical_padding">48dp</dimen>

    <dimen name="alarm_lockscreen_pulse_size">256dp</dimen>

    <dimen name="alarm_lockscreen_bottom_margin">40dp</dimen>

src/com/android/deskclock/alarms/AlarmActivity.java

+12 −7
Original line number Diff line number Diff line
@@ -272,10 +272,12 @@ public class AlarmActivity extends Activity implements View.OnClickListener, Vie 
            LogUtils.v(LOGTAG, "onClick ignored: %s", view);

            return;

        }



        LogUtils.v(LOGTAG, "onClick: %s", view);

        final float translationX = Math.max(view.getLeft() - mAlarmButton.getRight(), 0)

                + Math.min(view.getRight() - mAlarmButton.getLeft(), 0);



        final int alarmLeft = mAlarmButton.getLeft() + mAlarmButton.getPaddingLeft();

        final int alarmRight = mAlarmButton.getRight() - mAlarmButton.getPaddingRight();

        final float translationX = Math.max(view.getLeft() - alarmRight, 0)

                + Math.min(view.getRight() - alarmLeft, 0);

        getAlarmBounceAnimator(translationX, translationX < 0.0f

                ? R.string.swipe_snooze_instruction : R.string.swipe_dismiss_instruction).start();

    }
@@ -293,13 +295,16 @@ public class AlarmActivity extends Activity implements View.OnClickListener, Vie 
        final float x = motionEvent.getRawX() - contentLocation[0];

        final float y = motionEvent.getRawY() - contentLocation[1];



        final int alarmLeft = mAlarmButton.getLeft() + mAlarmButton.getPaddingLeft();

        final int alarmRight = mAlarmButton.getRight() - mAlarmButton.getPaddingRight();



        final float snoozeFraction, dismissFraction;

        if (mContentView.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL) {

            snoozeFraction = getFraction(mAlarmButton.getRight(), mSnoozeButton.getLeft(), x);

            dismissFraction = getFraction(mAlarmButton.getLeft(), mDismissButton.getRight(), x);

            snoozeFraction = getFraction(alarmRight, mSnoozeButton.getLeft(), x);

            dismissFraction = getFraction(alarmLeft, mDismissButton.getRight(), x);

        } else {

            snoozeFraction = getFraction(mAlarmButton.getLeft(), mSnoozeButton.getRight(), x);

            dismissFraction = getFraction(mAlarmButton.getRight(), mDismissButton.getLeft(), x);

            snoozeFraction = getFraction(alarmLeft, mSnoozeButton.getRight(), x);

            dismissFraction = getFraction(alarmRight, mDismissButton.getLeft(), x);

        }

        setAnimatedFractions(snoozeFraction, dismissFraction);