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

Commit ee566ace authored by android-build-team Robot's avatar android-build-team Robot
Browse files

release-request-7bfcab52-d1c0-4256-9d6b-5b5092bc78ca-for-git_oc-mr1-release-41... 

release-request-7bfcab52-d1c0-4256-9d6b-5b5092bc78ca-for-git_oc-mr1-release-4133428 snap-temp-L95800000077479875

Change-Id: Ie66ed2b82997f548d60dbd5dd10b296fc7a93ef9
parents abcd8931 f4f4046d

res/values-uz/strings.xml

+4 −4
Original line number Diff line number Diff line
@@ -257,14 +257,14 @@ 
    <string name="hamburger_feature_highlight_header" msgid="5762679188565585072">"Tavsiyalar"</string>

    <string name="hamburger_feature_highlight_body" msgid="4403398269286898733">"Kontaktlar bilan qulay ishlash uchun ularni tartibga soling"</string>

    <string name="undo" msgid="1425165101664071422">"Bekor qilish"</string>

    <string name="call_custom" msgid="6385303130912713318">"Qo‘ng‘iroq qilish (<xliff:g id="CUSTOM_LABEL">%s</xliff:g>)"</string>

    <string name="call_custom" msgid="6385303130912713318">"Chaqiruv (<xliff:g id="CUSTOM_LABEL">%s</xliff:g>)"</string>

    <string name="call_home" msgid="1990519474420545392">"Uy telefoni"</string>

    <string name="call_mobile" msgid="7502236805487609178">"Mobil telefon"</string>

    <string name="call_work" msgid="5328785911463744028">"Ishxona telefoni"</string>

    <string name="call_fax_work" msgid="7467763592359059243">"Ishxona faksi"</string>

    <string name="call_fax_home" msgid="8342175628887571876">"Uy faksi"</string>

    <string name="call_pager" msgid="9003902812293983281">"Peyjer"</string>

    <string name="call_other" msgid="8563753966926932052">"Qo‘ng‘iroq qilish"</string>

    <string name="call_other" msgid="8563753966926932052">"Chaqiruv"</string>

    <string name="call_callback" msgid="1910165691349426858">"Teskari chaqiruv"</string>

    <string name="call_car" msgid="3280537320306436445">"Avtomobildagi telefon"</string>

    <string name="call_company_main" msgid="6105120947138711257">"Ofis"</string>
@@ -276,9 +276,9 @@ 
    <string name="call_tty_tdd" msgid="8951266948204379604">"Teletayp"</string>

    <string name="call_work_mobile" msgid="8707874281430105394">"Ishxona mobil telefoni"</string>

    <string name="call_work_pager" msgid="3419348514157949008">"Ish peyjeri"</string>

    <string name="call_assistant" msgid="670941612175068337">"Qo‘ng‘iroq qilish (<xliff:g id="CUSTOM_LABEL">%s</xliff:g>)"</string>

    <string name="call_assistant" msgid="670941612175068337">"Chaqiruv (<xliff:g id="CUSTOM_LABEL">%s</xliff:g>)"</string>

    <string name="call_mms" msgid="6274041545876221437">"MMS markazi"</string>

    <string name="call_by_shortcut" msgid="2566802538698913124">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Qo‘ng‘iroq qilish)"</string>

    <string name="call_by_shortcut" msgid="2566802538698913124">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Chaqiruv)"</string>

    <string name="sms_custom" msgid="415060214233647603">"SMS yuborish (<xliff:g id="CUSTOM_LABEL">%s</xliff:g>)"</string>

    <string name="sms_home" msgid="7524332261493162995">"SMS: uy telefoni"</string>

    <string name="sms_mobile" msgid="5200107250451030769">"SMS: mobil"</string>

src/com/android/contacts/vcard/NotificationImportExportListener.java

+11 −11
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ public class NotificationImportExportListener implements VCardImportExportListen 


        final NotificationCompat.Builder builder = new NotificationCompat.Builder(context);

        builder.setOngoing(true)

                .setChannel(ContactsNotificationChannelsUtil.DEFAULT_CHANNEL)

                .setChannelId(ContactsNotificationChannelsUtil.DEFAULT_CHANNEL)

                .setOnlyAlertOnce(true)

                .setProgress(totalCount, currentCount, totalCount == - 1)

                .setTicker(tickerText)
@@ -235,7 +235,7 @@ public class NotificationImportExportListener implements VCardImportExportListen 
                    NumberFormat.getPercentInstance().format((double) currentCount / totalCount);

            builder.setContentText(percentage);

        }

        return builder.getNotification();

        return builder.build();

    }



    /**
@@ -247,8 +247,8 @@ public class NotificationImportExportListener implements VCardImportExportListen 
    /* package */ static Notification constructCancelNotification(

            Context context, String description) {

        ContactsNotificationChannelsUtil.createDefaultChannel(context);

        return new NotificationCompat.Builder(context)

                .setChannel(ContactsNotificationChannelsUtil.DEFAULT_CHANNEL)

        return new NotificationCompat.Builder(context,

                ContactsNotificationChannelsUtil.DEFAULT_CHANNEL)

                .setAutoCancel(true)

                .setSmallIcon(android.R.drawable.stat_notify_error)

                .setColor(context.getResources().getColor(R.color.dialtacts_theme_color))
@@ -258,7 +258,7 @@ public class NotificationImportExportListener implements VCardImportExportListen 
                // app to make sure that no other app can steal this pending-intent b/19296918.

                .setContentIntent(PendingIntent

                        .getActivity(context, 0, new Intent(context.getPackageName(), null), 0))

                .getNotification();

                .build();

    }



    /**
@@ -279,8 +279,8 @@ public class NotificationImportExportListener implements VCardImportExportListen 
    /* package */ static Notification constructFinishNotificationWithFlags(

            Context context, String title, String description, Intent intent, int flags) {

        ContactsNotificationChannelsUtil.createDefaultChannel(context);

        return new NotificationCompat.Builder(context)

                .setChannel(ContactsNotificationChannelsUtil.DEFAULT_CHANNEL)

        return new NotificationCompat.Builder(context,

                ContactsNotificationChannelsUtil.DEFAULT_CHANNEL)

                .setAutoCancel(true)

                .setColor(context.getResources().getColor(R.color.dialtacts_theme_color))

                .setSmallIcon(R.drawable.quantum_ic_done_vd_theme_24)
@@ -292,7 +292,7 @@ public class NotificationImportExportListener implements VCardImportExportListen 
                .setContentIntent(PendingIntent.getActivity(context, 0,

                        (intent != null ? intent : new Intent(context.getPackageName(), null)),

                        flags))

                .getNotification();

                .build();

    }



    /**
@@ -304,8 +304,8 @@ public class NotificationImportExportListener implements VCardImportExportListen 
    /* package */ static Notification constructImportFailureNotification(

            Context context, String reason) {

        ContactsNotificationChannelsUtil.createDefaultChannel(context);

        return new NotificationCompat.Builder(context)

                .setChannel(ContactsNotificationChannelsUtil.DEFAULT_CHANNEL)

        return new NotificationCompat.Builder(context,

                ContactsNotificationChannelsUtil.DEFAULT_CHANNEL)

                .setAutoCancel(true)

                .setColor(context.getResources().getColor(R.color.dialtacts_theme_color))

                .setSmallIcon(android.R.drawable.stat_notify_error)
@@ -315,6 +315,6 @@ public class NotificationImportExportListener implements VCardImportExportListen 
                // app to make sure that no other app can steal this pending-intent b/19296918.

                .setContentIntent(PendingIntent

                        .getActivity(context, 0, new Intent(context.getPackageName(), null), 0))

                .getNotification();

                .build();

    }

}