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

Commit b27623fe authored by Danny Baumann's avatar Danny Baumann
Browse files

Fix a number of issues introduced with the increasing volume setting 

- Fix coding style
- Fix alarm layout
- Don't increase volume to levels higher than set in the system
- If increasing volume is enabled and alarm volume is set to 0, don't
  play alarm
- Don't randomly change log class usage

Change-Id: Ib98d82e361e83a76f08550f3b74df0c6270645a8
parent 9e8b08ef

res/layout/alarm_time.xml

+16 −11
Original line number Diff line number Diff line
@@ -165,9 +165,11 @@ 
            android:visibility="gone">

            <!-- Day buttons are put here programatically -->

        </LinearLayout>

        <LinearLayout

        <RelativeLayout

            android:layout_width="match_parent"

            android:layout_height="64dp"

            android:layout_height="wrap_content"

            android:layout_marginTop="16dp"

            android:layout_marginBottom="16dp"

            android:layout_marginLeft="10dp"

            android:layout_marginRight="16dp"

            android:gravity="center_vertical">
@@ -175,10 +177,9 @@ 
            <TextView

                android:id="@+id/choose_ringtone"

                android:layout_height="match_parent"

                android:layout_width="0dp"

                android:layout_weight="1"

                android:layout_marginRight="16dp"

                android:gravity="center_vertical"

                android:layout_width="match_parent"

                android:layout_marginRight="10dp"

                android:layout_marginBottom="10dp"

                style="@style/body"

                android:background="@drawable/item_background"

                android:clickable="true"
@@ -197,18 +198,22 @@ 
                android:textColor="@color/clock_gray"

                android:layout_height="wrap_content"

                android:layout_width="wrap_content"

                android:layout_gravity="center_vertical|right"

                android:layout_below="@id/choose_ringtone"

                android:layout_alignParentLeft="true"

                android:layout_marginRight="10dp"

                style="@style/body"/>

            <CheckBox

                android:id="@+id/incvol_onoff"

                android:text="@string/alarm_incvol"

                android:id="@+id/increasing_volume_onoff"

                android:text="@string/alarm_increasing_volume"

                android:includeFontPadding="false"

                android:textColor="@color/clock_gray"

                android:layout_height="wrap_content"

                android:layout_width="wrap_content"

                android:layout_gravity="center_vertical|right"

                android:layout_below="@id/choose_ringtone"

                android:layout_toRightOf="@id/vibrate_onoff"

                android:layout_marginRight="10dp"

                style="@style/body"/>

        </LinearLayout>

        </RelativeLayout>

        <View

            android:id="@+id/hairline"

            android:layout_height="1dp"

res/values-el/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ 
    <string name="keep_display_on_stopwatch_summary">Κρατήστε την οθόνη σε λειτουργία ενώ το χρονόμετρο τρέχει</string>



    <!-- Setting labels on Set alarm screen: Increasing volume on or off -->

    <string name="alarm_incvol">Αυξανόμενη ένταση</string>

    <string name="alarm_increasing_volume">Αυξανόμενη ένταση</string>



    <!-- CYANOGENMOD ADDITIONS END -->

</resources>

res/values-es/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ 
    <string name="stopwatch_settings">CRONÓMETRO</string>

    <string name="keep_display_on_stopwatch">Mantener pantalla encendida</string>

    <string name="keep_display_on_stopwatch_summary">La pantalla permanecerá encendida mientras el cronómetro esté en marcha</string>

    <string name="alarm_incvol">Volumen ascendente</string>

    <string name="alarm_increasing_volume">Volumen ascendente</string>



    <!-- CYANOGENMOD ADDITIONS END -->

</resources>

res/values-fr/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ 
    <string name="shake_action_summary">Secouer l\'appareil <xliff:g id="action">%s</xliff:g></string>



    <!-- Setting labels on Set alarm screen: Increasing volume on or off -->

    <string name="alarm_incvol">Volume progressif</string>

    <string name="alarm_increasing_volume">Volume progressif</string>



    <!-- Summary texts for shake and flip actions. Must be ordered by numerical

         value (do nothing = 0, snooze = 1, dismiss = 2) -->

res/values-hu/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
    <string name="default_label" msgid="5590025289805630372">"Ébresztő"</string>

    <string name="set_alarm" msgid="9148359866152726808">"Ébresztés beállítása"</string>

    <string name="alarm_vibrate" msgid="3476686921490362230">"Rezgés"</string>

    <string name="alarm_incvol">Emelkedő csengőhang</string>

    <string name="alarm_increasing_volume">Emelkedő csengőhang</string>

    <string name="alarm_repeat" msgid="7242985466344233206">"Ismétlődés"</string>

    <string name="alert" msgid="6506982899651975645">"Ébresztés csengőhangja"</string>

    <string name="ringtone" msgid="9110746249688559579">"Csengőhang"</string>