diff options
-rw-r--r-- | app/src/main/java/org/connectbot/util/VolumePreference.java | 18 | ||||
-rw-r--r-- | app/src/main/res/drawable-hdpi/ic_volume_up.png | bin | 0 -> 518 bytes | |||
-rw-r--r-- | app/src/main/res/drawable-mdpi/ic_volume_up.png | bin | 0 -> 365 bytes | |||
-rw-r--r-- | app/src/main/res/drawable-xhdpi/ic_volume_up.png | bin | 0 -> 654 bytes | |||
-rw-r--r-- | app/src/main/res/drawable-xxhdpi/ic_volume_up.png | bin | 0 -> 998 bytes | |||
-rw-r--r-- | app/src/main/res/drawable-xxxhdpi/ic_volume_up.png | bin | 0 -> 1304 bytes | |||
-rw-r--r-- | app/src/main/res/layout/volume_preference_dialog_layout.xml | 51 | ||||
-rw-r--r-- | app/src/main/res/values/strings.xml | 3 |
8 files changed, 63 insertions, 9 deletions
diff --git a/app/src/main/java/org/connectbot/util/VolumePreference.java b/app/src/main/java/org/connectbot/util/VolumePreference.java index 09feb61..e33582d 100644 --- a/app/src/main/java/org/connectbot/util/VolumePreference.java +++ b/app/src/main/java/org/connectbot/util/VolumePreference.java @@ -24,6 +24,8 @@ import android.view.View; import android.widget.SeekBar; import android.widget.SeekBar.OnSeekBarChangeListener; +import org.connectbot.R; + /** * @author kenny * @@ -46,20 +48,18 @@ 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) { + super.onBindDialogView(view); + + SeekBar volumeBar = (SeekBar) view.findViewById(R.id.volume_bar); + volumeBar.setProgress((int) (getPersistedFloat( PreferenceConstants.DEFAULT_BELL_VOLUME) * 100)); - sb.setPadding(10, 10, 10, 10); - sb.setOnSeekBarChangeListener(this); - - return sb; + volumeBar.setOnSeekBarChangeListener(this); } public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) { diff --git a/app/src/main/res/drawable-hdpi/ic_volume_up.png b/app/src/main/res/drawable-hdpi/ic_volume_up.png Binary files differnew file mode 100644 index 0000000..62d22be --- /dev/null +++ b/app/src/main/res/drawable-hdpi/ic_volume_up.png diff --git a/app/src/main/res/drawable-mdpi/ic_volume_up.png b/app/src/main/res/drawable-mdpi/ic_volume_up.png Binary files differnew file mode 100644 index 0000000..57d7871 --- /dev/null +++ b/app/src/main/res/drawable-mdpi/ic_volume_up.png diff --git a/app/src/main/res/drawable-xhdpi/ic_volume_up.png b/app/src/main/res/drawable-xhdpi/ic_volume_up.png Binary files differnew file mode 100644 index 0000000..2e751a4 --- /dev/null +++ b/app/src/main/res/drawable-xhdpi/ic_volume_up.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_volume_up.png b/app/src/main/res/drawable-xxhdpi/ic_volume_up.png Binary files differnew file mode 100644 index 0000000..96c1f98 --- /dev/null +++ b/app/src/main/res/drawable-xxhdpi/ic_volume_up.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_volume_up.png b/app/src/main/res/drawable-xxxhdpi/ic_volume_up.png Binary files differnew file mode 100644 index 0000000..fd633b6 --- /dev/null +++ b/app/src/main/res/drawable-xxxhdpi/ic_volume_up.png diff --git a/app/src/main/res/layout/volume_preference_dialog_layout.xml b/app/src/main/res/layout/volume_preference_dialog_layout.xml new file mode 100644 index 0000000..37f7bac --- /dev/null +++ b/app/src/main/res/layout/volume_preference_dialog_layout.xml @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ ConnectBot: simple, powerful, open-source SSH client for Android + ~ Copyright 2015 Kenny Root, Jeffrey Sharkey + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_height="wrap_content" + android:layout_width="fill_parent" + android:orientation="horizontal" + tools:ignore="PrivateResource" + android:paddingLeft="?attr/dialogPreferredPadding" + android:paddingStart="?attr/dialogPreferredPadding" + android:paddingEnd="?attr/dialogPreferredPadding" + android:paddingRight="?attr/dialogPreferredPadding" + > + + <ImageView + android:id="@+id/volume_up" + android:contentDescription="@string/image_description_volume" + android:layout_marginBottom="24dp" + android:layout_marginTop="24dp" + android:layout_height="36dp" + android:layout_width="36dp" + android:src="@drawable/ic_volume_up" + /> + + <SeekBar + android:id="@+id/volume_bar" + android:layout_gravity="center_vertical" + android:layout_height="wrap_content" + android:layout_width="fill_parent" + android:max="100" + android:progress="0" + android:secondaryProgress="0" + /> + +</LinearLayout> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b087bfd..d472353 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -602,6 +602,9 @@ purposes. --> <string name="image_description_right">Arrow right</string> + <!-- Describes the "volume" icon in the bell volume dialog for accessibility purposes. --> + <string name="image_description_volume">Volume</string> + <!-- Text for the "Esc" button in virtual keyboard. --> <string name="button_key_esc">Esc</string> <!-- Text for the "Ctrl" button in virtual keyboard. --> |