diff --git a/core/res/res/drawable-hdpi/ic_media_route_disabled_holo_dark.png b/core/res/res/drawable-hdpi/ic_media_route_disabled_holo_dark.png index b47d666cf95de..458a2a66ce788 100644 Binary files a/core/res/res/drawable-hdpi/ic_media_route_disabled_holo_dark.png and b/core/res/res/drawable-hdpi/ic_media_route_disabled_holo_dark.png differ diff --git a/core/res/res/drawable-hdpi/ic_media_route_off_holo_dark.png b/core/res/res/drawable-hdpi/ic_media_route_off_holo_dark.png index 13d803cb98a52..c91faa929c553 100644 Binary files a/core/res/res/drawable-hdpi/ic_media_route_off_holo_dark.png and b/core/res/res/drawable-hdpi/ic_media_route_off_holo_dark.png differ diff --git a/core/res/res/drawable-hdpi/ic_media_route_off_holo_light.png b/core/res/res/drawable-hdpi/ic_media_route_off_holo_light.png index 3ae436b656d50..14c9183fb5b21 100644 Binary files a/core/res/res/drawable-hdpi/ic_media_route_off_holo_light.png and b/core/res/res/drawable-hdpi/ic_media_route_off_holo_light.png differ diff --git a/core/res/res/drawable-hdpi/ic_media_route_on_0_holo_dark.png b/core/res/res/drawable-hdpi/ic_media_route_on_0_holo_dark.png index 24824fc9d997a..b388d8686ac9c 100644 Binary files a/core/res/res/drawable-hdpi/ic_media_route_on_0_holo_dark.png and b/core/res/res/drawable-hdpi/ic_media_route_on_0_holo_dark.png differ diff --git a/core/res/res/drawable-hdpi/ic_media_route_on_0_holo_light.png b/core/res/res/drawable-hdpi/ic_media_route_on_0_holo_light.png index af3819bbf044c..76c132380dde1 100644 Binary files a/core/res/res/drawable-hdpi/ic_media_route_on_0_holo_light.png and b/core/res/res/drawable-hdpi/ic_media_route_on_0_holo_light.png differ diff --git a/core/res/res/drawable-hdpi/ic_media_route_on_1_holo_dark.png b/core/res/res/drawable-hdpi/ic_media_route_on_1_holo_dark.png index 83dc251908ef3..fd39f9d6aa17a 100644 Binary files a/core/res/res/drawable-hdpi/ic_media_route_on_1_holo_dark.png and b/core/res/res/drawable-hdpi/ic_media_route_on_1_holo_dark.png differ diff --git a/core/res/res/drawable-hdpi/ic_media_route_on_1_holo_light.png b/core/res/res/drawable-hdpi/ic_media_route_on_1_holo_light.png index 8d9d5923cfd06..c74727aabe219 100644 Binary files a/core/res/res/drawable-hdpi/ic_media_route_on_1_holo_light.png and b/core/res/res/drawable-hdpi/ic_media_route_on_1_holo_light.png differ diff --git a/core/res/res/drawable-hdpi/ic_media_route_on_2_holo_dark.png b/core/res/res/drawable-hdpi/ic_media_route_on_2_holo_dark.png index 1310ec9eb3e40..826c9aefed7a0 100644 Binary files a/core/res/res/drawable-hdpi/ic_media_route_on_2_holo_dark.png and b/core/res/res/drawable-hdpi/ic_media_route_on_2_holo_dark.png differ diff --git a/core/res/res/drawable-hdpi/ic_media_route_on_2_holo_light.png b/core/res/res/drawable-hdpi/ic_media_route_on_2_holo_light.png index 1705074567c88..d0baec3fbaa9d 100644 Binary files a/core/res/res/drawable-hdpi/ic_media_route_on_2_holo_light.png and b/core/res/res/drawable-hdpi/ic_media_route_on_2_holo_light.png differ diff --git a/core/res/res/drawable-hdpi/ic_media_route_on_holo_dark.png b/core/res/res/drawable-hdpi/ic_media_route_on_holo_dark.png index 7027b88ec1574..c60ff599decaf 100644 Binary files a/core/res/res/drawable-hdpi/ic_media_route_on_holo_dark.png and b/core/res/res/drawable-hdpi/ic_media_route_on_holo_dark.png differ diff --git a/core/res/res/drawable-hdpi/ic_media_route_on_holo_light.png b/core/res/res/drawable-hdpi/ic_media_route_on_holo_light.png index 7027b88ec1574..75552ccf0ab86 100644 Binary files a/core/res/res/drawable-hdpi/ic_media_route_on_holo_light.png and b/core/res/res/drawable-hdpi/ic_media_route_on_holo_light.png differ diff --git a/core/res/res/drawable-hdpi/ic_notification_cast_0.png b/core/res/res/drawable-hdpi/ic_notification_cast_0.png new file mode 100644 index 0000000000000..a35f28177f0a5 Binary files /dev/null and b/core/res/res/drawable-hdpi/ic_notification_cast_0.png differ diff --git a/core/res/res/drawable-hdpi/ic_notification_cast_1.png b/core/res/res/drawable-hdpi/ic_notification_cast_1.png new file mode 100644 index 0000000000000..9f6e2adef029e Binary files /dev/null and b/core/res/res/drawable-hdpi/ic_notification_cast_1.png differ diff --git a/core/res/res/drawable-hdpi/ic_notification_cast_2.png b/core/res/res/drawable-hdpi/ic_notification_cast_2.png new file mode 100644 index 0000000000000..737137a81340f Binary files /dev/null and b/core/res/res/drawable-hdpi/ic_notification_cast_2.png differ diff --git a/core/res/res/drawable-hdpi/ic_notification_cast_on.png b/core/res/res/drawable-hdpi/ic_notification_cast_on.png new file mode 100644 index 0000000000000..ff2753ab68f5c Binary files /dev/null and b/core/res/res/drawable-hdpi/ic_notification_cast_on.png differ diff --git a/core/res/res/drawable-mdpi/ic_media_route_off_holo_dark.png b/core/res/res/drawable-mdpi/ic_media_route_off_holo_dark.png index 6764598fee303..9d92648511ae1 100644 Binary files a/core/res/res/drawable-mdpi/ic_media_route_off_holo_dark.png and b/core/res/res/drawable-mdpi/ic_media_route_off_holo_dark.png differ diff --git a/core/res/res/drawable-mdpi/ic_media_route_off_holo_light.png b/core/res/res/drawable-mdpi/ic_media_route_off_holo_light.png index 94e0bb641e914..3e27fc8f2eb82 100644 Binary files a/core/res/res/drawable-mdpi/ic_media_route_off_holo_light.png and b/core/res/res/drawable-mdpi/ic_media_route_off_holo_light.png differ diff --git a/core/res/res/drawable-mdpi/ic_media_route_on_0_holo_dark.png b/core/res/res/drawable-mdpi/ic_media_route_on_0_holo_dark.png index 5ce2f205234df..72b9e78956ec4 100644 Binary files a/core/res/res/drawable-mdpi/ic_media_route_on_0_holo_dark.png and b/core/res/res/drawable-mdpi/ic_media_route_on_0_holo_dark.png differ diff --git a/core/res/res/drawable-mdpi/ic_media_route_on_0_holo_light.png b/core/res/res/drawable-mdpi/ic_media_route_on_0_holo_light.png index 5105e9081aeb8..bd462a2b2ccc5 100644 Binary files a/core/res/res/drawable-mdpi/ic_media_route_on_0_holo_light.png and b/core/res/res/drawable-mdpi/ic_media_route_on_0_holo_light.png differ diff --git a/core/res/res/drawable-mdpi/ic_media_route_on_1_holo_dark.png b/core/res/res/drawable-mdpi/ic_media_route_on_1_holo_dark.png index 68c06ed77aae3..0a2cc89d535ad 100644 Binary files a/core/res/res/drawable-mdpi/ic_media_route_on_1_holo_dark.png and b/core/res/res/drawable-mdpi/ic_media_route_on_1_holo_dark.png differ diff --git a/core/res/res/drawable-mdpi/ic_media_route_on_1_holo_light.png b/core/res/res/drawable-mdpi/ic_media_route_on_1_holo_light.png index 6e9b144229930..d162503202acc 100644 Binary files a/core/res/res/drawable-mdpi/ic_media_route_on_1_holo_light.png and b/core/res/res/drawable-mdpi/ic_media_route_on_1_holo_light.png differ diff --git a/core/res/res/drawable-mdpi/ic_media_route_on_2_holo_dark.png b/core/res/res/drawable-mdpi/ic_media_route_on_2_holo_dark.png index 45dc56f3d4710..997e32b680b90 100644 Binary files a/core/res/res/drawable-mdpi/ic_media_route_on_2_holo_dark.png and b/core/res/res/drawable-mdpi/ic_media_route_on_2_holo_dark.png differ diff --git a/core/res/res/drawable-mdpi/ic_media_route_on_2_holo_light.png b/core/res/res/drawable-mdpi/ic_media_route_on_2_holo_light.png index 46e743ad7ed6c..d314967d38a1d 100644 Binary files a/core/res/res/drawable-mdpi/ic_media_route_on_2_holo_light.png and b/core/res/res/drawable-mdpi/ic_media_route_on_2_holo_light.png differ diff --git a/core/res/res/drawable-mdpi/ic_media_route_on_holo_dark.png b/core/res/res/drawable-mdpi/ic_media_route_on_holo_dark.png index e384691fe8b88..f15d7a9d77607 100644 Binary files a/core/res/res/drawable-mdpi/ic_media_route_on_holo_dark.png and b/core/res/res/drawable-mdpi/ic_media_route_on_holo_dark.png differ diff --git a/core/res/res/drawable-mdpi/ic_media_route_on_holo_light.png b/core/res/res/drawable-mdpi/ic_media_route_on_holo_light.png index e384691fe8b88..26d46f8b7b980 100644 Binary files a/core/res/res/drawable-mdpi/ic_media_route_on_holo_light.png and b/core/res/res/drawable-mdpi/ic_media_route_on_holo_light.png differ diff --git a/core/res/res/drawable-mdpi/ic_notification_cast_0.png b/core/res/res/drawable-mdpi/ic_notification_cast_0.png new file mode 100644 index 0000000000000..d9cedbdeb3e5b Binary files /dev/null and b/core/res/res/drawable-mdpi/ic_notification_cast_0.png differ diff --git a/core/res/res/drawable-mdpi/ic_notification_cast_1.png b/core/res/res/drawable-mdpi/ic_notification_cast_1.png new file mode 100644 index 0000000000000..414c67f17002b Binary files /dev/null and b/core/res/res/drawable-mdpi/ic_notification_cast_1.png differ diff --git a/core/res/res/drawable-mdpi/ic_notification_cast_2.png b/core/res/res/drawable-mdpi/ic_notification_cast_2.png new file mode 100644 index 0000000000000..280a8880e5223 Binary files /dev/null and b/core/res/res/drawable-mdpi/ic_notification_cast_2.png differ diff --git a/core/res/res/drawable-mdpi/ic_notification_cast_on.png b/core/res/res/drawable-mdpi/ic_notification_cast_on.png new file mode 100644 index 0000000000000..ab5f1d78608f3 Binary files /dev/null and b/core/res/res/drawable-mdpi/ic_notification_cast_on.png differ diff --git a/core/res/res/drawable-xhdpi/ic_media_route_disabled_holo_dark.png b/core/res/res/drawable-xhdpi/ic_media_route_disabled_holo_dark.png index 1d48e12a3c68e..045eee0549d87 100644 Binary files a/core/res/res/drawable-xhdpi/ic_media_route_disabled_holo_dark.png and b/core/res/res/drawable-xhdpi/ic_media_route_disabled_holo_dark.png differ diff --git a/core/res/res/drawable-xhdpi/ic_media_route_disabled_holo_light.png b/core/res/res/drawable-xhdpi/ic_media_route_disabled_holo_light.png index 2c8d1ec19b254..6e14e296336ab 100644 Binary files a/core/res/res/drawable-xhdpi/ic_media_route_disabled_holo_light.png and b/core/res/res/drawable-xhdpi/ic_media_route_disabled_holo_light.png differ diff --git a/core/res/res/drawable-xhdpi/ic_media_route_off_holo_dark.png b/core/res/res/drawable-xhdpi/ic_media_route_off_holo_dark.png index 00b20433ab790..121bbf6a46a0b 100644 Binary files a/core/res/res/drawable-xhdpi/ic_media_route_off_holo_dark.png and b/core/res/res/drawable-xhdpi/ic_media_route_off_holo_dark.png differ diff --git a/core/res/res/drawable-xhdpi/ic_media_route_off_holo_light.png b/core/res/res/drawable-xhdpi/ic_media_route_off_holo_light.png index ce1d939547340..468a0c36c07f1 100644 Binary files a/core/res/res/drawable-xhdpi/ic_media_route_off_holo_light.png and b/core/res/res/drawable-xhdpi/ic_media_route_off_holo_light.png differ diff --git a/core/res/res/drawable-xhdpi/ic_media_route_on_0_holo_dark.png b/core/res/res/drawable-xhdpi/ic_media_route_on_0_holo_dark.png index 3064b46e52992..414a322e8b490 100644 Binary files a/core/res/res/drawable-xhdpi/ic_media_route_on_0_holo_dark.png and b/core/res/res/drawable-xhdpi/ic_media_route_on_0_holo_dark.png differ diff --git a/core/res/res/drawable-xhdpi/ic_media_route_on_0_holo_light.png b/core/res/res/drawable-xhdpi/ic_media_route_on_0_holo_light.png index 431668642ce15..6088a48e41132 100644 Binary files a/core/res/res/drawable-xhdpi/ic_media_route_on_0_holo_light.png and b/core/res/res/drawable-xhdpi/ic_media_route_on_0_holo_light.png differ diff --git a/core/res/res/drawable-xhdpi/ic_media_route_on_1_holo_dark.png b/core/res/res/drawable-xhdpi/ic_media_route_on_1_holo_dark.png index 25c4e3118cf02..363d7d4681ce4 100644 Binary files a/core/res/res/drawable-xhdpi/ic_media_route_on_1_holo_dark.png and b/core/res/res/drawable-xhdpi/ic_media_route_on_1_holo_dark.png differ diff --git a/core/res/res/drawable-xhdpi/ic_media_route_on_1_holo_light.png b/core/res/res/drawable-xhdpi/ic_media_route_on_1_holo_light.png index 8e32bd2902ac2..edf731e8fd422 100644 Binary files a/core/res/res/drawable-xhdpi/ic_media_route_on_1_holo_light.png and b/core/res/res/drawable-xhdpi/ic_media_route_on_1_holo_light.png differ diff --git a/core/res/res/drawable-xhdpi/ic_media_route_on_2_holo_dark.png b/core/res/res/drawable-xhdpi/ic_media_route_on_2_holo_dark.png index aeaa78ffaec35..85cba7b80fc90 100644 Binary files a/core/res/res/drawable-xhdpi/ic_media_route_on_2_holo_dark.png and b/core/res/res/drawable-xhdpi/ic_media_route_on_2_holo_dark.png differ diff --git a/core/res/res/drawable-xhdpi/ic_media_route_on_2_holo_light.png b/core/res/res/drawable-xhdpi/ic_media_route_on_2_holo_light.png index 85277fa12ebd0..e65ac319044bd 100644 Binary files a/core/res/res/drawable-xhdpi/ic_media_route_on_2_holo_light.png and b/core/res/res/drawable-xhdpi/ic_media_route_on_2_holo_light.png differ diff --git a/core/res/res/drawable-xhdpi/ic_media_route_on_holo_dark.png b/core/res/res/drawable-xhdpi/ic_media_route_on_holo_dark.png index b01dbe8ceae44..d8e3e3aeae388 100644 Binary files a/core/res/res/drawable-xhdpi/ic_media_route_on_holo_dark.png and b/core/res/res/drawable-xhdpi/ic_media_route_on_holo_dark.png differ diff --git a/core/res/res/drawable-xhdpi/ic_media_route_on_holo_light.png b/core/res/res/drawable-xhdpi/ic_media_route_on_holo_light.png index c19a2ad0163b1..562dc9a4f2cf4 100644 Binary files a/core/res/res/drawable-xhdpi/ic_media_route_on_holo_light.png and b/core/res/res/drawable-xhdpi/ic_media_route_on_holo_light.png differ diff --git a/core/res/res/drawable-xhdpi/ic_notification_cast_0.png b/core/res/res/drawable-xhdpi/ic_notification_cast_0.png new file mode 100644 index 0000000000000..5fb23a06df351 Binary files /dev/null and b/core/res/res/drawable-xhdpi/ic_notification_cast_0.png differ diff --git a/core/res/res/drawable-xhdpi/ic_notification_cast_1.png b/core/res/res/drawable-xhdpi/ic_notification_cast_1.png new file mode 100644 index 0000000000000..f01d17db0821f Binary files /dev/null and b/core/res/res/drawable-xhdpi/ic_notification_cast_1.png differ diff --git a/core/res/res/drawable-xhdpi/ic_notification_cast_2.png b/core/res/res/drawable-xhdpi/ic_notification_cast_2.png new file mode 100644 index 0000000000000..4f4ba7f98bcd5 Binary files /dev/null and b/core/res/res/drawable-xhdpi/ic_notification_cast_2.png differ diff --git a/core/res/res/drawable-xhdpi/ic_notification_cast_on.png b/core/res/res/drawable-xhdpi/ic_notification_cast_on.png new file mode 100644 index 0000000000000..38f15ddc416d0 Binary files /dev/null and b/core/res/res/drawable-xhdpi/ic_notification_cast_on.png differ diff --git a/core/res/res/drawable-xxhdpi/ic_media_route_disabled_holo_dark.png b/core/res/res/drawable-xxhdpi/ic_media_route_disabled_holo_dark.png index 7b0c383a5093d..178774ca179a1 100644 Binary files a/core/res/res/drawable-xxhdpi/ic_media_route_disabled_holo_dark.png and b/core/res/res/drawable-xxhdpi/ic_media_route_disabled_holo_dark.png differ diff --git a/core/res/res/drawable-xxhdpi/ic_media_route_disabled_holo_light.png b/core/res/res/drawable-xxhdpi/ic_media_route_disabled_holo_light.png index efb624e182a79..2dc2092f04189 100644 Binary files a/core/res/res/drawable-xxhdpi/ic_media_route_disabled_holo_light.png and b/core/res/res/drawable-xxhdpi/ic_media_route_disabled_holo_light.png differ diff --git a/core/res/res/drawable-xxhdpi/ic_media_route_off_holo_dark.png b/core/res/res/drawable-xxhdpi/ic_media_route_off_holo_dark.png index 5ee57e46a0105..592ee8cdf3261 100644 Binary files a/core/res/res/drawable-xxhdpi/ic_media_route_off_holo_dark.png and b/core/res/res/drawable-xxhdpi/ic_media_route_off_holo_dark.png differ diff --git a/core/res/res/drawable-xxhdpi/ic_media_route_off_holo_light.png b/core/res/res/drawable-xxhdpi/ic_media_route_off_holo_light.png index 6bc2e4aa22657..f0549e24188de 100644 Binary files a/core/res/res/drawable-xxhdpi/ic_media_route_off_holo_light.png and b/core/res/res/drawable-xxhdpi/ic_media_route_off_holo_light.png differ diff --git a/core/res/res/drawable-xxhdpi/ic_media_route_on_0_holo_dark.png b/core/res/res/drawable-xxhdpi/ic_media_route_on_0_holo_dark.png index c13af9c80afd5..91268f5bdc81c 100644 Binary files a/core/res/res/drawable-xxhdpi/ic_media_route_on_0_holo_dark.png and b/core/res/res/drawable-xxhdpi/ic_media_route_on_0_holo_dark.png differ diff --git a/core/res/res/drawable-xxhdpi/ic_media_route_on_0_holo_light.png b/core/res/res/drawable-xxhdpi/ic_media_route_on_0_holo_light.png index 744fb42a66334..9d5436f866991 100644 Binary files a/core/res/res/drawable-xxhdpi/ic_media_route_on_0_holo_light.png and b/core/res/res/drawable-xxhdpi/ic_media_route_on_0_holo_light.png differ diff --git a/core/res/res/drawable-xxhdpi/ic_media_route_on_1_holo_dark.png b/core/res/res/drawable-xxhdpi/ic_media_route_on_1_holo_dark.png index ca4d59c5b0c24..8e77483bce59a 100644 Binary files a/core/res/res/drawable-xxhdpi/ic_media_route_on_1_holo_dark.png and b/core/res/res/drawable-xxhdpi/ic_media_route_on_1_holo_dark.png differ diff --git a/core/res/res/drawable-xxhdpi/ic_media_route_on_1_holo_light.png b/core/res/res/drawable-xxhdpi/ic_media_route_on_1_holo_light.png index fde5688ad0921..f396d22170f58 100644 Binary files a/core/res/res/drawable-xxhdpi/ic_media_route_on_1_holo_light.png and b/core/res/res/drawable-xxhdpi/ic_media_route_on_1_holo_light.png differ diff --git a/core/res/res/drawable-xxhdpi/ic_media_route_on_2_holo_dark.png b/core/res/res/drawable-xxhdpi/ic_media_route_on_2_holo_dark.png index b8715c39d35b2..260bab4f3959b 100644 Binary files a/core/res/res/drawable-xxhdpi/ic_media_route_on_2_holo_dark.png and b/core/res/res/drawable-xxhdpi/ic_media_route_on_2_holo_dark.png differ diff --git a/core/res/res/drawable-xxhdpi/ic_media_route_on_2_holo_light.png b/core/res/res/drawable-xxhdpi/ic_media_route_on_2_holo_light.png index 668bb2510a559..2c9fb1da498a8 100644 Binary files a/core/res/res/drawable-xxhdpi/ic_media_route_on_2_holo_light.png and b/core/res/res/drawable-xxhdpi/ic_media_route_on_2_holo_light.png differ diff --git a/core/res/res/drawable-xxhdpi/ic_media_route_on_holo_dark.png b/core/res/res/drawable-xxhdpi/ic_media_route_on_holo_dark.png index 7f54a623dd7ea..bdbd59c126449 100644 Binary files a/core/res/res/drawable-xxhdpi/ic_media_route_on_holo_dark.png and b/core/res/res/drawable-xxhdpi/ic_media_route_on_holo_dark.png differ diff --git a/core/res/res/drawable-xxhdpi/ic_media_route_on_holo_light.png b/core/res/res/drawable-xxhdpi/ic_media_route_on_holo_light.png index 2df924de1b82c..f5c33dd210e55 100644 Binary files a/core/res/res/drawable-xxhdpi/ic_media_route_on_holo_light.png and b/core/res/res/drawable-xxhdpi/ic_media_route_on_holo_light.png differ diff --git a/core/res/res/drawable-xxhdpi/ic_notification_cast_0.png b/core/res/res/drawable-xxhdpi/ic_notification_cast_0.png new file mode 100644 index 0000000000000..f5b16ed10e0e3 Binary files /dev/null and b/core/res/res/drawable-xxhdpi/ic_notification_cast_0.png differ diff --git a/core/res/res/drawable-xxhdpi/ic_notification_cast_1.png b/core/res/res/drawable-xxhdpi/ic_notification_cast_1.png new file mode 100644 index 0000000000000..22efeec677f7c Binary files /dev/null and b/core/res/res/drawable-xxhdpi/ic_notification_cast_1.png differ diff --git a/core/res/res/drawable-xxhdpi/ic_notification_cast_2.png b/core/res/res/drawable-xxhdpi/ic_notification_cast_2.png new file mode 100644 index 0000000000000..e24cd970da169 Binary files /dev/null and b/core/res/res/drawable-xxhdpi/ic_notification_cast_2.png differ diff --git a/core/res/res/drawable-xxhdpi/ic_notification_cast_on.png b/core/res/res/drawable-xxhdpi/ic_notification_cast_on.png new file mode 100644 index 0000000000000..da1a627be5bf1 Binary files /dev/null and b/core/res/res/drawable-xxhdpi/ic_notification_cast_on.png differ diff --git a/core/res/res/drawable/ic_notification_cast_connecting.xml b/core/res/res/drawable/ic_notification_cast_connecting.xml new file mode 100644 index 0000000000000..a390bce58943e --- /dev/null +++ b/core/res/res/drawable/ic_notification_cast_connecting.xml @@ -0,0 +1,26 @@ + + + + + + + + diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index deff873e4f2a3..225e7c11bfe87 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -4148,10 +4148,14 @@ , secure + + Starting screen cast + + Connecting to %1$s - Wireless display is connected + Screen cast in progress - This screen is showing on another device + Connected to %1$s Disconnect diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index acc8fd504f841..c6a931a01ae3a 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1095,6 +1095,8 @@ + + @@ -1590,8 +1592,10 @@ - - + + + + 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 0000000000000..1c3518af96a20 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 0000000000000..9dbc65ec38c3e 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 0000000000000..ddb002d39f86b 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 0000000000000..43b7ef2793d65 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 0000000000000..1d8b7ee1cc31e 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 0000000000000..11b2134495aeb 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 0000000000000..a858573e0275a 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 0000000000000..04de5d7f8d682 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 0000000000000..caea37e6c0c7a 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 0000000000000..b66aa46d36d6e 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 0000000000000..10ebcd5e2ccf0 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 0000000000000..fef43b8ca3e1f 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 0000000000000..05e32677c583f 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 0000000000000..ef42b27e94b5e 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 0000000000000..fc1c95e4dee1a 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 0000000000000..68b1b7c75b74e 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 0000000000000..8a8f890298b1f 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 0000000000000..12d4a0178d37b 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 0000000000000..3cb44217cb12c 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 0000000000000..4620b3a2decdf 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 0000000000000..70db2a9b4e343 --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_qs_cast_connecting.xml @@ -0,0 +1,26 @@ + + + + + + + + diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 25202edf5e2cf..f19ab57c6ed72 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -491,7 +491,7 @@ Wi-Fi Off - Cast Screen + Screen Cast Brightness 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 48523c60c3b95..7ba396822b60d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java @@ -828,13 +828,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); } diff --git a/services/java/com/android/server/display/WifiDisplayAdapter.java b/services/java/com/android/server/display/WifiDisplayAdapter.java index 99f8ebb6f0ca9..11558a3f13130 100644 --- a/services/java/com/android/server/display/WifiDisplayAdapter.java +++ b/services/java/com/android/server/display/WifiDisplayAdapter.java @@ -400,8 +400,6 @@ final class WifiDisplayAdapter extends DisplayAdapter { mDisplayDevice = new WifiDisplayDevice(displayToken, name, width, height, refreshRate, deviceFlags, address, surface); sendDisplayDeviceEventLocked(mDisplayDevice, DISPLAY_DEVICE_EVENT_ADDED); - - scheduleUpdateNotificationLocked(); } private void removeDisplayDeviceLocked() { @@ -409,8 +407,6 @@ final class WifiDisplayAdapter extends DisplayAdapter { mDisplayDevice.destroyLocked(); sendDisplayDeviceEventLocked(mDisplayDevice, DISPLAY_DEVICE_EVENT_REMOVED); mDisplayDevice = null; - - scheduleUpdateNotificationLocked(); } } @@ -457,21 +453,24 @@ final class WifiDisplayAdapter extends DisplayAdapter { // Runs on the handler. private void handleUpdateNotification() { - final boolean isConnected; + final int state; + final WifiDisplay display; synchronized (getSyncRoot()) { if (!mPendingNotificationUpdate) { return; } mPendingNotificationUpdate = false; - isConnected = (mDisplayDevice != null); + state = mActiveDisplayState; + display = mActiveDisplay; } // Cancel the old notification if there is one. mNotificationManager.cancelAsUser(null, - R.string.wifi_display_notification_title, UserHandle.ALL); + R.string.wifi_display_notification_disconnect, UserHandle.ALL); - if (isConnected) { + if (state == WifiDisplayStatus.DISPLAY_STATE_CONNECTING + || state == WifiDisplayStatus.DISPLAY_STATE_CONNECTED) { Context context = getContext(); // Initialize pending intents for the notification outside of the lock because @@ -493,20 +492,38 @@ final class WifiDisplayAdapter extends DisplayAdapter { // Post the notification. Resources r = context.getResources(); - Notification notification = new Notification.Builder(context) - .setContentTitle(r.getString( - R.string.wifi_display_notification_title)) - .setContentText(r.getString( - R.string.wifi_display_notification_message)) - .setContentIntent(mSettingsPendingIntent) - .setSmallIcon(R.drawable.ic_media_route_on_holo_dark) - .setOngoing(true) - .addAction(android.R.drawable.ic_menu_close_clear_cancel, - r.getString(R.string.wifi_display_notification_disconnect), - mDisconnectPendingIntent) - .build(); + Notification notification; + if (state == WifiDisplayStatus.DISPLAY_STATE_CONNECTING) { + notification = new Notification.Builder(context) + .setContentTitle(r.getString( + R.string.wifi_display_notification_connecting_title)) + .setContentText(r.getString( + R.string.wifi_display_notification_connecting_message, + display.getFriendlyDisplayName())) + .setContentIntent(mSettingsPendingIntent) + .setSmallIcon(R.drawable.ic_notification_cast_connecting) + .setOngoing(true) + .addAction(android.R.drawable.ic_menu_close_clear_cancel, + r.getString(R.string.wifi_display_notification_disconnect), + mDisconnectPendingIntent) + .build(); + } else { + notification = new Notification.Builder(context) + .setContentTitle(r.getString( + R.string.wifi_display_notification_connected_title)) + .setContentText(r.getString( + R.string.wifi_display_notification_connected_message, + display.getFriendlyDisplayName())) + .setContentIntent(mSettingsPendingIntent) + .setSmallIcon(R.drawable.ic_notification_cast_on) + .setOngoing(true) + .addAction(android.R.drawable.ic_menu_close_clear_cancel, + r.getString(R.string.wifi_display_notification_disconnect), + mDisconnectPendingIntent) + .build(); + } mNotificationManager.notifyAsUser(null, - R.string.wifi_display_notification_title, + R.string.wifi_display_notification_disconnect, notification, UserHandle.ALL); } } @@ -578,6 +595,7 @@ final class WifiDisplayAdapter extends DisplayAdapter { mActiveDisplayState = WifiDisplayStatus.DISPLAY_STATE_CONNECTING; mActiveDisplay = display; scheduleStatusChangedBroadcastLocked(); + scheduleUpdateNotificationLocked(); } } } @@ -590,6 +608,7 @@ final class WifiDisplayAdapter extends DisplayAdapter { mActiveDisplayState = WifiDisplayStatus.DISPLAY_STATE_NOT_CONNECTED; mActiveDisplay = null; scheduleStatusChangedBroadcastLocked(); + scheduleUpdateNotificationLocked(); } } } @@ -607,6 +626,7 @@ final class WifiDisplayAdapter extends DisplayAdapter { mActiveDisplayState = WifiDisplayStatus.DISPLAY_STATE_CONNECTED; mActiveDisplay = display; scheduleStatusChangedBroadcastLocked(); + scheduleUpdateNotificationLocked(); } } } @@ -629,6 +649,7 @@ final class WifiDisplayAdapter extends DisplayAdapter { mActiveDisplay = display; renameDisplayDeviceLocked(display.getFriendlyDisplayName()); scheduleStatusChangedBroadcastLocked(); + scheduleUpdateNotificationLocked(); } } } @@ -644,6 +665,7 @@ final class WifiDisplayAdapter extends DisplayAdapter { mActiveDisplayState = WifiDisplayStatus.DISPLAY_STATE_NOT_CONNECTED; mActiveDisplay = null; scheduleStatusChangedBroadcastLocked(); + scheduleUpdateNotificationLocked(); } } } diff --git a/services/java/com/android/server/display/WifiDisplayController.java b/services/java/com/android/server/display/WifiDisplayController.java index 9a4cfb77775ae..b2939fe7e4d41 100644 --- a/services/java/com/android/server/display/WifiDisplayController.java +++ b/services/java/com/android/server/display/WifiDisplayController.java @@ -76,7 +76,7 @@ final class WifiDisplayController implements DumpUtils.Dump { private static final int DEFAULT_CONTROL_PORT = 7236; private static final int MAX_THROUGHPUT = 50; private static final int CONNECTION_TIMEOUT_SECONDS = 60; - private static final int RTSP_TIMEOUT_SECONDS = 15; + private static final int RTSP_TIMEOUT_SECONDS = 30; private static final int RTSP_TIMEOUT_SECONDS_CERT_MODE = 120; private static final int DISCOVER_PEERS_MAX_RETRIES = 10; diff --git a/services/java/com/android/server/media/RemoteDisplayProviderWatcher.java b/services/java/com/android/server/media/RemoteDisplayProviderWatcher.java index f3a3c2f65b6da..6a5f563683a3f 100644 --- a/services/java/com/android/server/media/RemoteDisplayProviderWatcher.java +++ b/services/java/com/android/server/media/RemoteDisplayProviderWatcher.java @@ -16,6 +16,7 @@ package com.android.server.media; +import android.Manifest; import android.content.BroadcastReceiver; import android.content.ComponentName; import android.content.Context; @@ -116,7 +117,7 @@ public final class RemoteDisplayProviderWatcher { for (ResolveInfo resolveInfo : mPackageManager.queryIntentServicesAsUser( intent, 0, mUserId)) { ServiceInfo serviceInfo = resolveInfo.serviceInfo; - if (serviceInfo != null) { + if (serviceInfo != null && verifyServiceTrusted(serviceInfo)) { int sourceIndex = findProvider(serviceInfo.packageName, serviceInfo.name); if (sourceIndex < 0) { RemoteDisplayProviderProxy provider = @@ -146,6 +147,43 @@ public final class RemoteDisplayProviderWatcher { } } + private boolean verifyServiceTrusted(ServiceInfo serviceInfo) { + if (serviceInfo.permission == null || !serviceInfo.permission.equals( + Manifest.permission.BIND_REMOTE_DISPLAY)) { + // If the service does not require this permission then any app could + // potentially bind to it and cause the remote display service to + // misbehave. So we only want to trust providers that require the + // correct permissions. + Slog.w(TAG, "Ignoring remote display provider service because it did not " + + "require the BIND_REMOTE_DISPLAY permission in its manifest: " + + serviceInfo.packageName + "/" + serviceInfo.name); + return false; + } + if (!hasCaptureVideoPermission(serviceInfo.packageName)) { + // If the service does not have permission to capture video then it + // isn't going to be terribly useful as a remote display, is it? + // Kind of makes you wonder what it's doing there in the first place. + Slog.w(TAG, "Ignoring remote display provider service because it does not " + + "have the CAPTURE_VIDEO_OUTPUT or CAPTURE_SECURE_VIDEO_OUTPUT " + + "permission: " + serviceInfo.packageName + "/" + serviceInfo.name); + return false; + } + // Looks good. + return true; + } + + private boolean hasCaptureVideoPermission(String packageName) { + if (mPackageManager.checkPermission(Manifest.permission.CAPTURE_VIDEO_OUTPUT, + packageName) == PackageManager.PERMISSION_GRANTED) { + return true; + } + if (mPackageManager.checkPermission(Manifest.permission.CAPTURE_SECURE_VIDEO_OUTPUT, + packageName) == PackageManager.PERMISSION_GRANTED) { + return true; + } + return false; + } + private int findProvider(String packageName, String className) { int count = mProviders.size(); for (int i = 0; i < count; i++) { diff --git a/tests/RemoteDisplayProvider/Android.mk b/tests/RemoteDisplayProvider/Android.mk index 77e981563a21d..2f4b34324c31b 100644 --- a/tests/RemoteDisplayProvider/Android.mk +++ b/tests/RemoteDisplayProvider/Android.mk @@ -22,4 +22,5 @@ LOCAL_SDK_VERSION := current LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_RESOURCE_DIR = $(LOCAL_PATH)/res LOCAL_JAVA_LIBRARIES := com.android.media.remotedisplay +LOCAL_CERTIFICATE := platform include $(BUILD_PACKAGE) diff --git a/tests/RemoteDisplayProvider/AndroidManifest.xml b/tests/RemoteDisplayProvider/AndroidManifest.xml index e8e31da4ed11a..afb7c78c38913 100644 --- a/tests/RemoteDisplayProvider/AndroidManifest.xml +++ b/tests/RemoteDisplayProvider/AndroidManifest.xml @@ -18,6 +18,7 @@ package="com.android.media.remotedisplay.test" > +