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

Commit 15fe965a authored by Sam Blitzstein's avatar Sam Blitzstein Committed by Isaac Katzenelson
Browse files

Fixed start/stop button bugs. 

Prevented start/stop from turning grey if you exited the tab.
Changed start to hidden after stopping an expired timer.

Bug: 7324542
Bug: 7319174
Change-Id: I850fc57d5ec0e6f20be7c31f7146129ca819e382
parent 932e0129

res/layout/stopwatch_fragment.xml

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ 
            android:paddingRight="10dip"

            android:paddingBottom="5dip"

            android:paddingTop="5dip"

            android:textColor="@color/clock_white"

            android:text="@string/timer_stop"

            android:focusable="true" />

src/com/android/deskclock/timer/TimerFragment.java

+2 −3
Original line number Diff line number Diff line
@@ -715,13 +715,12 @@ public class TimerFragment extends DeskClockFragment 
                plusOne.setVisibility(View.VISIBLE);

                plusOne.setContentDescription(r.getString(R.string.timer_reset));

                plusOne.setImageResource(R.drawable.ic_reset);

                stop.setContentDescription(r.getString(R.string.timer_start));

                stop.setText(R.string.timer_start);

                stop.setTextColor(getResources().getColor(R.color.clock_gray));

                stop.setVisibility(View.INVISIBLE);

                countingTimerView.setVirtualButtonEnabled(false);

                break;

            case TimerObj.STATE_RESTART:

                plusOne.setVisibility(View.INVISIBLE);

                stop.setVisibility(View.VISIBLE);

                stop.setContentDescription(r.getString(R.string.timer_start));

                stop.setText(R.string.timer_start);

                stop.setTextColor(getResources().getColor(R.color.clock_white));