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

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

Snap for 5115288 from a74e5756 to pi-qpr2-release 

Change-Id: I3d9cb378d0b8d9cc0a190fdedf0cdff722a0d613
parents a0c85f89 a74e5756

res/values-ca/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
    <string name="notification_sent" msgid="9218710861333027778">"Bluetooth: <xliff:g id="FILE">%1$s</xliff:g> enviat"</string>

    <string name="notification_sent_complete" msgid="302943281067557969">"100% complet"</string>

    <string name="notification_sent_fail" msgid="6696082233774569445">"Bluetooth: <xliff:g id="FILE">%1$s</xliff:g> no enviat"</string>

    <string name="download_title" msgid="3353228219772092586">"Transferència del fitxer"</string>

    <string name="download_title" msgid="3353228219772092586">"Transferència de fitxers"</string>

    <string name="download_line1" msgid="4926604799202134144">"De: \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>

    <string name="download_line2" msgid="5876973543019417712">"Fitxer: <xliff:g id="FILE">%1$s</xliff:g>"</string>

    <string name="download_line3" msgid="4384821622908676061">"Mida del fitxer: <xliff:g id="SIZE">%1$s</xliff:g>"</string>

res/values-mr/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ 
    <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"साफ करा"</string>

    <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"सेव्ह करा"</string>

    <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"रद्द करा"</string>

    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"तुम्ही ब्लूटूथद्वारे सामायिक करू इच्छित असलेली खाती निवडा. कनेक्ट करताना अद्याप तुम्ही खात्यांमधील कोणताही अॅक्सेस स्वीकारण्याची आवश्यकता आहे."</string>

    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"तुम्ही ब्लूटूथद्वारे शेअर करू इच्छित असलेली खाती निवडा. कनेक्ट करताना अद्याप तुम्ही खात्यांमधील कोणताही अॅक्सेस स्वीकारण्याची आवश्यकता आहे."</string>

    <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"स्लॉट शिल्लक:"</string>

    <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"अॅप्लिकेशन आयकन"</string>

    <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"ब्लूटूथ मेसेज सामायिकरण सेटिंग्ज"</string>

src/com/android/bluetooth/newavrcp/AvrcpVolumeManager.java

+9 −8
Original line number Diff line number Diff line
@@ -36,11 +36,12 @@ class AvrcpVolumeManager extends AudioDeviceCallback { 
    public static final boolean DEBUG = true;



    // All volumes are stored at system volume values, not AVRCP values

    public static final String VOLUME_MAP = "bluetooth_volume_map";

    public static final String VOLUME_BLACKLIST = "absolute_volume_blacklist";

    public static final int AVRCP_MAX_VOL = 127;

    public static int sDeviceMaxVolume = 0;

    public static final int STREAM_MUSIC = AudioManager.STREAM_MUSIC;

    private static final String VOLUME_MAP = "bluetooth_volume_map";

    private static final String VOLUME_BLACKLIST = "absolute_volume_blacklist";

    private static final int AVRCP_MAX_VOL = 127;

    private static final int STREAM_MUSIC = AudioManager.STREAM_MUSIC;

    private static int sDeviceMaxVolume = 0;

    private static int sNewDeviceVolume = 0;



    Context mContext;

    AudioManager mAudioManager;
@@ -72,10 +73,9 @@ class AvrcpVolumeManager extends AudioDeviceCallback { 
        mAudioManager.avrcpSupportsAbsoluteVolume(device.getAddress(), mDeviceMap.get(device));



        // Get the current system volume and try to get the preference volume

        int currVolume = mAudioManager.getStreamVolume(STREAM_MUSIC);

        int savedVolume = getVolume(device, currVolume);

        int savedVolume = getVolume(device, sNewDeviceVolume);



        d("switchVolumeDevice: currVolume=" + currVolume + " savedVolume=" + savedVolume);

        d("switchVolumeDevice: savedVolume=" + savedVolume);



        // If absolute volume for the device is supported, set the volume for the device

        if (mDeviceMap.get(device)) {
@@ -91,6 +91,7 @@ class AvrcpVolumeManager extends AudioDeviceCallback { 
        mAudioManager = audioManager;

        mNativeInterface = nativeInterface;

        sDeviceMaxVolume = mAudioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC);

        sNewDeviceVolume = sDeviceMaxVolume / 2;



        mAudioManager.registerAudioDeviceCallback(this, null);