From 9b435c91c5d6e13efc004f0caa88ee36916b9534 Mon Sep 17 00:00:00 2001 From: John Heroy Date: Tue, 20 Oct 2015 16:04:40 -0700 Subject: Use volume icon in 'bell volume' dialog and factor out SeekBar declaration to an XML layout --- .../java/org/connectbot/util/VolumePreference.java | 24 ++++++++-------------- 1 file changed, 8 insertions(+), 16 deletions(-) (limited to 'app/src/main/java/org') diff --git a/app/src/main/java/org/connectbot/util/VolumePreference.java b/app/src/main/java/org/connectbot/util/VolumePreference.java index 82685a4..c5ef549 100644 --- a/app/src/main/java/org/connectbot/util/VolumePreference.java +++ b/app/src/main/java/org/connectbot/util/VolumePreference.java @@ -18,13 +18,14 @@ package org.connectbot.util; import android.content.Context; -import android.os.Build; import android.preference.DialogPreference; import android.util.AttributeSet; import android.view.View; import android.widget.SeekBar; import android.widget.SeekBar.OnSeekBarChangeListener; +import org.connectbot.R; + /** * @author kenny * @@ -47,26 +48,17 @@ public class VolumePreference extends DialogPreference implements OnSeekBarChang } private void setupLayout(Context context, AttributeSet attrs) { + setDialogLayoutResource(R.layout.volume_preference_dialog_layout); setPersistent(true); } @Override - protected View onCreateDialogView() { - SeekBar sb = new SeekBar(getContext()); - - sb.setMax(100); - sb.setProgress((int) (getPersistedFloat( + protected void onBindDialogView(View view) { + SeekBar volumeBar = (SeekBar) view.findViewById(R.id.volume_bar); + volumeBar.setProgress((int) (getPersistedFloat( PreferenceConstants.DEFAULT_BELL_VOLUME) * 100)); - - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - sb.setPadding(75, 70, 75, 10); - } else { - sb.setPadding(10, 10, 10, 10); - } - - sb.setOnSeekBarChangeListener(this); - - return sb; + volumeBar.setOnSeekBarChangeListener(this); + super.onBindDialogView(view); } public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) { -- cgit v1.2.3