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

Commit 4406eb12 authored by Xin Li's avatar Xin Li
Browse files

Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master 

Bug: 79597307
Change-Id: I54ab875494a7f20c415330948a5fa3b5354f3afb
parents 0f8646ff 328ae5e5

Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -12,10 +12,11 @@ LOCAL_OVERRIDES_PACKAGES := AlarmClock 
LOCAL_SRC_FILES := $(call all-java-files-under, src gen)



LOCAL_STATIC_ANDROID_LIBRARIES := \

        android-support-design \

        $(ANDROID_SUPPORT_DESIGN_TARGETS) \

        android-support-percent \

        android-support-transition \

        android-support-compat \

        android-support-core-ui \

        android-support-media-compat \

        android-support-v13 \

        android-support-v14-preference \

AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
    <original-package android:name="com.android.alarmclock" />

    <original-package android:name="com.android.deskclock" />



    <uses-sdk android:minSdkVersion="19" targetSdkVersion="25" />

    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="25" />



    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

    <uses-permission android:name="android.permission.WAKE_LOCK" />
@@ -109,6 +109,7 @@ 
            android:theme="@android:style/Theme.NoDisplay">

            <intent-filter>

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

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

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

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

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

res/values-af/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -409,8 +409,14 @@ 
    <string name="alarm_is_dismissed" msgid="5509897230565826642">"Wekker vir <xliff:g id="ALARM_TIME">%s</xliff:g> is toegemaak"</string>

    <string name="alarm_is_set" msgid="5503226382620011088">"Wekker is gestel vir <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>

    <string name="timer_created" msgid="4381027137335885547">"Afteller is geskep"</string>

    <plurals name="expired_timers_dismissed" formatted="false" msgid="1294953410988488149">

      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> aftellers is stilgemaak</item>

      <item quantity="one">Afteller is stilgemaak</item>

    </plurals>

    <string name="timer_deleted" msgid="9110322362460029392">"Afteller is uitgevee"</string>

    <string name="invalid_timer_length" msgid="3104567893212932487">"Ongeldige aftellerlengte"</string>

    <string name="invalid_timer" msgid="900957020728335675">"Ongeldige afteller is gekies"</string>

    <string name="no_expired_timers" msgid="4624192298397846876">"Geen verstreke aftellers nie"</string>

    <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">"Wekker vir <xliff:g id="ALARM_TIME">%s</xliff:g> kan nog nie toegemaak word nie; nog meer as 24 uur ver"</string>

    <string name="dismiss_alarm" msgid="7204593078688533541">"Maak alarm toe"</string>

    <string name="pick_alarm_to_dismiss" msgid="5408769235866082896">"Kies watter wekker om toe te maak"</string>

res/values-am/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -409,8 +409,14 @@ 
    <string name="alarm_is_dismissed" msgid="5509897230565826642">"<xliff:g id="ALARM_TIME">%s</xliff:g> ማንቂያ ደወል ተሰናብቷል"</string>

    <string name="alarm_is_set" msgid="5503226382620011088">"ማንቂያ ደወል ለ<xliff:g id="ALARM_TIME">%s</xliff:g> ተዘጋጅቷል"</string>

    <string name="timer_created" msgid="4381027137335885547">"የሰዓት ቆጣሪ ተፈጥሯል"</string>

    <plurals name="expired_timers_dismissed" formatted="false" msgid="1294953410988488149">

      <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> ሰዓት ቆጣሪዎች ተሰናብተዋል</item>

      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> ሰዓት ቆጣሪዎች ተሰናብተዋል</item>

    </plurals>

    <string name="timer_deleted" msgid="9110322362460029392">"ሰዓት ቆጣሪ ተሰርዟል"</string>

    <string name="invalid_timer_length" msgid="3104567893212932487">"ልክ ያልሆነ የሰዓት ቆጣሪ ርዝመት"</string>

    <string name="invalid_timer" msgid="900957020728335675">"ልክ ያልሆነ ሰዓት ቆጣሪ ተመርጧል"</string>

    <string name="no_expired_timers" msgid="4624192298397846876">"ምንም ጊዜ ያለፈባቸው ሰዓት ቆጣሪዎች የሉም"</string>

    <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">"የ<xliff:g id="ALARM_TIME">%s</xliff:g> ማንቂያ ደውል ገና ሊሰናበት አይችልም፣ አሁንም ገና ከ24 ሰዓቶች በላይ ይቀራሉ"</string>

    <string name="dismiss_alarm" msgid="7204593078688533541">"ማንቂያ ሰርዝ"</string>

    <string name="pick_alarm_to_dismiss" msgid="5408769235866082896">"የትኛዎቹ ማንቂያ ደወሎች እንደሚሰናበቱ ይምረጡ"</string>

res/values-ar/strings.xml

+10 −0
Original line number Diff line number Diff line
@@ -445,8 +445,18 @@ 
    <string name="alarm_is_dismissed" msgid="5509897230565826642">"تم تجاهل المنبه <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>

    <string name="alarm_is_set" msgid="5503226382620011088">"تم ضبط المنبه على <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>

    <string name="timer_created" msgid="4381027137335885547">"تم إنشاء الموقت"</string>

    <plurals name="expired_timers_dismissed" formatted="false" msgid="1294953410988488149">

      <item quantity="zero">تم تجاهل <xliff:g id="NUMBER">%d</xliff:g> موقِّت</item>

      <item quantity="two">تم تجاهل موقِّتين (<xliff:g id="NUMBER">%d</xliff:g>)</item>

      <item quantity="few">تم تجاهل <xliff:g id="NUMBER">%d</xliff:g> موقِّتات</item>

      <item quantity="many">تم تجاهل <xliff:g id="NUMBER">%d</xliff:g> موقِّتًا</item>

      <item quantity="other">تم تجاهل <xliff:g id="NUMBER">%d</xliff:g> موقِّت</item>

      <item quantity="one">تم تجاهل موقِّت واحد</item>

    </plurals>

    <string name="timer_deleted" msgid="9110322362460029392">"تم حذف الموقِّت"</string>

    <string name="invalid_timer_length" msgid="3104567893212932487">"مدة الموقت غير صالحة"</string>

    <string name="invalid_timer" msgid="900957020728335675">"تم اختيار موقِّت غير صالح"</string>

    <string name="no_expired_timers" msgid="4624192298397846876">"لا يمكن تنفيذ الإجراء على الموقِّتات المنتهية"</string>

    <string name="alarm_cant_be_dismissed_still_more_than_24_hours_away" msgid="8810520940995307437">"لا يمكن تجاهل المنبه <xliff:g id="ALARM_TIME">%s</xliff:g> في الوقت الحالي، لأن موعده لا يزال يبعد أكثر من ٢٤ ساعة"</string>

    <string name="dismiss_alarm" msgid="7204593078688533541">"تجاهل التنبيه"</string>

    <string name="pick_alarm_to_dismiss" msgid="5408769235866082896">"اختر المنبه المراد تجاهله"</string>