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

Commit fae9909c authored by Brint E. Kriebel's avatar Brint E. Kriebel
Browse files

Merge branch 'cm-11.0' into stable/cm-11.0

parents 20b94b68 5426f615

res/layout-land/time_setup_view.xml

+27 −0
Original line number Diff line number Diff line
@@ -74,6 +74,33 @@ 
                layout="@layout/three_keys_view"

                android:id="@+id/fourth"/>



        <View

                android:layout_width="match_parent"

                android:layout_height="1dip"

                android:background="@color/hairline"/>



        <TextView

                android:id="@+id/choose_ringtone"

                android:layout_height="wrap_content"

                android:layout_width="match_parent"

                android:layout_marginEnd="16dp"

                android:layout_marginBottom="6dp"

                android:gravity="center_vertical"

                android:textAlignment="viewStart"

                style="@style/body"

                android:background="@drawable/item_background"

                android:clickable="true"

                android:textColor="@color/clock_white"

                android:ellipsize="marquee"

                android:scrollHorizontally="true"

                android:singleLine="true"

                android:marqueeRepeatLimit="marquee_forever"

                android:drawableStart="@drawable/ic_ringtone"

                android:drawablePadding="2dp"

                android:layout_alignParentStart="true"

                android:layout_alignParentEnd="true"

                />



        <View

                android:layout_width="match_parent"

                android:layout_height="1dip"

res/layout/time_setup_view.xml

+25 −0
Original line number Diff line number Diff line
@@ -60,6 +60,31 @@ 
    <include layout="@layout/three_keys_view"

        android:id="@+id/fourth" />



    <View

        android:layout_width="match_parent"

        android:layout_height="1dip"

        android:background="@color/hairline"/>

    <TextView

        android:id="@+id/choose_ringtone"

        android:layout_height="wrap_content"

        android:layout_width="match_parent"

        android:layout_marginEnd="16dp"

        android:layout_marginBottom="6dp"

        android:gravity="center_vertical"

        android:textAlignment="viewStart"

        style="@style/body"

        android:background="@drawable/item_background"

        android:clickable="true"

        android:textColor="@color/clock_white"

        android:ellipsize="marquee"

        android:scrollHorizontally="true"

        android:singleLine="true"

        android:marqueeRepeatLimit="marquee_forever"

        android:drawableStart="@drawable/ic_ringtone"

        android:drawablePadding="2dp"

        android:layout_alignParentStart="true"

        android:layout_alignParentEnd="true"

        />

    <View

        android:layout_width="match_parent"

        android:layout_height="1dip"

res/values/cm_arrays.xml

+5 −0
Original line number Diff line number Diff line
@@ -34,4 +34,9 @@ 
        <item>@string/alarm_type_ringtone</item>

        <item>@string/alarm_type_random</item>

    </string-array>



    <string-array name="timer_ringtone_picker_entries" translatable="false">

        <item>@string/alarm_type_ringtone</item>

        <item>@string/alarm_type_default</item>

    </string-array>

</resources>

res/values/cm_strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ 
    <!-- Alarm types -->

    <string name="alarm_type_ringtone">Ringtone</string>

    <string name="alarm_type_random">Randomly</string>

    <string name="alarm_type_default">Default</string>



    <!-- Warn Silent Alarm title -->

    <string name="warn_silent_alarm_title">Alarm volume is silent</string>

src/com/android/deskclock/AlarmClockFragment.java

+4 −2
Original line number Diff line number Diff line
@@ -633,8 +633,8 @@ public class AlarmClockFragment extends DeskClockFragment implements 
            Alarm a = new Alarm();

            a.alert = RingtoneManager.getActualDefaultRingtoneUri(getActivity(),

                    RingtoneManager.TYPE_ALARM);

            if (a.alert == null) {

                a.alert = Uri.parse("content://settings/system/alarm_alert");

            if (!Utils.isRingToneUriValid(getActivity(), a.alert)) {

                a.alert = AlarmMediaPlayer.RANDOM_URI;

            }

            a.hour = hourOfDay;

            a.minutes = minute;
@@ -1331,6 +1331,8 @@ public class AlarmClockFragment extends DeskClockFragment implements 
            if (!Utils.isRingToneUriValid(mContext, alarm.alert)) {

                alarm.alert = RingtoneManager.getActualDefaultRingtoneUri(context,

                        RingtoneManager.TYPE_ALARM);

                if (!Utils.isRingToneUriValid(mContext, alarm.alert))

                    alarm.alert = AlarmMediaPlayer.RANDOM_URI;

                asyncUpdateAlarm(alarm, false);

            }

            final ItemHolder itemHolder = (ItemHolder) tag;