MediaRouter: Rename UI element for readbility
Change-Id: I0f7d122b3fd12ce587488a119fc19296ba320444
diff --git a/v7/mediarouter/res/layout/mr_controller_material_dialog_b.xml b/v7/mediarouter/res/layout/mr_controller_material_dialog_b.xml
index 6092e4c..f4ad723 100644
--- a/v7/mediarouter/res/layout/mr_controller_material_dialog_b.xml
+++ b/v7/mediarouter/res/layout/mr_controller_material_dialog_b.xml
@@ -55,7 +55,7 @@
android:background="?attr/colorPrimary"
android:layout_gravity="top"
android:visibility="gone" />
- <LinearLayout android:id="@+id/mr_control"
+ <LinearLayout android:id="@+id/mr_media_control"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
diff --git a/v7/mediarouter/src/android/support/v7/app/MediaRouteControllerDialog.java b/v7/mediarouter/src/android/support/v7/app/MediaRouteControllerDialog.java
index bace621..c722829 100644
--- a/v7/mediarouter/src/android/support/v7/app/MediaRouteControllerDialog.java
+++ b/v7/mediarouter/src/android/support/v7/app/MediaRouteControllerDialog.java
@@ -116,7 +116,7 @@
private TextView mRouteNameTextView;
private boolean mVolumeControlEnabled = true;
- private LinearLayout mControlLayout;
+ private LinearLayout mMediaControlLayout;
private RelativeLayout mPlaybackControl;
private LinearLayout mVolumeControl;
private View mDividerView;
@@ -281,7 +281,7 @@
});
mArtView = (ImageView) findViewById(R.id.mr_art);
- mControlLayout = (LinearLayout) findViewById(R.id.mr_control);
+ mMediaControlLayout = (LinearLayout) findViewById(R.id.mr_media_control);
mDividerView = findViewById(R.id.mr_control_divider);
mPlaybackControl = (RelativeLayout) findViewById(R.id.mr_playback_control);
@@ -551,7 +551,7 @@
mDividerView.setVisibility((mVolumeControl.getVisibility() == View.VISIBLE
&& mPlaybackControl.getVisibility() == View.VISIBLE)
? View.VISIBLE : View.GONE);
- mControlLayout.setVisibility((mVolumeControl.getVisibility() == View.GONE
+ mMediaControlLayout.setVisibility((mVolumeControl.getVisibility() == View.GONE
&& mPlaybackControl.getVisibility() == View.GONE)
? View.GONE : View.VISIBLE);
}
@@ -564,15 +564,15 @@
if (mArtView.getVisibility() == View.GONE) {
height = LinearLayout.LayoutParams.WRAP_CONTENT;
} else if (!mIsGroupExpanded) {
- height = mArtView.getHeight() + mControlLayout.getHeight();
+ height = mArtView.getHeight() + mMediaControlLayout.getHeight();
} else {
if (mVolumeGroupList.getAdapter().getCount() <= 2) {
// Push the controls up and cover the artwork.
- height = mArtView.getHeight() + mControlLayout.getHeight()
+ height = mArtView.getHeight() + mMediaControlLayout.getHeight()
- mVolumeGroupList.getHeight();
} else {
// If there are 3 or more, the controls completely cover the artwork.
- height = mControlLayout.getHeight();
+ height = mMediaControlLayout.getHeight();
}
}
mDefaultControlLayout.setLayoutParams(
