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

Commit d5b71806 authored by Sergey Ten's avatar Sergey Ten Committed by Josh Guilfoyle
Browse files

Pass back to the caller ringtone title. It's necessary if the activity is... 

Pass back to the caller ringtone title. It's necessary if the activity is invoked from customize ringtone screen.
parent 5c636b04

core/java/com/android/internal/app/RingtonePickerActivity.java

+6 −4
Original line number Diff line number Diff line
@@ -24,16 +24,14 @@ import android.media.Ringtone; 
import android.media.RingtoneManager;

import android.net.Uri;

import android.os.Bundle;

import android.os.Debug;

import android.os.Handler;

import android.provider.MediaStore;

import android.provider.Settings;

import android.provider.MediaStore;

import android.util.Log;

import android.view.View;

import android.widget.AdapterView;

import android.widget.Button;

import android.widget.ImageView;

import android.widget.ListAdapter;

import android.widget.ListView;

import android.widget.SimpleCursorAdapter;

import android.widget.TextView;
@@ -271,6 +269,7 @@ public final class RingtonePickerActivity extends Activity implements AdapterVie 
        if (positiveResult) {

            Intent resultIntent = new Intent();

            Uri uri = null;

            String title = null;



            if (mClickedPos == mDefaultRingtonePos) {

                // Set it to the default Uri that they originally gave us
@@ -279,10 +278,13 @@ public final class RingtonePickerActivity extends Activity implements AdapterVie 
                // A null Uri is for the 'Silent' item

                uri = null;

            } else {

                Cursor cursor = (Cursor)mListView.getAdapter().getItem(mClickedPos);

                title = cursor.getString(cursor.getColumnIndex(MediaStore.Audio.Media.TITLE));

                uri = mRingtoneManager.getRingtoneUri(getRingtoneManagerPosition(mClickedPos));

            }



            resultIntent.putExtra(RingtoneManager.EXTRA_RINGTONE_PICKED_URI, uri);

            resultIntent.putExtra(RingtoneManager.EXTRA_RINGTONE_TITLE, title);

            setResult(RESULT_OK, resultIntent);

//            RingtoneManager.setActualDefaultRingtoneUri(this, RingtoneManager.TYPE_RINGTONE,uri);

        } else {