Update recipient preference style

// FREEBIE
This commit is contained in:
Moxie Marlinspike
2017-08-22 14:00:09 -07:00
parent 64ad9ec9dd
commit 6bfe05323e
3 changed files with 20 additions and 12 deletions

View File

@@ -2,7 +2,9 @@ package org.thoughtcrime.securesms.preferences;
import android.content.Context;
import android.net.Uri;
import android.os.Build;
import android.preference.RingtonePreference;
import android.support.annotation.RequiresApi;
import android.util.AttributeSet;
@@ -20,9 +22,15 @@ public class AdvancedRingtonePreference extends RingtonePreference {
super(context);
}
@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
public AdvancedRingtonePreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
}
@Override
protected Uri onRestoreRingtone() {
return currentRingtone;
if (currentRingtone == null) return super.onRestoreRingtone();
else return currentRingtone;
}
public void setCurrentRingtone(Uri uri) {

View File

@@ -11,7 +11,7 @@ import android.widget.TextView;
import org.thoughtcrime.securesms.R;
public class SignalRingtonePreference extends RingtonePreference {
public class SignalRingtonePreference extends AdvancedRingtonePreference {
private TextView rightSummary;
private CharSequence summary;