summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Joe Onorato <joeo@google.com> 2011-01-12 15:45:20 -0800
committer Joe Onorato <joeo@google.com> 2011-01-12 15:45:20 -0800
commitd7cbe592dd210069a4186e39bad1a95f6884d34b (patch)
tree6e299bf64afe016b9b6c62bd3de74387f139817a
parent6014527c350895383b99ba91d3d009a32b1d22a6 (diff)
Remove the volume slider in SystemUI.
Bug: 3344667 Change-Id: I8701fadac1736c73fbecb6f50d2ced7bba2c559c
-rw-r--r--packages/SystemUI/res/layout-xlarge/status_bar_settings_view.xml18
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/tablet/SettingsView.java3
2 files changed, 0 insertions, 21 deletions
diff --git a/packages/SystemUI/res/layout-xlarge/status_bar_settings_view.xml b/packages/SystemUI/res/layout-xlarge/status_bar_settings_view.xml
index 5e36da3960a3..8a477e4f110c 100644
--- a/packages/SystemUI/res/layout-xlarge/status_bar_settings_view.xml
+++ b/packages/SystemUI/res/layout-xlarge/status_bar_settings_view.xml
@@ -120,24 +120,6 @@
</LinearLayout>
<View style="@style/StatusBarPanelSettingsPanelSeparator" />
- <!-- Volume -->
- <LinearLayout style="@style/StatusBarPanelSettingsRow" >
- <ImageView
- android:id="@+id/volume_icon"
- style="@style/StatusBarPanelSettingsIcon"
- android:src="@drawable/ic_sysbar_sound_on"
- />
- <com.android.systemui.statusbar.policy.ToggleSlider
- android:id="@+id/volume"
- android:layout_width="0dp"
- android:layout_height="fill_parent"
- android:layout_weight="1"
- android:layout_marginRight="2dp"
- systemui:text="@string/status_bar_settings_mute_label"
- />
- </LinearLayout>
- <View style="@style/StatusBarPanelSettingsPanelSeparator" />
-
<!-- Notifications / Do not disturb -->
<LinearLayout
android:id="@+id/do_not_disturb"
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/SettingsView.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/SettingsView.java
index 01436f8b19d0..07af46665623 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/SettingsView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/SettingsView.java
@@ -41,7 +41,6 @@ public class SettingsView extends LinearLayout implements View.OnClickListener {
AirplaneModeController mAirplane;
AutoRotateController mRotate;
- VolumeController mVolume;
BrightnessController mBrightness;
DoNotDisturbController mDoNotDisturb;
@@ -64,8 +63,6 @@ public class SettingsView extends LinearLayout implements View.OnClickListener {
findViewById(R.id.network).setOnClickListener(this);
mRotate = new AutoRotateController(context,
(CompoundButton)findViewById(R.id.rotate_checkbox));
- mVolume = new VolumeController(context,
- (ToggleSlider)findViewById(R.id.volume));
mBrightness = new BrightnessController(context,
(ToggleSlider)findViewById(R.id.brightness));
mDoNotDisturb = new DoNotDisturbController(context,