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

Commit 96456b51 authored by Etienne Ruffieux's avatar Etienne Ruffieux Committed by Automerger Merge Worker
Browse files

Merge "Replaced ICU by <xliff> for OPP notification" into tm-dev am: 22cc8e2a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/18883226



Change-Id: I97ca11aeaffe18958233757808fa6c313fcedc59
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 34e677c3 22cc8e2a

android/app/res/values/strings.xml

+2 −6
Original line number Original line Diff line number Diff line
@@ -211,12 +211,8 @@ 
    <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_unsuccessful"> {count, plural,

    <string name="noti_caption_unsuccessful"> <xliff:g id="count">%d</xliff:g> unsuccessful.</string>

        other {# unsuccessful.}

    <string name="noti_caption_success"><xliff:g id="count">%d</xliff:g> successful,</string>

    }</string>

    <string name="noti_caption_success"> {count, plural,

        other {# successful, %1$s}

    }</string>





    <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

+4 −4
Original line number Original line Diff line number Diff line
@@ -437,8 +437,8 @@ class BluetoothOppNotification { 
        outboundNum = outboundSuccNumber + outboundFailNumber;

        outboundNum = outboundSuccNumber + outboundFailNumber;

        // create the outbound notification

        // create the outbound notification

        if (outboundNum > 0) {

        if (outboundNum > 0) {

            String caption = BluetoothOppUtility.formatResultText(outboundSuccNumber,

            String caption = mContext.getString(R.string.noti_caption_success, outboundSuccNumber)

                    outboundFailNumber, mContext);

                    + mContext.getString(R.string.noti_caption_unsuccessful, outboundFailNumber);

            Intent contentIntent = new Intent(Constants.ACTION_OPEN_OUTBOUND_TRANSFER).setClassName(

            Intent contentIntent = new Intent(Constants.ACTION_OPEN_OUTBOUND_TRANSFER).setClassName(

                    mContext, BluetoothOppReceiver.class.getName());

                    mContext, BluetoothOppReceiver.class.getName());

            Intent deleteIntent = new Intent(Constants.ACTION_COMPLETE_HIDE).setClassName(

            Intent deleteIntent = new Intent(Constants.ACTION_COMPLETE_HIDE).setClassName(
@@ -501,8 +501,8 @@ class BluetoothOppNotification { 
        inboundNum = inboundSuccNumber + inboundFailNumber;

        inboundNum = inboundSuccNumber + inboundFailNumber;

        // create the inbound notification

        // create the inbound notification

        if (inboundNum > 0) {

        if (inboundNum > 0) {

            String caption = BluetoothOppUtility.formatResultText(inboundSuccNumber,

            String caption = mContext.getString(R.string.noti_caption_success, inboundSuccNumber)

                    inboundFailNumber, mContext);

                    + mContext.getString(R.string.noti_caption_unsuccessful, inboundFailNumber);

            Intent contentIntent = new Intent(Constants.ACTION_OPEN_INBOUND_TRANSFER).setClassName(

            Intent contentIntent = new Intent(Constants.ACTION_OPEN_INBOUND_TRANSFER).setClassName(

                    mContext, BluetoothOppReceiver.class.getName());

                    mContext, BluetoothOppReceiver.class.getName());

            Intent deleteIntent = new Intent(Constants.ACTION_COMPLETE_HIDE).setClassName(

            Intent deleteIntent = new Intent(Constants.ACTION_COMPLETE_HIDE).setClassName(

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

+0 −24
Original line number Original line Diff line number Diff line
@@ -43,7 +43,6 @@ import android.content.Intent; 
import android.content.pm.PackageManager;

import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.content.pm.ResolveInfo;

import android.database.Cursor;

import android.database.Cursor;

import android.icu.text.MessageFormat;

import android.net.Uri;

import android.net.Uri;

import android.os.Environment;

import android.os.Environment;

import android.os.ParcelFileDescriptor;

import android.os.ParcelFileDescriptor;
@@ -58,10 +57,7 @@ import java.math.RoundingMode; 
import java.text.DecimalFormat;

import java.text.DecimalFormat;

import java.util.ArrayList;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Arrays;

import java.util.HashMap;

import java.util.List;

import java.util.List;

import java.util.Locale;

import java.util.Map;

import java.util.concurrent.ConcurrentHashMap;

import java.util.concurrent.ConcurrentHashMap;





/**

/**
@@ -318,26 +314,6 @@ public class BluetoothOppUtility { 
        return df.format(percent);

        return df.format(percent);

    }

    }





    /**

     * Helper function to build the result notification text content.

     */

    static String formatResultText(int countSuccess, int countUnsuccessful, Context context) {

        if (context == null) {

            return null;

        }

        Map<String, Object> mapUnsuccessful = new HashMap<>();

        mapUnsuccessful.put("count", countUnsuccessful);



        Map<String, Object> mapSuccess = new HashMap<>();

        mapSuccess.put("count", countSuccess);



        return new MessageFormat(context.getResources().getString(R.string.noti_caption_success,

                new MessageFormat(context.getResources().getString(

                        R.string.noti_caption_unsuccessful),

                        Locale.getDefault()).format(mapUnsuccessful)),

                Locale.getDefault()).format(mapSuccess);

    }



    /**

    /**

     * Whether the device has the "nosdcard" characteristic or not.

     * Whether the device has the "nosdcard" characteristic or not.

     */

     */