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

Commit 24a54fc1 authored by James Lemieux's avatar James Lemieux
Browse files

Refactor Stopwatch to use new unified DataModel 

This refactoring introduces Stopwatch and Lap domain objects.
Instances of these domain objects are fetched via a DataModel
class that is the single point of reference for all stopwatch data.
This allows the data to be shared across the entire application.
In particular, the stopwatch notification and StopwatchFragment
all draw upon the same model to determine what the state of the
stopwatch is and what laps have been recorded.

Change-Id: I6bda1fda73568cb312b167f1f6b10bd1abc99d62
parent 548c0d18

AndroidManifest.xml

+5 −6
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ 
                <category android:name="android.intent.category.VOICE" />

            </intent-filter>

            <intent-filter>

                <action android:name="com.android.deskclock.action.STOP_STOPWATCH" />

                <action android:name="com.android.deskclock.action.PAUSE_STOPWATCH" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.VOICE" />

            </intent-filter>
@@ -361,11 +361,10 @@ 
                android:exported="false"

                android:description="@string/stopwatch_service_desc">

            <intent-filter>

                <action android:name="start_stopwatch" />

                <action android:name="lap_stopwatch" />

                <action android:name="stop_stopwatch" />

                <action android:name="reset_stopwatch" />

                <action android:name="share_stopwatch" />

                <action android:name="com.android.deskclock.action.START_STOPWATCH" />

                <action android:name="com.android.deskclock.action.PAUSE_STOPWATCH" />

                <action android:name="com.android.deskclock.action.LAP_STOPWATCH" />

                <action android:name="com.android.deskclock.action.RESET_STOPWATCH" />

            </intent-filter>

        </service>

    </application>

res/drawable-v21/ic_add_24dp.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,4 +16,4 @@ 


<bitmap xmlns:android="http://schemas.android.com/apk/res/android"

    android:src="@drawable/ic_add_white_24dp"

    android:tint="@color/black" />
 
    android:tint="@color/black_54p" />

res/drawable-v21/ic_pause_24dp.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,4 +15,4 @@ 
-->

<bitmap xmlns:android="http://schemas.android.com/apk/res/android"

    android:src="@drawable/ic_pause_white_24dp"

    android:tint="@color/black" />
 
    android:tint="@color/black_54p" />

res/drawable-v21/ic_reset_24dp.xml

+1 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<bitmap xmlns:android="http://schemas.android.com/apk/res/android"

    android:src="@drawable/ic_reset_white_24dp"

    android:tint="@color/black" />
 
    android:tint="@color/black_54p" />

res/drawable-v21/ic_snooze_24dp.xml

+1 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<bitmap xmlns:android="http://schemas.android.com/apk/res/android"

    android:src="@drawable/ic_snooze_white_24dp"

    android:tint="@color/black" />
 
 No newline at end of file
 
    android:tint="@color/black_54p" />
 
 No newline at end of file