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

Commit c5e263f4 authored by Fahim's avatar Fahim
Browse files

merge conflict fix

parents ca3941c5 823b224c

AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ 
        <activity

            android:name=".AlarmSelectionActivity"

            android:label="@string/dismiss_alarm"

            android:theme="@android:style/Theme.Holo.Light.Dialog.NoActionBar" />

            android:theme="@style/Theme.AlarmSelectionActivity" />



        <provider

            android:name=".provider.ClockProvider"

res/color/backspace_tint_color.xml

+2 −2
Original line number Diff line number Diff line
@@ -15,6 +15,6 @@ 
-->



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

    <item android:state_enabled="true" android:color="@color/white" />

    <item android:color="@color/white_63p" />

    <item android:state_enabled="true" android:color="@color/accent_color" />

    <item android:color="@color/gray2" />

</selector>
 
 No newline at end of file

res/color/tab_tint_color.xml

+3 −3
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
-->



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

    <item android:state_focused="true" android:color="@color/white" />

    <item android:state_selected="true" android:color="@color/white" />

    <item android:color="@color/white_50p" />

    <item android:state_focused="true" android:color="@color/accent_color" />

    <item android:state_selected="true" android:color="@color/accent_color" />

    <item android:color="@color/color_default_secondary_text" />

</selector>

res/drawable-ldrtl/ic_label.xml

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
        android:pivotX="12"

        android:scaleX="-1">

        <path

            android:fillColor="@android:color/white"

            android:fillColor="@color/accent_color"

            android:pathData="M16,17H5V7H16L19.55,12M17.63,5.84C17.27,5.33 16.67,5 16,5H5A2,2 0 0,0 3,7V17A2,2 0 0,0 5,19H16C16.67,19 17.27,18.66 17.63,18.15L22,12L17.63,5.84Z" />

    </group>

</vector>

res/drawable-v21/bg_day_button_animatable.xml

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
        android:translateY="12">

        <path

            android:name="path"

            android:fillColor="#FFFFFFFF"

            android:fillColor="@color/accent_color"

            android:pathData="M 0.0,8.0 c -4.41999816895,0.0 -8.0,-3.58200073242 -8.0,-8.0 c 0.0,-4.41799926758 3.58000183105,-8.0 8.0,-8.0 c 4.41999816895,0.0 8.0,3.58200073242 8.0,8.0 c 0.0,4.41799926758 -3.58000183105,8.0 -8.0,8.0 Z"/>

    </group>

</vector>
 
 No newline at end of file