TrackController: refactor button (delayed action) UI and use handler.

src/main/java/de/dennisguse/opentracks/TrackController.java

@@ -18,17 +18,12 @@ package de.dennisguse.opentracks;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.graphics.drawable.AnimatedVectorDrawable;
+import android.graphics.drawable.TransitionDrawable;
-import android.graphics.drawable.Drawable;
 import android.os.Handler;
-import android.view.Gravity;
 import android.view.MotionEvent;
 import android.view.View;
-import android.view.View.OnClickListener;
+import android.view.accessibility.AccessibilityEvent;
 import android.widget.ImageButton;
-import android.widget.Toast;
-
-import androidx.core.content.ContextCompat;
 
 import de.dennisguse.opentracks.databinding.TrackControllerBinding;
 import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
@@ -42,26 +37,29 @@ import de.dennisguse.opentracks.util.UnitConversions;
  *
  * @author Jimmy Shih
  */
-public class TrackController {
+public class TrackController implements View.OnTouchListener {
 
     private static final String TAG = TrackController.class.getSimpleName();
 
     private final Activity activity;
     private final TrackRecordingServiceConnection trackRecordingServiceConnection;
-    private final Handler handlerUpdateTotalTime;
+    private final Handler handlerUpdateTotalTime = new Handler();
     private final boolean alwaysShow;
-    private ButtonDelay buttonDelay;
+
+    private Runnable buttonDelay;
+    private final int buttonDelayDuration;
 
     private final TrackControllerBinding viewBinding;
+    private final TransitionDrawable transition;
 
     private boolean isRecording;
     private boolean isPaused;
     private long totalTime = 0;
-
     private long totalTimeTimestamp = 0;
-
     private boolean isResumed = false;
 
+    private final Callback callback;
+
     // A runnable to update the total time.
     private final Runnable updateTotalTimeRunnable = new Runnable() {
         public void run() {
@@ -73,98 +71,98 @@ public class TrackController {
     };
 
     @SuppressLint("ClickableViewAccessibility")
-    TrackController(Activity activity, TrackControllerBinding viewBinding, TrackRecordingServiceConnection trackRecordingServiceConnection, boolean alwaysShow, OnClickListener recordListener, OnClickListener stopListener) {
+    TrackController(Activity activity, TrackControllerBinding viewBinding, TrackRecordingServiceConnection trackRecordingServiceConnection, boolean alwaysShow, Callback callback) {
         this.activity = activity;
         this.viewBinding = viewBinding;
         this.trackRecordingServiceConnection = trackRecordingServiceConnection;
         this.alwaysShow = alwaysShow;
-        handlerUpdateTotalTime = new Handler();
+        this.callback = callback;
-        viewBinding.trackControllerRecord.setOnTouchListener((view, motionEvent) -> onRecordTouch(activity, recordListener, motionEvent));
 
-        viewBinding.trackControllerStop.setOnTouchListener((view, motionEvent) -> onStopTouch(activity, stopListener, motionEvent));
+        buttonDelayDuration = activity.getResources().getInteger(R.integer.buttonDelayMillis);
+
+        viewBinding.trackControllerRecord.setOnTouchListener(this);
+        viewBinding.trackControllerRecord.setOnClickListener((view) -> {
+            if (buttonDelay != null || (isRecording && !isPaused)) {
+                return;
+            }
+
+            callback.recordStart();
+        });
+
+        viewBinding.trackControllerStop.setOnTouchListener(this);
+        transition = (TransitionDrawable) viewBinding.trackControllerContainer.getBackground();
     }
 
-    private boolean onRecordTouch(final Activity activity, final OnClickListener recordListener, final MotionEvent motionEvent) {
+    @SuppressLint("ClickableViewAccessibility") //We do accessibility manually.
-        if (isRecording && !isPaused) {
+    @Override
-            if (motionEvent.getAction() == MotionEvent.ACTION_DOWN) {
+    public boolean onTouch(final View view, MotionEvent event) {
-                buttonDelay = new ButtonDelay(activity, viewBinding.trackControllerRecord, R.drawable.ic_button_pause_anim, R.string.hold_to_pause, recordListener);
+        if (event.getAction() == MotionEvent.ACTION_MOVE) {
-                new Thread(buttonDelay).start();
+            return false;
-                return true;
+        }
-            } else if (motionEvent.getAction() == MotionEvent.ACTION_UP) {
+
-                viewBinding.trackControllerRecord.setImageResource(R.drawable.ic_button_pause);
+        if (buttonDelay != null && event.getAction() == MotionEvent.ACTION_UP) {
-                if (buttonDelay != null) {
+            handlerUpdateTotalTime.removeCallbacks(buttonDelay);
-                    buttonDelay.canceled = true;
+            buttonDelay = null;
-                }
+            ((ImageButton) view).setPressed(false);
-                return true;
+
-            }
+            transition.resetTransition();
-        } else if (motionEvent.getAction() == MotionEvent.ACTION_DOWN) {
+
-            recordListener.onClick(null);
+            showStatusSetDefaultText();
+
+            return false;
+        }
+
+        //Trigger button pressed animation
+        ((ImageButton) view).setPressed(true);
+
+        //To pause a recording
+        if (viewBinding.trackControllerRecord.equals(view)
+                && event.getAction() == MotionEvent.ACTION_DOWN
+                && isRecording && !isPaused) {
+
+            transition.startTransition(buttonDelayDuration);
+
+            ActivityUtils.vibrate(activity, 150);
+            viewBinding.trackControllerStatus.setText(R.string.hold_to_pause);
+
+            buttonDelay = () -> {
+                view.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_CLICKED);
+                view.performClick();
+                callback.recordStart(); //TODO Should be recordPause();
+
+                transition.resetTransition();
+
+                ActivityUtils.vibrate(activity, 1000);
+            };
+            handlerUpdateTotalTime.postDelayed(buttonDelay, buttonDelayDuration);
             return true;
         }
+
+        //To stop a recording
+        if (viewBinding.trackControllerStop.equals(view)
+                && event.getAction() == MotionEvent.ACTION_DOWN
+                && isRecording) {
+
+
+            transition.startTransition(buttonDelayDuration);
+
+            ActivityUtils.vibrate(activity, 150);
+            viewBinding.trackControllerStatus.setText(R.string.hold_to_stop);
+
+            buttonDelay = () -> {
+                view.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_CLICKED);
+                callback.recordStop();
+                ActivityUtils.vibrate(activity, 1000);
+
+                transition.resetTransition();
+            };
+            handlerUpdateTotalTime.postDelayed(buttonDelay, buttonDelayDuration);
+            return true;
+        }
+
         return false;
     }
 
-    private boolean onStopTouch(final Activity activity, final OnClickListener stopListener, final MotionEvent motionEvent) {
-        if (isRecording) {
-            if (motionEvent.getAction() == MotionEvent.ACTION_DOWN) {
-                buttonDelay = new ButtonDelay(activity, viewBinding.trackControllerStop, R.drawable.ic_button_stop_anim, R.string.hold_to_stop, stopListener);
-                new Thread(buttonDelay).start();
-                return true;
-            } else if (motionEvent.getAction() == MotionEvent.ACTION_UP) {
-                viewBinding.trackControllerStop.setImageResource(R.drawable.ic_button_stop);
-                if (buttonDelay != null) {
-                    buttonDelay.canceled = true;
-                }
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private static class ButtonDelay implements Runnable {
-
-        private boolean canceled = false;
-
-        private final ImageButton imageButton;
-        private final Activity activity;
-        private final OnClickListener clickListener;
-        private final int delayMillis;
-        private final Drawable drawable;
-        private final int delayMessageId;
-
-        private ButtonDelay(final Activity activity, final ImageButton imageButton, final int animDrawableId, final int delayMessageId, final OnClickListener clickListener) {
-            this.activity = activity;
-            this.clickListener = clickListener;
-            this.delayMillis = activity.getResources().getInteger(R.integer.buttonDelayMillis);
-            this.imageButton = imageButton;
-            this.drawable = ContextCompat.getDrawable(activity, animDrawableId);
-            this.delayMessageId = delayMessageId;
-        }
-
-        @Override
-        public void run() {
-            activity.runOnUiThread(() -> {
-                imageButton.setImageDrawable(drawable);
-                if (drawable instanceof AnimatedVectorDrawable) {
-                    ((AnimatedVectorDrawable) drawable).start();
-                }
-                ActivityUtils.vibrate(activity, 150);
-                ActivityUtils.toast(activity, delayMessageId, Toast.LENGTH_SHORT, Gravity.TOP);
-            });
-
-            try {
-                Thread.sleep(delayMillis);
-            } catch (InterruptedException ignored) {
-            }
-            if (!canceled) {
-                activity.runOnUiThread(() -> {
-                    clickListener.onClick(null);
-                    ActivityUtils.vibrate(activity, 1000);
-                });
-            }
-        }
-    }
-
     public void update(boolean recording, boolean paused) {
         if (!isResumed) {
             return;
@@ -182,13 +180,12 @@ public class TrackController {
         viewBinding.trackControllerRecord.setImageResource(isRecording && !isPaused ? R.drawable.ic_button_pause : R.drawable.button_record);
         viewBinding.trackControllerRecord.setContentDescription(activity.getString(isRecording && !isPaused ? R.string.image_pause : R.string.image_record));
 
-        viewBinding.trackControllerStop.setImageResource(isRecording ? R.drawable.ic_button_stop : R.drawable.ic_button_stop_disabled);
         viewBinding.trackControllerStop.setEnabled(isRecording);
 
         viewBinding.trackControllerStatus.setVisibility(isRecording ? View.VISIBLE : View.INVISIBLE);
         if (isRecording) {
             viewBinding.trackControllerStatus.setTextColor(activity.getResources().getColor(isPaused ? android.R.color.white : R.color.recording_text));
-            viewBinding.trackControllerStatus.setText(isPaused ? R.string.generic_paused : R.string.generic_recording);
+            showStatusSetDefaultText();
         }
 
         handlerUpdateTotalTime.removeCallbacks(updateTotalTimeRunnable);
@@ -228,4 +225,14 @@ public class TrackController {
         TrackRecordingServiceInterface trackRecordingService = trackRecordingServiceConnection.getServiceIfBound();
         return trackRecordingService != null ? trackRecordingService.getTotalTime() : 0L;
     }
+
+    private void showStatusSetDefaultText() {
+        viewBinding.trackControllerStatus.setText(isPaused ? R.string.generic_paused : R.string.generic_recording);
+    }
+
+    public interface Callback {
+        void recordStart();
+
+        void recordStop();
+    }
 }

src/main/java/de/dennisguse/opentracks/TrackListActivity.java

@@ -33,7 +33,6 @@ import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
@@ -65,7 +64,7 @@ import de.dennisguse.opentracks.util.TrackIconUtils;
  *
  * @author Leif Hendrik Wilden
  */
-public class TrackListActivity extends AbstractListActivity implements ConfirmDeleteDialogFragment.ConfirmDeleteCaller {
+public class TrackListActivity extends AbstractListActivity implements ConfirmDeleteDialogFragment.ConfirmDeleteCaller, TrackController.Callback {
 
     private static final String TAG = TrackListActivity.class.getSimpleName();
 
@@ -133,14 +132,6 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
     private MenuItem searchMenuItem;
     private MenuItem startGpsMenuItem;
 
-    private final OnClickListener stopListener = new OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            updateMenuItems(false, false);
-            trackRecordingServiceConnection.stopRecording(TrackListActivity.this, true);
-        }
-    };
-
     // Callback when the trackRecordingServiceConnection binding changes.
     private final Runnable bindChangedCallback = new Runnable() {
         @Override
@@ -175,27 +166,6 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
         }
     };
 
-    private final OnClickListener recordListener = new OnClickListener() {
-        public void onClick(View v) {
-            if (!PreferencesUtils.isRecording(recordingTrackId)) {
-                // Not recording -> Recording
-                updateMenuItems(false, true);
-                Intent newIntent = IntentUtils.newIntent(TrackListActivity.this, TrackRecordingActivity.class);
-                startActivity(newIntent);
-            } else if (recordingTrackPaused) {
-                // Paused -> Resume
-                updateMenuItems(false, true);
-                trackRecordingServiceConnection.resumeTrack();
-                trackController.update(true, false);
-            } else {
-                // Recording -> Paused
-                updateMenuItems(false, true);
-                trackRecordingServiceConnection.pauseTrack();
-                trackController.update(true, true);
-            }
-        }
-    };
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         // Reset theme after splash
@@ -211,7 +181,7 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
         sharedPreferences = PreferencesUtils.getSharedPreferences(this);
 
         trackRecordingServiceConnection = new TrackRecordingServiceConnection(bindChangedCallback);
-        trackController = new TrackController(this, viewBinding.trackControllerContainer, trackRecordingServiceConnection, true, recordListener, stopListener);
+        trackController = new TrackController(this, viewBinding.trackControllerContainer, trackRecordingServiceConnection, true, this);
 
 
         // Show trackController when search dialog is dismissed
@@ -577,4 +547,30 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
             resourceCursorAdapter.swapCursor(null);
         }
     }
+
+    @Override
+    public void recordStart() {
+        if (!PreferencesUtils.isRecording(recordingTrackId)) {
+            // Not recording -> Recording
+            updateMenuItems(false, true);
+            Intent newIntent = IntentUtils.newIntent(TrackListActivity.this, TrackRecordingActivity.class);
+            startActivity(newIntent);
+        } else if (recordingTrackPaused) {
+            // Paused -> Resume
+            updateMenuItems(false, true);
+            trackRecordingServiceConnection.resumeTrack();
+            trackController.update(true, false);
+        } else {
+            // Recording -> Paused
+            updateMenuItems(false, true);
+            trackRecordingServiceConnection.pauseTrack();
+            trackController.update(true, true);
+        }
+    }
+
+    @Override
+    public void recordStop() {
+        updateMenuItems(false, false);
+        trackRecordingServiceConnection.stopRecording(TrackListActivity.this, true);
+    }
 }

src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java

@@ -9,7 +9,6 @@ import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.view.WindowManager;
 
 import androidx.annotation.NonNull;
@@ -42,7 +41,7 @@ import de.dennisguse.opentracks.util.TrackUtils;
  */
 //NOTE: This activity does NOT react to preference changes of R.string.recording_track_id_key.
 //This mode of communication should be removed anyhow.
-public class TrackRecordingActivity extends AbstractActivity implements ChooseActivityTypeDialogFragment.ChooseActivityTypeCaller, TrackActivityDataHubInterface {
+public class TrackRecordingActivity extends AbstractActivity implements ChooseActivityTypeDialogFragment.ChooseActivityTypeCaller, TrackActivityDataHubInterface, TrackController.Callback {
 
     public static final String EXTRA_TRACK_ID = "track_id";
 
@@ -126,36 +125,6 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc
     private MenuItem insertMarkerMenuItem;
     private MenuItem markerListMenuItem;
 
-    private final OnClickListener recordListener = new OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            if (recordingTrackPaused) {
-                // Paused -> Resume
-                updateMenuItems(false);
-                trackRecordingServiceConnection.resumeTrack();
-                trackController.update(true, false);
-            } else {
-                // Recording -> Paused
-                updateMenuItems(true);
-                trackRecordingServiceConnection.pauseTrack();
-                trackController.update(true, true);
-            }
-        }
-    };
-
-    private final OnClickListener stopListener = new OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            trackRecordingServiceConnection.stopRecording(TrackRecordingActivity.this, true);
-            Intent newIntent = IntentUtils.newIntent(TrackRecordingActivity.this, TrackRecordedActivity.class)
-                    .putExtra(TrackRecordedActivity.EXTRA_TRACK_ID, trackId);
-            startActivity(newIntent);
-            overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
-            updateMenuItems(true);
-            finish();
-        }
-    };
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -185,7 +154,7 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc
             viewBinding.trackDetailActivityViewPager.setCurrentItem(savedInstanceState.getInt(CURRENT_TAB_TAG_KEY));
         }
 
-        trackController = new TrackController(this, viewBinding.trackControllerContainer, trackRecordingServiceConnection, false, recordListener, stopListener);
+        trackController = new TrackController(this, viewBinding.trackControllerContainer, trackRecordingServiceConnection, false, this);
     }
 
     @Override
@@ -363,6 +332,32 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc
         TrackUtils.updateTrack(this, track, null, category, null, contentProviderUtils);
     }
 
+    @Override
+    public void recordStart() {
+        if (recordingTrackPaused) {
+            // Paused -> Resume
+            updateMenuItems(false);
+            trackRecordingServiceConnection.resumeTrack();
+            trackController.update(true, false);
+        } else {
+            // Recording -> Paused
+            updateMenuItems(true);
+            trackRecordingServiceConnection.pauseTrack();
+            trackController.update(true, true);
+        }
+    }
+
+    @Override
+    public void recordStop() {
+        trackRecordingServiceConnection.stopRecording(TrackRecordingActivity.this, true);
+        Intent newIntent = IntentUtils.newIntent(TrackRecordingActivity.this, TrackRecordedActivity.class)
+                .putExtra(TrackRecordedActivity.EXTRA_TRACK_ID, trackId);
+        startActivity(newIntent);
+        overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
+        updateMenuItems(true);
+        finish();
+    }
+
     private class CustomFragmentPagerAdapter extends FragmentPagerAdapter {
 
         public CustomFragmentPagerAdapter(@NonNull FragmentManager fm, int behavior) {

src/main/res/animator/button_animator.xml

@@ -1,5 +0,0 @@
-<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="@integer/buttonDelayMillis"
-    android:propertyName="fillAlpha"
-    android:valueFrom="1.0"
-    android:valueTo="0.0" />

src/main/res/drawable/button_stop.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_button_stop_disabled" android:state_enabled="false" />
+    <item android:drawable="@drawable/ic_button_stop" />
+</selector>

src/main/res/drawable/ic_button_pause.xml

@@ -24,9 +24,4 @@
         android:strokeWidth="4.82273865"
         android:strokeAlpha="1"
         android:strokeColor="#00000000" />
-    <path
-        android:name="fade_out_circle"
-        android:fillAlpha="0.0"
-        android:fillColor="#a31a1f"
-        android:pathData="M62.5,62.5m-0,-62a50,50 0,1 1,-0 123a50,50 0,1 1,-0 -123" />
 </vector>

src/main/res/drawable/ic_button_pause_anim.xml

@@ -1,6 +0,0 @@
-<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:drawable="@drawable/ic_button_pause">
-    <target
-        android:name="fade_out_circle"
-        android:animation="@animator/button_animator" />
-</animated-vector>

src/main/res/drawable/ic_button_stop_anim.xml

@@ -1,41 +0,0 @@
-<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt">
-    <aapt:attr name="android:drawable">
-        <vector
-            android:width="82dp"
-            android:height="82dp"
-            android:viewportWidth="125"
-            android:viewportHeight="125">
-            <path
-                android:fillAlpha="1"
-                android:fillColor="#00000000"
-                android:pathData="M2.516,63.008a60.239,59.73 134.879,1 0,119.968 -1.017a60.239,59.73 134.879,1 0,-119.968 1.017z"
-                android:strokeWidth="5.03194237"
-                android:strokeAlpha="1"
-                android:strokeColor="#555555" />
-            <path
-                android:fillAlpha="1"
-                android:fillColor="#484848"
-                android:pathData="M62.5,62.5m-50,0a50,50 0,1 1,100 0a50,50 0,1 1,-100 0"
-                android:strokeWidth="6.9172821"
-                android:strokeAlpha="1"
-                android:strokeColor="#00000000" />
-            <path
-                android:fillAlpha="1"
-                android:fillColor="#ffffff"
-                android:fillType="nonZero"
-                android:pathData="M53.02,54.02h17.46v17.46h-17.46z"
-                android:strokeWidth="1.04023623"
-                android:strokeAlpha="1"
-                android:strokeColor="#414141" />
-            <path
-                android:name="fade_out_circle"
-                android:fillAlpha="0.0"
-                android:fillColor="#a31a1f"
-                android:pathData="M62.5,62.5m-0,-62a50,50 0,1 1,-0 123a50,50 0,1 1,-0 -123"></path>
-        </vector>
-    </aapt:attr>
-    <target
-        android:name="fade_out_circle"
-        android:animation="@animator/button_animator" />
-</animated-vector>

src/main/res/drawable/track_controller_background.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<transition xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- The drawables used here can be solid colors, gradients, shapes, images, etc. -->
+    <item android:drawable="@color/track_controller_background_normal" />
+    <item android:drawable="@color/track_controller_background_activated" />
+</transition>

src/main/res/layout-land/track_controller.xml

@@ -19,7 +19,7 @@ limitations under the License.
         android:id="@+id/track_controller_container"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:background="@color/track_controller_background"
+        android:background="@color/track_controller_background_normal"
         android:orientation="vertical"
         android:paddingLeft="8dp"
         android:paddingRight="8dp">
@@ -30,7 +30,8 @@ limitations under the License.
             android:layout_height="0dp"
             android:layout_weight="10"
             android:background="@android:color/transparent"
-            android:contentDescription="@string/image_record" />
+            android:contentDescription="@string/image_record"
+            android:src="@drawable/ic_button_record" />
 
         <RelativeLayout
             android:layout_width="match_parent"
@@ -62,7 +63,7 @@ limitations under the License.
             android:layout_weight="10"
             android:background="@android:color/transparent"
             android:contentDescription="@string/image_stop"
-            android:src="@drawable/ic_button_stop_disabled" />
+            android:src="@drawable/button_stop" />
 
     </LinearLayout>
 </merge>

src/main/res/layout/track_controller.xml

@@ -13,13 +13,14 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <LinearLayout
         android:id="@+id/track_controller_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/track_controller_background"
+        android:background="@drawable/track_controller_background"
         android:paddingTop="8dp"
         android:paddingBottom="8dp">
 
@@ -29,32 +30,36 @@ limitations under the License.
             android:layout_height="wrap_content"
             android:layout_weight="10"
             android:background="@android:color/transparent"
-            android:contentDescription="@string/image_record" />
+            android:contentDescription="@string/image_record"
+            android:src="@drawable/ic_button_record" />
 
         <RelativeLayout
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_weight="6"
+            android:layout_gravity="center"
-            android:gravity="center"
+            android:layout_weight="6">
-            android:layout_gravity="center">
 
             <TextView
                 android:id="@+id/track_controller_total_time"
                 style="@style/TextSmall"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_alignParentStart="true"
                 android:layout_centerVertical="true"
-                android:textColor="@android:color/white" />
+                android:gravity="center"
+                android:textColor="@android:color/white"
+                tools:text="0:12:34" />
 
             <TextView
                 android:id="@+id/track_controller_status"
                 style="@style/TextMicro"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_above="@id/track_controller_total_time"
                 android:layout_alignParentStart="true"
-                android:singleLine="true" />
+                android:gravity="center"
+                android:singleLine="true"
+                tools:text="@string/generic_recording" />
         </RelativeLayout>
 
         <ImageButton
@@ -64,7 +69,7 @@ limitations under the License.
             android:layout_weight="10"
             android:background="@android:color/transparent"
             android:contentDescription="@string/image_stop"
-            android:src="@drawable/ic_button_stop_disabled" />
+            android:src="@drawable/button_stop" />
 
     </LinearLayout>
 </merge>

src/main/res/values/colors.xml

@@ -35,7 +35,8 @@ limitations under the License.
     <color name="text_gradient_center">#B2000000</color> <!-- black 70% opacity -->
     <color name="text_gradient_end">#00000000</color> <!-- black 0% opacity -->
     <color name="text_gradient_start">#FF000000</color> <!-- black 100% opacity -->
-    <color name="track_controller_background">#FF0E0E0E</color> <!-- dark gray -->
+    <color name="track_controller_background_normal">#FF0E0E0E</color> <!-- dark gray -->
+    <color name="track_controller_background_activated">#3F0000</color>
 
     <color name="splashscreen_background">#272727</color>
 </resources>

src/main/res/values/strings.xml

@@ -631,8 +631,8 @@ limitations under the License.
     <string name="share_image_subject">I would like to share an image with you</string>
     <string name="share_image_body">I think you might be interested in this image.</string>
 
-    <string name="hold_to_stop">Hold to stop recording</string>
+    <string name="hold_to_stop">Hold to stop</string>
-    <string name="hold_to_pause">Hold to pause recording</string>
+    <string name="hold_to_pause">Hold to pause</string>
     <string name="toast_message_instant_track_was_exported">Last track exported</string>
 
     <string name="instant_export_enabled_summary">Export track to storage after recording is finished</string>