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

Commit b24302e3 authored by Antoan Angelov's avatar Antoan Angelov Committed by Automerger Merge Worker
Browse files

Merge "Add button state to the "Turn on work" button." into rvc-dev am: 1a1b5934

Change-Id: I830458615918e15bb5169d126b4ddf2be53079e3
parents a61e6a1e 1a1b5934
Loading
Loading
Loading
Loading
+10 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
    android:color="?attr/colorAccent">
    <item android:id="@android:id/mask">
        <shape android:shape="rectangle">
            <solid android:color="?attr/colorControlHighlight" />
            <corners android:radius="?attr/buttonCornerRadius" />
        </shape>
    </item>
</ripple>
 No newline at end of file
+2 −2
Original line number Diff line number Diff line
@@ -57,11 +57,11 @@
        android:text="@string/resolver_switch_on_work"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:background="@null"
        android:fontFamily="@string/config_headlineFontFamilyMedium"
        android:textSize="14sp"
        android:textColor="?attr/colorAccent"
        android:layout_centerHorizontal="true" />
        android:layout_centerHorizontal="true"
        android:background="@drawable/resolver_turn_on_work_button_ripple_background"/>
    <ProgressBar
        android:id="@+id/resolver_empty_state_progress"
        style="@style/Widget.Material.Light.ProgressBar"