From e7ae644522f692c204d0233f91e77c7841bdfe53 Mon Sep 17 00:00:00 2001
From: Jeff Brown <jeffbrown@google.com>
Date: Wed, 13 Nov 2013 00:45:18 -0800
Subject: Finalize assets for screen casting.

Extend wifi display connection timeout.

Show a notification while connecting to wifi display.

Ensure that remote display providers are really trusted before
connecting to them.

Bug: 11257292
Change-Id: Iad0caaa30d7946df818bc75ade071f2e377f8a53
---
 .../res/drawable-hdpi/ic_qs_cast_available.png     | Bin 0 -> 1325 bytes
 .../res/drawable-hdpi/ic_qs_cast_connected.png     | Bin 0 -> 1277 bytes
 .../res/drawable-hdpi/ic_qs_cast_connecting_0.png  | Bin 0 -> 1275 bytes
 .../res/drawable-hdpi/ic_qs_cast_connecting_1.png  | Bin 0 -> 1288 bytes
 .../res/drawable-hdpi/ic_qs_cast_connecting_2.png  | Bin 0 -> 1301 bytes
 .../res/drawable-mdpi/ic_qs_cast_available.png     | Bin 0 -> 933 bytes
 .../res/drawable-mdpi/ic_qs_cast_connected.png     | Bin 0 -> 942 bytes
 .../res/drawable-mdpi/ic_qs_cast_connecting_0.png  | Bin 0 -> 921 bytes
 .../res/drawable-mdpi/ic_qs_cast_connecting_1.png  | Bin 0 -> 949 bytes
 .../res/drawable-mdpi/ic_qs_cast_connecting_2.png  | Bin 0 -> 958 bytes
 .../res/drawable-xhdpi/ic_qs_cast_available.png    | Bin 0 -> 796 bytes
 .../res/drawable-xhdpi/ic_qs_cast_connected.png    | Bin 0 -> 742 bytes
 .../res/drawable-xhdpi/ic_qs_cast_connecting_0.png | Bin 0 -> 743 bytes
 .../res/drawable-xhdpi/ic_qs_cast_connecting_1.png | Bin 0 -> 765 bytes
 .../res/drawable-xhdpi/ic_qs_cast_connecting_2.png | Bin 0 -> 812 bytes
 .../res/drawable-xxhdpi/ic_qs_cast_available.png   | Bin 0 -> 1202 bytes
 .../res/drawable-xxhdpi/ic_qs_cast_connected.png   | Bin 0 -> 1169 bytes
 .../drawable-xxhdpi/ic_qs_cast_connecting_0.png    | Bin 0 -> 1139 bytes
 .../drawable-xxhdpi/ic_qs_cast_connecting_1.png    | Bin 0 -> 1159 bytes
 .../drawable-xxhdpi/ic_qs_cast_connecting_2.png    | Bin 0 -> 1197 bytes
 .../res/drawable/ic_qs_cast_connecting.xml         |  26 +++++++++++++++++++++
 packages/SystemUI/res/values/strings.xml           |   2 +-
 .../statusbar/phone/QuickSettingsModel.java        |   6 ++---
 23 files changed, 29 insertions(+), 5 deletions(-)
 create mode 100644 packages/SystemUI/res/drawable-hdpi/ic_qs_cast_available.png
 create mode 100644 packages/SystemUI/res/drawable-hdpi/ic_qs_cast_connected.png
 create mode 100644 packages/SystemUI/res/drawable-hdpi/ic_qs_cast_connecting_0.png
 create mode 100644 packages/SystemUI/res/drawable-hdpi/ic_qs_cast_connecting_1.png
 create mode 100644 packages/SystemUI/res/drawable-hdpi/ic_qs_cast_connecting_2.png
 create mode 100644 packages/SystemUI/res/drawable-mdpi/ic_qs_cast_available.png
 create mode 100644 packages/SystemUI/res/drawable-mdpi/ic_qs_cast_connected.png
 create mode 100644 packages/SystemUI/res/drawable-mdpi/ic_qs_cast_connecting_0.png
 create mode 100644 packages/SystemUI/res/drawable-mdpi/ic_qs_cast_connecting_1.png
 create mode 100644 packages/SystemUI/res/drawable-mdpi/ic_qs_cast_connecting_2.png
 create mode 100644 packages/SystemUI/res/drawable-xhdpi/ic_qs_cast_available.png
 create mode 100644 packages/SystemUI/res/drawable-xhdpi/ic_qs_cast_connected.png
 create mode 100644 packages/SystemUI/res/drawable-xhdpi/ic_qs_cast_connecting_0.png
 create mode 100644 packages/SystemUI/res/drawable-xhdpi/ic_qs_cast_connecting_1.png
 create mode 100644 packages/SystemUI/res/drawable-xhdpi/ic_qs_cast_connecting_2.png
 create mode 100644 packages/SystemUI/res/drawable-xxhdpi/ic_qs_cast_available.png
 create mode 100644 packages/SystemUI/res/drawable-xxhdpi/ic_qs_cast_connected.png
 create mode 100644 packages/SystemUI/res/drawable-xxhdpi/ic_qs_cast_connecting_0.png
 create mode 100644 packages/SystemUI/res/drawable-xxhdpi/ic_qs_cast_connecting_1.png
 create mode 100644 packages/SystemUI/res/drawable-xxhdpi/ic_qs_cast_connecting_2.png
 create mode 100644 packages/SystemUI/res/drawable/ic_qs_cast_connecting.xml

(limited to 'packages/SystemUI')

diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_cast_available.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_cast_available.png
new file mode 100644
index 0000000..1c3518a
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_cast_available.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_cast_connected.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_cast_connected.png
new file mode 100644
index 0000000..9dbc65e
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_cast_connected.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_cast_connecting_0.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_cast_connecting_0.png
new file mode 100644
index 0000000..ddb002d
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_cast_connecting_0.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_cast_connecting_1.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_cast_connecting_1.png
new file mode 100644
index 0000000..43b7ef2
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_cast_connecting_1.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_cast_connecting_2.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_cast_connecting_2.png
new file mode 100644
index 0000000..1d8b7ee
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_cast_connecting_2.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_cast_available.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_cast_available.png
new file mode 100644
index 0000000..11b2134
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_cast_available.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_cast_connected.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_cast_connected.png
new file mode 100644
index 0000000..a858573
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_cast_connected.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_cast_connecting_0.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_cast_connecting_0.png
new file mode 100644
index 0000000..04de5d7
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_cast_connecting_0.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_cast_connecting_1.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_cast_connecting_1.png
new file mode 100644
index 0000000..caea37e
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_cast_connecting_1.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_cast_connecting_2.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_cast_connecting_2.png
new file mode 100644
index 0000000..b66aa46
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_cast_connecting_2.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_cast_available.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_cast_available.png
new file mode 100644
index 0000000..10ebcd5
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_cast_available.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_cast_connected.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_cast_connected.png
new file mode 100644
index 0000000..fef43b8
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_cast_connected.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_cast_connecting_0.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_cast_connecting_0.png
new file mode 100644
index 0000000..05e3267
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_cast_connecting_0.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_cast_connecting_1.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_cast_connecting_1.png
new file mode 100644
index 0000000..ef42b27
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_cast_connecting_1.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_cast_connecting_2.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_cast_connecting_2.png
new file mode 100644
index 0000000..fc1c95e
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_cast_connecting_2.png differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_cast_available.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_cast_available.png
new file mode 100644
index 0000000..68b1b7c
Binary files /dev/null and b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_cast_available.png differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_cast_connected.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_cast_connected.png
new file mode 100644
index 0000000..8a8f890
Binary files /dev/null and b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_cast_connected.png differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_cast_connecting_0.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_cast_connecting_0.png
new file mode 100644
index 0000000..12d4a01
Binary files /dev/null and b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_cast_connecting_0.png differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_cast_connecting_1.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_cast_connecting_1.png
new file mode 100644
index 0000000..3cb4421
Binary files /dev/null and b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_cast_connecting_1.png differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_cast_connecting_2.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_cast_connecting_2.png
new file mode 100644
index 0000000..4620b3a
Binary files /dev/null and b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_cast_connecting_2.png differ
diff --git a/packages/SystemUI/res/drawable/ic_qs_cast_connecting.xml b/packages/SystemUI/res/drawable/ic_qs_cast_connecting.xml
new file mode 100644
index 0000000..70db2a9
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_cast_connecting.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright 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.
+ */
+-->
+<animation-list
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:oneshot="false">
+    <item android:drawable="@drawable/ic_qs_cast_connecting_0" android:duration="500" />
+    <item android:drawable="@drawable/ic_qs_cast_connecting_1" android:duration="500" />
+    <item android:drawable="@drawable/ic_qs_cast_connecting_2" android:duration="500" />
+    <item android:drawable="@drawable/ic_qs_cast_connecting_1" android:duration="500" />
+</animation-list>
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml
index e36ca8e..d39dc94 100644
--- a/packages/SystemUI/res/values/strings.xml
+++ b/packages/SystemUI/res/values/strings.xml
@@ -491,7 +491,7 @@
     <!-- QuickSettings: Wifi (Off) [CHAR LIMIT=NONE] -->
     <string name="quick_settings_wifi_off_label">Wi-Fi Off</string>
     <!-- QuickSettings: Remote display [CHAR LIMIT=NONE] -->
-    <string name="quick_settings_remote_display_no_connection_label">Cast Screen</string>
+    <string name="quick_settings_remote_display_no_connection_label">Screen Cast</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/QuickSettingsModel.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java
index e59dfaa..e1a20ec 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java
@@ -706,13 +706,11 @@ class QuickSettingsModel implements BluetoothStateChangeCallback,
         if (connectedRoute != null) {
             mRemoteDisplayState.label = connectedRoute.getName().toString();
             mRemoteDisplayState.iconId = connecting ?
-                    com.android.internal.R.drawable.ic_media_route_connecting_holo_dark :
-                    com.android.internal.R.drawable.ic_media_route_on_holo_dark;
+                    R.drawable.ic_qs_cast_connecting : R.drawable.ic_qs_cast_connected;
         } else {
             mRemoteDisplayState.label = mContext.getString(
                     R.string.quick_settings_remote_display_no_connection_label);
-            mRemoteDisplayState.iconId =
-                    com.android.internal.R.drawable.ic_media_route_off_holo_dark;
+            mRemoteDisplayState.iconId = R.drawable.ic_qs_cast_available;
         }
         mRemoteDisplayCallback.refreshView(mRemoteDisplayTile, mRemoteDisplayState);
     }
-- 
cgit v1.1