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

Commit 84f9ab29 authored by John Spurlock's avatar John Spurlock Committed by Android (Google) Code Review
Browse files

Merge "Volume: Make VolumeUI startup configurable." into lmp-mr1-dev

parents f9f7acf2 f2565a8b

packages/SystemUI/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -252,5 +252,8 @@ 


    <!-- Zen toast visibility duration -->

    <integer name="zen_toast_visible_duration">500</integer>



    <!-- Enable the default volume dialog -->

    <bool name="enable_volume_ui">true</bool>

</resources>

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+3 −1
Original line number Diff line number Diff line
@@ -801,7 +801,9 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
        }

        mUserInfoController = new UserInfoController(mContext);

        mVolumeComponent = getComponent(VolumeComponent.class);

        if (mVolumeComponent != null) {

            mZenModeController = mVolumeComponent.getZenController();

        }

        mCastController = new CastControllerImpl(mContext);

        final SignalClusterView signalCluster =

                (SignalClusterView) mStatusBarView.findViewById(R.id.signal_cluster);

packages/SystemUI/src/com/android/systemui/volume/VolumeUI.java

+4 −4
Original line number Diff line number Diff line 
package com.android.systemui.volume;



import android.content.Context;

import android.content.Intent;

import android.content.res.Configuration;

import android.database.ContentObserver;

import android.media.AudioManager;
@@ -11,13 +10,10 @@ import android.media.session.ISessionController; 
import android.media.session.MediaController;

import android.media.session.MediaSessionManager;

import android.net.Uri;

import android.os.AsyncTask;

import android.os.Handler;

import android.os.RemoteException;

import android.os.UserHandle;

import android.provider.Settings;

import android.util.Log;

import android.view.WindowManagerGlobal;



import com.android.systemui.R;

import com.android.systemui.SystemUI;
@@ -53,6 +49,7 @@ public class VolumeUI extends SystemUI { 


    private final Handler mHandler = new Handler();



    private boolean mEnabled;

    private AudioManager mAudioManager;

    private MediaSessionManager mMediaSessionManager;

    private VolumeController mVolumeController;
@@ -63,6 +60,8 @@ public class VolumeUI extends SystemUI { 


    @Override

    public void start() {

        mEnabled = mContext.getResources().getBoolean(R.bool.enable_volume_ui);

        if (!mEnabled) return;

        mAudioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);

        mMediaSessionManager = (MediaSessionManager) mContext

                .getSystemService(Context.MEDIA_SESSION_SERVICE);
@@ -84,6 +83,7 @@ public class VolumeUI extends SystemUI { 


    @Override

    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

        pw.print("mEnabled="); pw.println(mEnabled);

        if (mPanel != null) {

            mPanel.dump(fd, pw, args);

        }