Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 895eee7b authored by Joe Onorato's avatar Joe Onorato Committed by Android (Google) Code Review
Browse files

Merge "Remove the volume slider in SystemUI." into honeycomb

parents 95a95717 d7cbe592

packages/SystemUI/res/layout-xlarge/status_bar_settings_view.xml

+0 −18
Original line number Diff line number Diff line
@@ -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"

packages/SystemUI/src/com/android/systemui/statusbar/tablet/SettingsView.java

+0 −3
Original line number Diff line number Diff line
@@ -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,