summaryrefslogtreecommitdiffstats
path: root/res/layout/preference_dialog_ringervolume.xml
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2010-01-25 09:17:53 -0800
committerAmith Yamasani <yamasani@google.com>2010-01-25 14:58:34 -0800
commit992f10240d0bfd78bb99855fe23ec7a1b61a2551 (patch)
treef898ca1a619aab382747bb2629fe51b6459df584 /res/layout/preference_dialog_ringervolume.xml
parent3587f3d1bbd8c0ea525d216bd1c37ab948493671 (diff)
downloadpackages_apps_Settings-992f10240d0bfd78bb99855fe23ec7a1b61a2551.zip
packages_apps_Settings-992f10240d0bfd78bb99855fe23ec7a1b61a2551.tar.gz
packages_apps_Settings-992f10240d0bfd78bb99855fe23ec7a1b61a2551.tar.bz2
Refactor settings hierarchy and clump all volumes in one dialog.
Bug:2362077 Bug:2312836 Bug:2166486 Split Sound and Display into separate top-level settings. All volume settings (including Alarm volume) now in one Volume dialog. Remove some sub-texts to reduce clutter.
Diffstat (limited to 'res/layout/preference_dialog_ringervolume.xml')
-rw-r--r--res/layout/preference_dialog_ringervolume.xml32
1 files changed, 31 insertions, 1 deletions
diff --git a/res/layout/preference_dialog_ringervolume.xml b/res/layout/preference_dialog_ringervolume.xml
index a23e313..e8dc704 100644
--- a/res/layout/preference_dialog_ringervolume.xml
+++ b/res/layout/preference_dialog_ringervolume.xml
@@ -34,7 +34,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/incoming_call_volume_title"
- android:paddingTop="20dip"
+ android:paddingTop="10dip"
android:paddingLeft="20dip"
android:paddingRight="20dip" />
@@ -46,6 +46,36 @@
android:paddingLeft="20dip"
android:paddingRight="20dip" />
+ <!-- Used for the media volume -->
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/media_volume_title"
+ android:paddingTop="10dip"
+ android:paddingLeft="20dip"
+ android:paddingRight="20dip" />
+ <SeekBar android:id="@+id/media_volume_seekbar"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingTop="6dip"
+ android:paddingLeft="20dip"
+ android:paddingRight="20dip" />
+
+ <!-- Used for the alarm volume -->
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/alarm_volume_title"
+ android:paddingTop="10dip"
+ android:paddingLeft="20dip"
+ android:paddingRight="20dip" />
+ <SeekBar android:id="@+id/alarm_volume_seekbar"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingTop="6dip"
+ android:paddingLeft="20dip"
+ android:paddingRight="20dip" />
+
<CheckBox android:id="@+id/same_notification_volume"
android:layout_width="match_parent"
android:layout_height="wrap_content"