Merge "MediaRouter: Disable volume slider for fixed volume devices" into mnc-ub-dev
diff --git a/v7/mediarouter/src/android/support/v7/app/MediaRouteControllerDialog.java b/v7/mediarouter/src/android/support/v7/app/MediaRouteControllerDialog.java
index 88a28bf..870e7d2 100644
--- a/v7/mediarouter/src/android/support/v7/app/MediaRouteControllerDialog.java
+++ b/v7/mediarouter/src/android/support/v7/app/MediaRouteControllerDialog.java
@@ -84,8 +84,6 @@
private boolean mCreated;
private boolean mAttachedToWindow;
- private Drawable mMediaRouteConnectingDrawable;
- private Drawable mMediaRouteOnDrawable;
private View mControlView;
@@ -447,22 +445,6 @@
return true;
}
- private Drawable getIconDrawable() {
- if (mRoute.isConnecting()) {
- if (mMediaRouteConnectingDrawable == null) {
- mMediaRouteConnectingDrawable = MediaRouterThemeHelper.getThemeDrawable(
- getContext(), R.attr.mediaRouteConnectingDrawable);
- }
- return mMediaRouteConnectingDrawable;
- } else {
- if (mMediaRouteOnDrawable == null) {
- mMediaRouteOnDrawable = MediaRouterThemeHelper.getThemeDrawable(
- getContext(), R.attr.mediaRouteOnDrawable);
- }
- return mMediaRouteOnDrawable;
- }
- }
-
private void updateVolume() {
if (!mVolumeSliderTouched) {
if (isVolumeControlAvailable()) {