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

Commit 39fa328e authored by Justin Klaassen's avatar Justin Klaassen
Browse files

DO NOT MERGE Cherry pick 33d935bc from master 

Bug: 18689429
Change-Id: I70a112139a636d2db22017b0b5ec68ee549bbf36
parent 28af5db4

res/layout/alarm_activity.xml

+5 −5
Original line number Diff line number Diff line
@@ -73,31 +73,31 @@ 
            ex:fillColor="@android:color/white"

            ex:radius="@dimen/alarm_lockscreen_pulse_radius" />



        <ImageButton

        <ImageView

            android:id="@+id/snooze"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:background="@drawable/bg_circle_pink"

            android:contentDescription="@string/alarm_alert_snooze_text"

            android:contentDescription="@string/description_direction_left"

            android:src="@drawable/ic_snooze_white_80dp"

            ex:layout_row="2"

            ex:layout_column="0"

            ex:layout_columnWeight="1"

            ex:layout_gravity="center" />



        <ImageButton

        <ImageView

            android:id="@+id/dismiss"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:background="@drawable/bg_circle_white"

            android:contentDescription="@string/alarm_alert_dismiss_text"

            android:contentDescription="@string/description_direction_right"

            android:src="@drawable/ic_alarm_off_white_80dp"

            ex:layout_row="2"

            ex:layout_column="2"

            ex:layout_columnWeight="1"

            ex:layout_gravity="center" />



        <ImageButton

        <ImageView

            android:id="@+id/alarm"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

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

+8 −8
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ import android.view.MotionEvent; 
import android.view.View;

import android.view.ViewGroup;

import android.view.WindowManager;

import android.widget.ImageButton;

import android.widget.ImageView;

import android.widget.TextClock;

import android.widget.TextView;
@@ -125,9 +125,9 @@ public class AlarmActivity extends AppCompatActivity 
    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;
@@ -185,9 +185,9 @@ public class AlarmActivity extends AppCompatActivity 
        mAlertInfoView = (TextView) mAlertView.findViewById(R.id.alert_info);



        mContentView = (ViewGroup) 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);
@@ -402,7 +402,7 @@ public class AlarmActivity extends AppCompatActivity 
        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),