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

Commit b93974f1 authored by Romain Hunault's avatar Romain Hunault 💻
Browse files

Merge branch 'v1-nougat-sprint_freetown' into 'v1-nougat' 

[RELEASE] Sprint Freetown (nougat)

See merge request !6
parents 38d386f3 7662eb3b

AndroidManifest.xml

+5 −5
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 
                 android:backupAgent="DeskClockBackupAgent"

                 android:fullBackupContent="@xml/backup_scheme"

                 android:fullBackupOnly="true"

                 android:icon="@mipmap/ic_launcher_alarmclock"

                 android:icon="@mipmap/ic_launcher"

                 android:requiredForAllUsers="true"

                 android:supportsRtl="true">
@@ -69,7 +69,7 @@ 
        <activity android:name="DeskClock"

                android:label="@string/app_label"

                android:theme="@style/DeskClockTheme"

                android:icon="@mipmap/ic_launcher_alarmclock"

                android:icon="@mipmap/ic_launcher"

                android:launchMode="singleTask">



            <intent-filter>
@@ -83,7 +83,7 @@ 
                android:targetActivity="DeskClock"

                android:label="@string/app_label"

                android:theme="@style/DeskClockTheme"

                android:icon="@mipmap/ic_launcher_alarmclock"

                android:icon="@mipmap/ic_launcher"

                android:launchMode="singleTask"

                android:enabled="@bool/config_dockAppEnabled"

                >
@@ -270,7 +270,7 @@ 


        <receiver

            android:name="com.android.alarmclock.AnalogAppWidgetProvider"

            android:icon="@mipmap/ic_launcher_alarmclock"

            android:icon="@mipmap/ic_launcher"

            android:label="@string/analog_gadget">

            <intent-filter>

                <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
@@ -286,7 +286,7 @@ 


        <receiver

            android:name="com.android.alarmclock.DigitalAppWidgetProvider"

            android:icon="@mipmap/ic_launcher_alarmclock"

            android:icon="@mipmap/ic_launcher"

            android:label="@string/digital_gadget">

            <intent-filter>

                <action android:name="android.intent.action.TIME_SET"/>

res/mipmap-hdpi/ic_launcher.png

0 → 100644
+3.85 KiB
Loading image diff...

res/mipmap-hdpi/ic_launcher_alarmclock.png

deleted100644 → 0
−6.14 KiB
Loading image diff...

res/mipmap-mdpi/ic_launcher.png

0 → 100644
+1.62 KiB
Loading image diff...

res/mipmap-mdpi/ic_launcher_alarmclock.png

deleted100644 → 0
−3.55 KiB
Loading image diff...