diff options
16 files changed, 5 insertions, 2 deletions
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_mirroring.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_mirroring.png Binary files differdeleted file mode 100644 index 5912301..0000000 --- a/packages/SystemUI/res/drawable-hdpi/ic_qs_mirroring.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_mirroring_notconnected.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_mirroring_notconnected.png Binary files differdeleted file mode 100644 index 49ee056..0000000 --- a/packages/SystemUI/res/drawable-hdpi/ic_qs_mirroring_notconnected.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_remote_display.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_remote_display.png Binary files differnew file mode 100644 index 0000000..a7bc3c5 --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/ic_qs_remote_display.png diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_remote_display_connected.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_remote_display_connected.png Binary files differnew file mode 100644 index 0000000..012a4e8 --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/ic_qs_remote_display_connected.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_mirroring.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_mirroring.png Binary files differdeleted file mode 100644 index a5f16e8..0000000 --- a/packages/SystemUI/res/drawable-mdpi/ic_qs_mirroring.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_mirroring_notconnected.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_mirroring_notconnected.png Binary files differdeleted file mode 100644 index a4e0420..0000000 --- a/packages/SystemUI/res/drawable-mdpi/ic_qs_mirroring_notconnected.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_remote_display.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_remote_display.png Binary files differnew file mode 100644 index 0000000..1ff9cbc --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_qs_remote_display.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_remote_display_connected.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_remote_display_connected.png Binary files differnew file mode 100644 index 0000000..0ec78c0 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_qs_remote_display_connected.png diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_mirroring.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_mirroring.png Binary files differdeleted file mode 100644 index eb6d5a6..0000000 --- a/packages/SystemUI/res/drawable-xhdpi/ic_qs_mirroring.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_mirroring_notconnected.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_mirroring_notconnected.png Binary files differdeleted file mode 100644 index 98d7b09..0000000 --- a/packages/SystemUI/res/drawable-xhdpi/ic_qs_mirroring_notconnected.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_remote_display.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_remote_display.png Binary files differnew file mode 100644 index 0000000..88ea017 --- /dev/null +++ b/packages/SystemUI/res/drawable-xhdpi/ic_qs_remote_display.png diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_remote_display_connected.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_remote_display_connected.png Binary files differnew file mode 100644 index 0000000..7573636 --- /dev/null +++ b/packages/SystemUI/res/drawable-xhdpi/ic_qs_remote_display_connected.png diff --git a/packages/SystemUI/res/layout/quick_settings_tile_wifi_display.xml b/packages/SystemUI/res/layout/quick_settings_tile_wifi_display.xml index 454d54a..2d7e441 100644 --- a/packages/SystemUI/res/layout/quick_settings_tile_wifi_display.xml +++ b/packages/SystemUI/res/layout/quick_settings_tile_wifi_display.xml @@ -21,6 +21,6 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:gravity="center" - android:drawableTop="@drawable/ic_qs_mirroring" + android:drawableTop="@drawable/ic_qs_remote_display" android:text="@string/quick_settings_wifi_display_label" />
\ No newline at end of file diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 2b74f56..61299c4 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -449,7 +449,7 @@ <!-- QuickSettings: Wifi display [CHAR LIMIT=NONE] --> <string name="quick_settings_wifi_display_label">Wi-Fi Display</string> <!-- QuickSettings: Wifi display [CHAR LIMIT=NONE] --> - <string name="quick_settings_wifi_display_no_connection_label">No Wi-Fi Display Connection</string> + <string name="quick_settings_wifi_display_no_connection_label">Wireless Display</string> <!-- QuickSettings: Brightness dialog title [CHAR LIMIT=NONE] --> <string name="quick_settings_brightness_dialog_title">Brightness</string> <!-- QuickSettings: Brightness dialog auto brightness button [CHAR LIMIT=NONE] --> diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java index 4ef35aa..32ad429a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java @@ -562,6 +562,7 @@ class QuickSettings { public void refreshView(QuickSettingsTileView view, State state) { TextView tv = (TextView) view.findViewById(R.id.wifi_display_textview); tv.setText(state.label); + tv.setCompoundDrawablesWithIntrinsicBounds(0, state.iconId, 0, 0); view.setVisibility(state.enabled ? View.VISIBLE : View.GONE); } }); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java index 0e53617..3334df8 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java @@ -499,9 +499,11 @@ class QuickSettingsModel implements BluetoothStateChangeCallback, (status.getFeatureState() == WifiDisplayStatus.FEATURE_STATE_ON); if (status.getActiveDisplay() != null) { mWifiDisplayState.label = status.getActiveDisplay().getFriendlyDisplayName(); + mWifiDisplayState.iconId = R.drawable.ic_qs_remote_display_connected; } else { mWifiDisplayState.label = mContext.getString( R.string.quick_settings_wifi_display_no_connection_label); + mWifiDisplayState.iconId = R.drawable.ic_qs_remote_display; } mWifiDisplayCallback.refreshView(mWifiDisplayTile, mWifiDisplayState); |