Enable stopwatch circle as touch target to start/stop (478b04fa) · Commits · e / os / android_packages_apps_DeskClock

src/com/android/deskclock/stopwatch/StopwatchFragment.java

+9 −2

Original line number	Diff line number	Diff line
		@@ -253,7 +253,7 @@ public class StopwatchFragment extends DeskClockFragment
		public StopwatchFragment() {
		}

		private void rightButtonAction() {
		private void toggleStopwatchState() {
		long time = Utils.getTimeNow();
		Context context = getActivity().getApplicationContext();
		Intent intent = new Intent(context, StopwatchService.class);
		@@ -297,6 +297,13 @@ public class StopwatchFragment extends DeskClockFragment
		mLapsAdapter = new LapsListAdapter(getActivity());
		mLapsList.setAdapter(mLapsAdapter);

		// Timer text serves as a virtual start/stop button.
		mTimeText.registerVirtualButtonAction(new Runnable() {
		@Override
		public void run() {
		toggleStopwatchState();
		}
		});
		mTimeText.setVirtualButtonEnabled(true);

		mCircleLayout = (CircleButtonsLayout)v.findViewById(R.id.stopwatch_circle);
		@@ -792,7 +799,7 @@ public class StopwatchFragment extends DeskClockFragment

		@Override
		public void onFabClick(View view){
		rightButtonAction();
		toggleStopwatchState();
		}

		@Override

+1 −13

Original line number	Diff line number	Diff line
		@@ -74,7 +74,6 @@ public class CountingTimerView extends View {
		private final int mPressedColor;
		private final int mWhiteColor;
		private final int mAccentColor;
		private TextView mStopStartTextView;
		private final AccessibilityManager mAccessibilityManager;

		// Fields for the text serving as a virtual button.
		@@ -548,7 +547,6 @@ public class CountingTimerView extends View {

		private void virtualButtonPressed(boolean pressedOn) {
		mVirtualButtonPressedOn = pressedOn;
		mStopStartTextView.setTextColor(pressedOn ? mPressedColor : mWhiteColor);
		invalidate();
		}

		@@ -627,13 +625,7 @@ public class CountingTimerView extends View {
		float yTextStart = yCenter + mTextHeight/2 - (mTextHeight * FONT_VERTICAL_OFFSET);

		// Text color differs based on pressed state.
		int textColor;
		if (mVirtualButtonPressedOn) {
		textColor = mPressedColor;
		mStopStartTextView.setTextColor(mPressedColor);
		} else {
		textColor = mDefaultColor;
		}
		final int textColor = mVirtualButtonPressedOn ? mPressedColor : mDefaultColor;
		mPaintBigThin.setColor(textColor);
		mPaintMed.setColor(textColor);

		@@ -657,8 +649,4 @@ public class CountingTimerView extends View {
		mRemeasureText = true;
		resetTextSize();
		}

		public void registerStopTextView(TextView stopStartTextView) {
		mStopStartTextView = stopStartTextView;
		}
		}