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

Commit e0b68bb2 authored by Sanket Padawe's avatar Sanket Padawe Committed by Android Git Automerger
Browse files

am c4bacdd1: am 89eea3d0: Merge "Make string to plurals in BT inbound/outbound... 

am c4bacdd1: am 89eea3d0: Merge "Make string to plurals in BT inbound/outbound notification." into mnc-dev

* commit 'c4bacdd1':
  Make string to plurals in BT inbound/outbound notification.
parents d698c25f c4bacdd1

android/app/res/values/strings.xml

+8 −1
Original line number Original line Diff line number Diff line
@@ -214,7 +214,14 @@ 
    <string name="transfer_clear_dlg_msg">All items will be cleared from the list.</string>

    <string name="transfer_clear_dlg_msg">All items will be cleared from the list.</string>

    <string name="outbound_noti_title">Bluetooth share: Sent files</string>

    <string name="outbound_noti_title">Bluetooth share: Sent files</string>

    <string name="inbound_noti_title">Bluetooth share: Received files</string>

    <string name="inbound_noti_title">Bluetooth share: Received files</string>

    <string name="noti_caption"> <xliff:g id="successful_number">%1$s</xliff:g> successful, <xliff:g id="unsuccessful_number">%2$s</xliff:g> unsuccessful.</string>

    <plurals name="noti_caption_unsuccessful">

        <item quantity="one"><xliff:g id="unsuccessful_number">%1$d</xliff:g> unsuccessful.</item>

        <item quantity="other"><xliff:g id="unsuccessful_number">%1$d</xliff:g> unsuccessful.</item>

    </plurals>

    <plurals name="noti_caption_success">

        <item quantity="one"><xliff:g id="successful_number">%1$d</xliff:g> successful, %2$s</item>

        <item quantity="other"><xliff:g id="successful_number">%1$d</xliff:g> successful, %2$s</item>

    </plurals>





    <string name="transfer_menu_clear_all">Clear list</string>

    <string name="transfer_menu_clear_all">Clear list</string>

    <string name="transfer_menu_open">Open</string>

    <string name="transfer_menu_open">Open</string>

android/app/src/com/android/bluetooth/opp/BluetoothOppNotification.java

+11 −4
Original line number Original line Diff line number Diff line
@@ -351,6 +351,7 @@ class BluetoothOppNotification { 




    private void updateCompletedNotification() {

    private void updateCompletedNotification() {

        String title;

        String title;

        String unsuccess_caption;

        String caption;

        String caption;

        long timeStamp = 0;

        long timeStamp = 0;

        int outboundSuccNumber = 0;

        int outboundSuccNumber = 0;
@@ -409,8 +410,11 @@ class BluetoothOppNotification { 
            Notification outNoti = new Notification();

            Notification outNoti = new Notification();

            outNoti.icon = android.R.drawable.stat_sys_upload_done;

            outNoti.icon = android.R.drawable.stat_sys_upload_done;

            title = mContext.getString(R.string.outbound_noti_title);

            title = mContext.getString(R.string.outbound_noti_title);

            caption = mContext.getString(R.string.noti_caption, outboundSuccNumber,

            unsuccess_caption = mContext.getResources().getQuantityString(

                    outboundFailNumber);

                    R.plurals.noti_caption_unsuccessful, outboundFailNumber, outboundFailNumber);

            caption = mContext.getResources().getQuantityString(

                    R.plurals.noti_caption_success, outboundSuccNumber, outboundSuccNumber,

                    unsuccess_caption);

            intent = new Intent(Constants.ACTION_OPEN_OUTBOUND_TRANSFER);

            intent = new Intent(Constants.ACTION_OPEN_OUTBOUND_TRANSFER);

            intent.setClassName(Constants.THIS_PACKAGE_NAME, BluetoothOppReceiver.class.getName());

            intent.setClassName(Constants.THIS_PACKAGE_NAME, BluetoothOppReceiver.class.getName());

            outNoti.color = mContext.getResources().getColor(

            outNoti.color = mContext.getResources().getColor(
@@ -458,8 +462,11 @@ class BluetoothOppNotification { 
            Notification inNoti = new Notification();

            Notification inNoti = new Notification();

            inNoti.icon = android.R.drawable.stat_sys_download_done;

            inNoti.icon = android.R.drawable.stat_sys_download_done;

            title = mContext.getString(R.string.inbound_noti_title);

            title = mContext.getString(R.string.inbound_noti_title);

            caption = mContext.getString(R.string.noti_caption, inboundSuccNumber,

            unsuccess_caption = mContext.getResources().getQuantityString(

                    inboundFailNumber);

                    R.plurals.noti_caption_unsuccessful, inboundFailNumber, inboundFailNumber);

            caption = mContext.getResources().getQuantityString(

                    R.plurals.noti_caption_success, inboundSuccNumber, inboundSuccNumber,

                    unsuccess_caption);

            intent = new Intent(Constants.ACTION_OPEN_INBOUND_TRANSFER);

            intent = new Intent(Constants.ACTION_OPEN_INBOUND_TRANSFER);

            intent.setClassName(Constants.THIS_PACKAGE_NAME, BluetoothOppReceiver.class.getName());

            intent.setClassName(Constants.THIS_PACKAGE_NAME, BluetoothOppReceiver.class.getName());

            inNoti.color = mContext.getResources().getColor(

            inNoti.color = mContext.getResources().getColor(