MediaRouter: Replace the settings icon to the close icon
Bug: 23117610
Change-Id: Icf536f5083d2894a94daf70adbf6f5291395e882
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_close_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_close_dark.png
new file mode 100644
index 0000000..ceb1a1e
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_close_dark.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_close_light.png b/v7/mediarouter/res/drawable-hdpi/ic_close_light.png
new file mode 100644
index 0000000..9ab350e9
--- /dev/null
+++ b/v7/mediarouter/res/drawable-hdpi/ic_close_light.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_setting_dark.png b/v7/mediarouter/res/drawable-hdpi/ic_setting_dark.png
deleted file mode 100644
index 3248ad1..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_setting_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-hdpi/ic_setting_light.png b/v7/mediarouter/res/drawable-hdpi/ic_setting_light.png
deleted file mode 100644
index c39fc1f..0000000
--- a/v7/mediarouter/res/drawable-hdpi/ic_setting_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_close_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_close_dark.png
new file mode 100644
index 0000000..af7f828
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_close_dark.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_close_light.png b/v7/mediarouter/res/drawable-mdpi/ic_close_light.png
new file mode 100644
index 0000000..73faf52
--- /dev/null
+++ b/v7/mediarouter/res/drawable-mdpi/ic_close_light.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_setting_dark.png b/v7/mediarouter/res/drawable-mdpi/ic_setting_dark.png
deleted file mode 100644
index 1f0ba42..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_setting_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-mdpi/ic_setting_light.png b/v7/mediarouter/res/drawable-mdpi/ic_setting_light.png
deleted file mode 100644
index 3744fe4e..0000000
--- a/v7/mediarouter/res/drawable-mdpi/ic_setting_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_close_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_close_dark.png
new file mode 100644
index 0000000..b7c7ffd
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_close_dark.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_close_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_close_light.png
new file mode 100644
index 0000000..a3896c5
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xhdpi/ic_close_light.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_setting_dark.png b/v7/mediarouter/res/drawable-xhdpi/ic_setting_dark.png
deleted file mode 100644
index 8db5dbb..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_setting_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xhdpi/ic_setting_light.png b/v7/mediarouter/res/drawable-xhdpi/ic_setting_light.png
deleted file mode 100644
index bfc30ef..0000000
--- a/v7/mediarouter/res/drawable-xhdpi/ic_setting_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_close_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_close_dark.png
new file mode 100644
index 0000000..6b717e0
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_close_dark.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_close_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_close_light.png
new file mode 100644
index 0000000..22d7aa5
--- /dev/null
+++ b/v7/mediarouter/res/drawable-xxhdpi/ic_close_light.png
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_setting_dark.png b/v7/mediarouter/res/drawable-xxhdpi/ic_setting_dark.png
deleted file mode 100644
index 1d58233..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_setting_dark.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable-xxhdpi/ic_setting_light.png b/v7/mediarouter/res/drawable-xxhdpi/ic_setting_light.png
deleted file mode 100644
index 43c9b99b..0000000
--- a/v7/mediarouter/res/drawable-xxhdpi/ic_setting_light.png
+++ /dev/null
Binary files differ
diff --git a/v7/mediarouter/res/drawable/mr_ic_settings_light.xml b/v7/mediarouter/res/drawable/mr_ic_close_dark.xml
similarity index 92%
copy from v7/mediarouter/res/drawable/mr_ic_settings_light.xml
copy to v7/mediarouter/res/drawable/mr_ic_close_dark.xml
index a4614f6..4a88cec 100644
--- a/v7/mediarouter/res/drawable/mr_ic_settings_light.xml
+++ b/v7/mediarouter/res/drawable/mr_ic_close_dark.xml
@@ -15,5 +15,5 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:drawable="@drawable/ic_setting_light" />
+ <item android:drawable="@drawable/ic_close_dark" />
</selector>
diff --git a/v7/mediarouter/res/drawable/mr_ic_settings_light.xml b/v7/mediarouter/res/drawable/mr_ic_close_light.xml
similarity index 92%
rename from v7/mediarouter/res/drawable/mr_ic_settings_light.xml
rename to v7/mediarouter/res/drawable/mr_ic_close_light.xml
index a4614f6..f1dd0cc 100644
--- a/v7/mediarouter/res/drawable/mr_ic_settings_light.xml
+++ b/v7/mediarouter/res/drawable/mr_ic_close_light.xml
@@ -15,5 +15,5 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:drawable="@drawable/ic_setting_light" />
+ <item android:drawable="@drawable/ic_close_light" />
</selector>
diff --git a/v7/mediarouter/res/drawable/mr_ic_settings_dark.xml b/v7/mediarouter/res/drawable/mr_ic_settings_dark.xml
deleted file mode 100644
index 0fe662e..0000000
--- a/v7/mediarouter/res/drawable/mr_ic_settings_dark.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:drawable="@drawable/ic_setting_dark" />
-</selector>
diff --git a/v7/mediarouter/res/layout/mr_media_route_controller_material_dialog_b.xml b/v7/mediarouter/res/layout/mr_media_route_controller_material_dialog_b.xml
index ef2b441..cfb3da4 100644
--- a/v7/mediarouter/res/layout/mr_media_route_controller_material_dialog_b.xml
+++ b/v7/mediarouter/res/layout/mr_media_route_controller_material_dialog_b.xml
@@ -23,28 +23,25 @@
<LinearLayout android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:paddingLeft="24dp"
+ android:paddingRight="24dp"
android:orientation="horizontal" >
<TextView android:id="@+id/route_name"
android:layout_width="0dp"
android:layout_height="72dp"
android:layout_weight="1"
- android:layout_marginLeft="24dip"
- android:layout_marginRight="24dip"
android:gravity="center_vertical"
android:singleLine="true"
android:ellipsize="end"
android:textAppearance="?attr/mediaRouteControllerTitleTextStyle" />
- <ImageButton android:id="@+id/settings"
- android:layout_width="48dip"
- android:layout_height="48dip"
- android:padding="12dip"
- android:layout_marginTop="12dip"
- android:layout_marginBottom="12dip"
- android:layout_marginRight="12dip"
- android:contentDescription="@string/mr_media_route_controller_settings_description"
- android:src="?attr/mediaRouteSettingsDrawable"
- android:background="?attr/selectableItemBackgroundBorderless"
- android:visibility="gone" />
+ <ImageButton android:id="@+id/close"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:layout_marginLeft="12dp"
+ android:layout_gravity="center_vertical"
+ android:contentDescription="@string/mr_media_route_controller_close_description"
+ android:src="?attr/mediaRouteCloseDrawable"
+ android:background="?attr/selectableItemBackgroundBorderless" />
</LinearLayout>
<FrameLayout android:id="@+id/media_route_control_frame"
android:layout_width="match_parent"
diff --git a/v7/mediarouter/res/values/attrs.xml b/v7/mediarouter/res/values/attrs.xml
index ca4bd61..fe01948 100644
--- a/v7/mediarouter/res/values/attrs.xml
+++ b/v7/mediarouter/res/values/attrs.xml
@@ -30,7 +30,7 @@
<attr name="mediaRouteOffDrawable" format="reference" />
<attr name="mediaRouteConnectingDrawable" format="reference" />
<attr name="mediaRouteOnDrawable" format="reference" />
- <attr name="mediaRouteSettingsDrawable" format="reference" />
+ <attr name="mediaRouteCloseDrawable" format="reference" />
<attr name="mediaRoutePlayDrawable" format="reference" />
<attr name="mediaRoutePauseDrawable" format="reference" />
<attr name="mediaRouteCastDrawable" format="reference" />
diff --git a/v7/mediarouter/res/values/strings.xml b/v7/mediarouter/res/values/strings.xml
index 5d13468..9fc2f2e 100644
--- a/v7/mediarouter/res/values/strings.xml
+++ b/v7/mediarouter/res/values/strings.xml
@@ -37,8 +37,8 @@
<!-- Button to stop playback and disconnect from a media route. [CHAR LIMIT=30] -->
<string name="mr_media_route_controller_stop">Stop casting</string>
- <!-- Description for a button that takes you to settings for the active route -->
- <string name="mr_media_route_controller_settings_description">Route settings</string>
+ <!-- Description for a button that closes the controller dialog -->
+ <string name="mr_media_route_controller_close_description">Close the controller dialog</string>
<!-- Accessibility description for the play button -->
<string name="mr_media_route_controller_play">Play</string>
diff --git a/v7/mediarouter/res/values/themes.xml b/v7/mediarouter/res/values/themes.xml
index d742041..490e04e 100644
--- a/v7/mediarouter/res/values/themes.xml
+++ b/v7/mediarouter/res/values/themes.xml
@@ -23,7 +23,7 @@
<item name="mediaRouteOffDrawable">@drawable/ic_media_route_off_mono_dark</item>
<item name="mediaRouteConnectingDrawable">@drawable/mr_ic_media_route_connecting_mono_dark</item>
<item name="mediaRouteOnDrawable">@drawable/ic_media_route_on_mono_dark</item>
- <item name="mediaRouteSettingsDrawable">@drawable/mr_ic_settings_dark</item>
+ <item name="mediaRouteCloseDrawable">@drawable/mr_ic_close_dark</item>
<item name="mediaRoutePlayDrawable">@drawable/mr_ic_play_dark</item>
<item name="mediaRoutePauseDrawable">@drawable/mr_ic_pause_dark</item>
<item name="mediaRouteCastDrawable">@drawable/mr_ic_cast_dark</item>
@@ -46,7 +46,7 @@
<item name="mediaRouteOffDrawable">@drawable/ic_cast_off_light</item>
<item name="mediaRouteConnectingDrawable">@drawable/mr_ic_media_route_connecting_mono_light</item>
<item name="mediaRouteOnDrawable">@drawable/ic_cast_on_light</item>
- <item name="mediaRouteSettingsDrawable">@drawable/mr_ic_settings_light</item>
+ <item name="mediaRouteCloseDrawable">@drawable/mr_ic_close_light</item>
<item name="mediaRoutePlayDrawable">@drawable/mr_ic_play_light</item>
<item name="mediaRoutePauseDrawable">@drawable/mr_ic_pause_light</item>
<item name="mediaRouteCastDrawable">@drawable/mr_ic_cast_light</item>
diff --git a/v7/mediarouter/src/android/support/v7/app/MediaRouteControllerDialog.java b/v7/mediarouter/src/android/support/v7/app/MediaRouteControllerDialog.java
index 870e7d2..5fc84588 100644
--- a/v7/mediarouter/src/android/support/v7/app/MediaRouteControllerDialog.java
+++ b/v7/mediarouter/src/android/support/v7/app/MediaRouteControllerDialog.java
@@ -90,7 +90,7 @@
private Button mDisconnectButton;
private Button mStopCastingButton;
private ImageButton mPlayPauseButton;
- private ImageButton mSettingsButton;
+ private ImageButton mCloseButton;
private ImageButton mGroupExpandCollapseButton;
private ImageView mArtView;
@@ -241,8 +241,8 @@
mStopCastingButton = (Button) findViewById(R.id.stop);
mStopCastingButton.setOnClickListener(listener);
- mSettingsButton = (ImageButton) findViewById(R.id.settings);
- mSettingsButton.setOnClickListener(listener);
+ mCloseButton = (ImageButton) findViewById(R.id.close);
+ mCloseButton.setOnClickListener(listener);
mArtView = (ImageView) findViewById(R.id.art);
mTitleView = (TextView) findViewById(R.id.title);
@@ -385,9 +385,9 @@
}
if (mRoute.getSettingsIntent() != null) {
- mSettingsButton.setVisibility(View.VISIBLE);
+ mCloseButton.setVisibility(View.VISIBLE);
} else {
- mSettingsButton.setVisibility(View.GONE);
+ mCloseButton.setVisibility(View.GONE);
}
if (mControlView == null) {
@@ -526,16 +526,8 @@
mMediaController.getTransportControls().play();
}
}
- } else if (id == R.id.settings) {
- IntentSender is = mRoute.getSettingsIntent();
- if (is != null) {
- try {
- is.sendIntent(null, 0, null, null, null);
- dismiss();
- } catch (Exception e) {
- Log.e(TAG, "Error opening route settings.", e);
- }
- }
+ } else if (id == R.id.close) {
+ dismiss();
}
}
}
