diff --git a/res/drawable-hdpi/ic_menu_add.png b/res/drawable-hdpi/ic_menu_add.png deleted file mode 100644 index 4b68f52ad0a..00000000000 Binary files a/res/drawable-hdpi/ic_menu_add.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_menu_add_dark.png b/res/drawable-hdpi/ic_menu_add_dark.png new file mode 100644 index 00000000000..b45001e55a6 Binary files /dev/null and b/res/drawable-hdpi/ic_menu_add_dark.png differ diff --git a/res/drawable-hdpi/ic_menu_add_light.png b/res/drawable-hdpi/ic_menu_add_light.png new file mode 100644 index 00000000000..91b035402ac Binary files /dev/null and b/res/drawable-hdpi/ic_menu_add_light.png differ diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_1.png b/res/drawable-hdpi/ic_wifi_lock_signal_1.png deleted file mode 100644 index 60857b3b7ac..00000000000 Binary files a/res/drawable-hdpi/ic_wifi_lock_signal_1.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_1_dark.png b/res/drawable-hdpi/ic_wifi_lock_signal_1_dark.png new file mode 100644 index 00000000000..2ec38ae5a87 Binary files /dev/null and b/res/drawable-hdpi/ic_wifi_lock_signal_1_dark.png differ diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_1_light.png b/res/drawable-hdpi/ic_wifi_lock_signal_1_light.png new file mode 100644 index 00000000000..8b0009b1446 Binary files /dev/null and b/res/drawable-hdpi/ic_wifi_lock_signal_1_light.png differ diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_2.png b/res/drawable-hdpi/ic_wifi_lock_signal_2.png deleted file mode 100644 index 5e1f118a5b8..00000000000 Binary files a/res/drawable-hdpi/ic_wifi_lock_signal_2.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_2_dark.png b/res/drawable-hdpi/ic_wifi_lock_signal_2_dark.png new file mode 100644 index 00000000000..a3383a84bc8 Binary files /dev/null and b/res/drawable-hdpi/ic_wifi_lock_signal_2_dark.png differ diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_2_light.png b/res/drawable-hdpi/ic_wifi_lock_signal_2_light.png new file mode 100644 index 00000000000..b79d3e5e726 Binary files /dev/null and b/res/drawable-hdpi/ic_wifi_lock_signal_2_light.png differ diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_3.png b/res/drawable-hdpi/ic_wifi_lock_signal_3.png deleted file mode 100644 index 490bd584dc9..00000000000 Binary files a/res/drawable-hdpi/ic_wifi_lock_signal_3.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_3_dark.png b/res/drawable-hdpi/ic_wifi_lock_signal_3_dark.png new file mode 100644 index 00000000000..e2cb17ecdc3 Binary files /dev/null and b/res/drawable-hdpi/ic_wifi_lock_signal_3_dark.png differ diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_3_light.png b/res/drawable-hdpi/ic_wifi_lock_signal_3_light.png new file mode 100644 index 00000000000..053c7afc419 Binary files /dev/null and b/res/drawable-hdpi/ic_wifi_lock_signal_3_light.png differ diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_4.png b/res/drawable-hdpi/ic_wifi_lock_signal_4.png deleted file mode 100644 index e5fa8d1c0b0..00000000000 Binary files a/res/drawable-hdpi/ic_wifi_lock_signal_4.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_4_dark.png b/res/drawable-hdpi/ic_wifi_lock_signal_4_dark.png new file mode 100644 index 00000000000..65b02dde1ba Binary files /dev/null and b/res/drawable-hdpi/ic_wifi_lock_signal_4_dark.png differ diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_4_light.png b/res/drawable-hdpi/ic_wifi_lock_signal_4_light.png new file mode 100644 index 00000000000..0516bd46e41 Binary files /dev/null and b/res/drawable-hdpi/ic_wifi_lock_signal_4_light.png differ diff --git a/res/drawable-hdpi/ic_wifi_signal_1.png b/res/drawable-hdpi/ic_wifi_signal_1.png deleted file mode 100644 index de9162ba567..00000000000 Binary files a/res/drawable-hdpi/ic_wifi_signal_1.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_wifi_signal_1_dark.png b/res/drawable-hdpi/ic_wifi_signal_1_dark.png new file mode 100644 index 00000000000..f3f020843e4 Binary files /dev/null and b/res/drawable-hdpi/ic_wifi_signal_1_dark.png differ diff --git a/res/drawable-hdpi/ic_wifi_signal_1_light.png b/res/drawable-hdpi/ic_wifi_signal_1_light.png new file mode 100644 index 00000000000..d9968b93f79 Binary files /dev/null and b/res/drawable-hdpi/ic_wifi_signal_1_light.png differ diff --git a/res/drawable-hdpi/ic_wifi_signal_2.png b/res/drawable-hdpi/ic_wifi_signal_2.png deleted file mode 100644 index 4c7559c3df8..00000000000 Binary files a/res/drawable-hdpi/ic_wifi_signal_2.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_wifi_signal_2_dark.png b/res/drawable-hdpi/ic_wifi_signal_2_dark.png new file mode 100644 index 00000000000..9541c38da13 Binary files /dev/null and b/res/drawable-hdpi/ic_wifi_signal_2_dark.png differ diff --git a/res/drawable-hdpi/ic_wifi_signal_2_light.png b/res/drawable-hdpi/ic_wifi_signal_2_light.png new file mode 100644 index 00000000000..d3065dead40 Binary files /dev/null and b/res/drawable-hdpi/ic_wifi_signal_2_light.png differ diff --git a/res/drawable-hdpi/ic_wifi_signal_3.png b/res/drawable-hdpi/ic_wifi_signal_3.png deleted file mode 100644 index 2d763246b8f..00000000000 Binary files a/res/drawable-hdpi/ic_wifi_signal_3.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_wifi_signal_3_dark.png b/res/drawable-hdpi/ic_wifi_signal_3_dark.png new file mode 100644 index 00000000000..be1ba376132 Binary files /dev/null and b/res/drawable-hdpi/ic_wifi_signal_3_dark.png differ diff --git a/res/drawable-hdpi/ic_wifi_signal_3_light.png b/res/drawable-hdpi/ic_wifi_signal_3_light.png new file mode 100644 index 00000000000..4a6407fd67b Binary files /dev/null and b/res/drawable-hdpi/ic_wifi_signal_3_light.png differ diff --git a/res/drawable-hdpi/ic_wifi_signal_4.png b/res/drawable-hdpi/ic_wifi_signal_4.png deleted file mode 100644 index bd50fd7d14f..00000000000 Binary files a/res/drawable-hdpi/ic_wifi_signal_4.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_wifi_signal_4_dark.png b/res/drawable-hdpi/ic_wifi_signal_4_dark.png new file mode 100644 index 00000000000..3fed8e63803 Binary files /dev/null and b/res/drawable-hdpi/ic_wifi_signal_4_dark.png differ diff --git a/res/drawable-hdpi/ic_wifi_signal_4_light.png b/res/drawable-hdpi/ic_wifi_signal_4_light.png new file mode 100644 index 00000000000..e52acd6f446 Binary files /dev/null and b/res/drawable-hdpi/ic_wifi_signal_4_light.png differ diff --git a/res/drawable-hdpi/ic_wps.png b/res/drawable-hdpi/ic_wps.png deleted file mode 100644 index 36c2a327f57..00000000000 Binary files a/res/drawable-hdpi/ic_wps.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_wps_dark.png b/res/drawable-hdpi/ic_wps_dark.png new file mode 100644 index 00000000000..918b0cc48bc Binary files /dev/null and b/res/drawable-hdpi/ic_wps_dark.png differ diff --git a/res/drawable-hdpi/ic_wps_light.png b/res/drawable-hdpi/ic_wps_light.png new file mode 100644 index 00000000000..5ad9f3eaeaf Binary files /dev/null and b/res/drawable-hdpi/ic_wps_light.png differ diff --git a/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_1.png b/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_1.png deleted file mode 100644 index 5806c4f7925..00000000000 Binary files a/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_1.png and /dev/null differ diff --git a/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_2.png b/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_2.png deleted file mode 100644 index c3a1d91aace..00000000000 Binary files a/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_2.png and /dev/null differ diff --git a/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_3.png b/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_3.png deleted file mode 100644 index 36ea00156f6..00000000000 Binary files a/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_3.png and /dev/null differ diff --git a/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_4.png b/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_4.png deleted file mode 100644 index 6c4f25254d4..00000000000 Binary files a/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_4.png and /dev/null differ diff --git a/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_1.png b/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_1.png deleted file mode 100644 index 3f635f8b3ac..00000000000 Binary files a/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_1.png and /dev/null differ diff --git a/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_2.png b/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_2.png deleted file mode 100644 index 04aae2d3849..00000000000 Binary files a/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_2.png and /dev/null differ diff --git a/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_3.png b/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_3.png deleted file mode 100644 index 17609df4708..00000000000 Binary files a/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_3.png and /dev/null differ diff --git a/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_4.png b/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_4.png deleted file mode 100644 index 90a8e27d92d..00000000000 Binary files a/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_4.png and /dev/null differ diff --git a/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_1.png b/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_1.png deleted file mode 100644 index 0e124bd6746..00000000000 Binary files a/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_1.png and /dev/null differ diff --git a/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_2.png b/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_2.png deleted file mode 100644 index d97d5d43d2b..00000000000 Binary files a/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_2.png and /dev/null differ diff --git a/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_3.png b/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_3.png deleted file mode 100644 index 99a8384fbfc..00000000000 Binary files a/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_3.png and /dev/null differ diff --git a/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_4.png b/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_4.png deleted file mode 100644 index 40307f82fea..00000000000 Binary files a/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_4.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_menu_add.png b/res/drawable-mdpi/ic_menu_add.png deleted file mode 100644 index 15ffadd3606..00000000000 Binary files a/res/drawable-mdpi/ic_menu_add.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_menu_add_dark.png b/res/drawable-mdpi/ic_menu_add_dark.png new file mode 100644 index 00000000000..e6add2b291e Binary files /dev/null and b/res/drawable-mdpi/ic_menu_add_dark.png differ diff --git a/res/drawable-mdpi/ic_menu_add_light.png b/res/drawable-mdpi/ic_menu_add_light.png new file mode 100644 index 00000000000..8b558100eea Binary files /dev/null and b/res/drawable-mdpi/ic_menu_add_light.png differ diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_1.png b/res/drawable-mdpi/ic_wifi_lock_signal_1.png deleted file mode 100644 index e8ac823bfa6..00000000000 Binary files a/res/drawable-mdpi/ic_wifi_lock_signal_1.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_1_dark.png b/res/drawable-mdpi/ic_wifi_lock_signal_1_dark.png new file mode 100644 index 00000000000..d6868aa2874 Binary files /dev/null and b/res/drawable-mdpi/ic_wifi_lock_signal_1_dark.png differ diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_1_light.png b/res/drawable-mdpi/ic_wifi_lock_signal_1_light.png new file mode 100644 index 00000000000..eb41a107b6f Binary files /dev/null and b/res/drawable-mdpi/ic_wifi_lock_signal_1_light.png differ diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_2.png b/res/drawable-mdpi/ic_wifi_lock_signal_2.png deleted file mode 100644 index 6034a89b6fc..00000000000 Binary files a/res/drawable-mdpi/ic_wifi_lock_signal_2.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_2_dark.png b/res/drawable-mdpi/ic_wifi_lock_signal_2_dark.png new file mode 100644 index 00000000000..ada9739f54a Binary files /dev/null and b/res/drawable-mdpi/ic_wifi_lock_signal_2_dark.png differ diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_2_light.png b/res/drawable-mdpi/ic_wifi_lock_signal_2_light.png new file mode 100644 index 00000000000..ff041c42caa Binary files /dev/null and b/res/drawable-mdpi/ic_wifi_lock_signal_2_light.png differ diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_3.png b/res/drawable-mdpi/ic_wifi_lock_signal_3.png deleted file mode 100644 index 0089a55d0c3..00000000000 Binary files a/res/drawable-mdpi/ic_wifi_lock_signal_3.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_3_dark.png b/res/drawable-mdpi/ic_wifi_lock_signal_3_dark.png new file mode 100644 index 00000000000..0a294ff2d51 Binary files /dev/null and b/res/drawable-mdpi/ic_wifi_lock_signal_3_dark.png differ diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_3_light.png b/res/drawable-mdpi/ic_wifi_lock_signal_3_light.png new file mode 100644 index 00000000000..98cf1ff8d79 Binary files /dev/null and b/res/drawable-mdpi/ic_wifi_lock_signal_3_light.png differ diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_4.png b/res/drawable-mdpi/ic_wifi_lock_signal_4.png deleted file mode 100644 index ae02f2428a8..00000000000 Binary files a/res/drawable-mdpi/ic_wifi_lock_signal_4.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_4_dark.png b/res/drawable-mdpi/ic_wifi_lock_signal_4_dark.png new file mode 100644 index 00000000000..ccda2c7726c Binary files /dev/null and b/res/drawable-mdpi/ic_wifi_lock_signal_4_dark.png differ diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_4_light.png b/res/drawable-mdpi/ic_wifi_lock_signal_4_light.png new file mode 100644 index 00000000000..83af4de0677 Binary files /dev/null and b/res/drawable-mdpi/ic_wifi_lock_signal_4_light.png differ diff --git a/res/drawable-mdpi/ic_wifi_signal_1.png b/res/drawable-mdpi/ic_wifi_signal_1.png deleted file mode 100644 index e99a47d250e..00000000000 Binary files a/res/drawable-mdpi/ic_wifi_signal_1.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_wifi_signal_1_dark.png b/res/drawable-mdpi/ic_wifi_signal_1_dark.png new file mode 100644 index 00000000000..6715c5d89d1 Binary files /dev/null and b/res/drawable-mdpi/ic_wifi_signal_1_dark.png differ diff --git a/res/drawable-mdpi/ic_wifi_signal_1_light.png b/res/drawable-mdpi/ic_wifi_signal_1_light.png new file mode 100644 index 00000000000..eec60c0a92d Binary files /dev/null and b/res/drawable-mdpi/ic_wifi_signal_1_light.png differ diff --git a/res/drawable-mdpi/ic_wifi_signal_2.png b/res/drawable-mdpi/ic_wifi_signal_2.png deleted file mode 100644 index 79516ea196f..00000000000 Binary files a/res/drawable-mdpi/ic_wifi_signal_2.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_wifi_signal_2_dark.png b/res/drawable-mdpi/ic_wifi_signal_2_dark.png new file mode 100644 index 00000000000..e31d19f0489 Binary files /dev/null and b/res/drawable-mdpi/ic_wifi_signal_2_dark.png differ diff --git a/res/drawable-mdpi/ic_wifi_signal_2_light.png b/res/drawable-mdpi/ic_wifi_signal_2_light.png new file mode 100644 index 00000000000..7caa144d09a Binary files /dev/null and b/res/drawable-mdpi/ic_wifi_signal_2_light.png differ diff --git a/res/drawable-mdpi/ic_wifi_signal_3.png b/res/drawable-mdpi/ic_wifi_signal_3.png deleted file mode 100644 index f2af11d382e..00000000000 Binary files a/res/drawable-mdpi/ic_wifi_signal_3.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_wifi_signal_3_dark.png b/res/drawable-mdpi/ic_wifi_signal_3_dark.png new file mode 100644 index 00000000000..bd6a1e8c039 Binary files /dev/null and b/res/drawable-mdpi/ic_wifi_signal_3_dark.png differ diff --git a/res/drawable-mdpi/ic_wifi_signal_3_light.png b/res/drawable-mdpi/ic_wifi_signal_3_light.png new file mode 100644 index 00000000000..7be25151736 Binary files /dev/null and b/res/drawable-mdpi/ic_wifi_signal_3_light.png differ diff --git a/res/drawable-mdpi/ic_wifi_signal_4.png b/res/drawable-mdpi/ic_wifi_signal_4.png deleted file mode 100644 index 3d4288ea2c8..00000000000 Binary files a/res/drawable-mdpi/ic_wifi_signal_4.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_wifi_signal_4_dark.png b/res/drawable-mdpi/ic_wifi_signal_4_dark.png new file mode 100644 index 00000000000..af125c2465b Binary files /dev/null and b/res/drawable-mdpi/ic_wifi_signal_4_dark.png differ diff --git a/res/drawable-mdpi/ic_wifi_signal_4_light.png b/res/drawable-mdpi/ic_wifi_signal_4_light.png new file mode 100644 index 00000000000..658761a41a6 Binary files /dev/null and b/res/drawable-mdpi/ic_wifi_signal_4_light.png differ diff --git a/res/drawable-mdpi/ic_wps.png b/res/drawable-mdpi/ic_wps.png deleted file mode 100644 index e522e9774a6..00000000000 Binary files a/res/drawable-mdpi/ic_wps.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_wps_dark.png b/res/drawable-mdpi/ic_wps_dark.png new file mode 100644 index 00000000000..77d73a808cd Binary files /dev/null and b/res/drawable-mdpi/ic_wps_dark.png differ diff --git a/res/drawable-mdpi/ic_wps_light.png b/res/drawable-mdpi/ic_wps_light.png new file mode 100644 index 00000000000..ef560fa5c39 Binary files /dev/null and b/res/drawable-mdpi/ic_wps_light.png differ diff --git a/res/drawable-xhdpi/ic_menu_add.png b/res/drawable-xhdpi/ic_menu_add.png deleted file mode 100644 index 420510e935c..00000000000 Binary files a/res/drawable-xhdpi/ic_menu_add.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_add_dark.png b/res/drawable-xhdpi/ic_menu_add_dark.png new file mode 100644 index 00000000000..6e2e18a04b9 Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_add_dark.png differ diff --git a/res/drawable-xhdpi/ic_menu_add_light.png b/res/drawable-xhdpi/ic_menu_add_light.png new file mode 100644 index 00000000000..4109b2ca666 Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_add_light.png differ diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_1.png b/res/drawable-xhdpi/ic_wifi_lock_signal_1.png deleted file mode 100644 index 8b8cb03d34e..00000000000 Binary files a/res/drawable-xhdpi/ic_wifi_lock_signal_1.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_1_dark.png b/res/drawable-xhdpi/ic_wifi_lock_signal_1_dark.png new file mode 100644 index 00000000000..c2be32fc681 Binary files /dev/null and b/res/drawable-xhdpi/ic_wifi_lock_signal_1_dark.png differ diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_1_light.png b/res/drawable-xhdpi/ic_wifi_lock_signal_1_light.png new file mode 100644 index 00000000000..57c8fb29c44 Binary files /dev/null and b/res/drawable-xhdpi/ic_wifi_lock_signal_1_light.png differ diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_2.png b/res/drawable-xhdpi/ic_wifi_lock_signal_2.png deleted file mode 100644 index 411269c53b2..00000000000 Binary files a/res/drawable-xhdpi/ic_wifi_lock_signal_2.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_2_dark.png b/res/drawable-xhdpi/ic_wifi_lock_signal_2_dark.png new file mode 100644 index 00000000000..9e65730d0ab Binary files /dev/null and b/res/drawable-xhdpi/ic_wifi_lock_signal_2_dark.png differ diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_2_light.png b/res/drawable-xhdpi/ic_wifi_lock_signal_2_light.png new file mode 100644 index 00000000000..db783f81c16 Binary files /dev/null and b/res/drawable-xhdpi/ic_wifi_lock_signal_2_light.png differ diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_3.png b/res/drawable-xhdpi/ic_wifi_lock_signal_3.png deleted file mode 100644 index f0d92a05572..00000000000 Binary files a/res/drawable-xhdpi/ic_wifi_lock_signal_3.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_3_dark.png b/res/drawable-xhdpi/ic_wifi_lock_signal_3_dark.png new file mode 100644 index 00000000000..5a12175f5ab Binary files /dev/null and b/res/drawable-xhdpi/ic_wifi_lock_signal_3_dark.png differ diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_3_light.png b/res/drawable-xhdpi/ic_wifi_lock_signal_3_light.png new file mode 100644 index 00000000000..8b7df74d8be Binary files /dev/null and b/res/drawable-xhdpi/ic_wifi_lock_signal_3_light.png differ diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_4.png b/res/drawable-xhdpi/ic_wifi_lock_signal_4.png deleted file mode 100644 index d26694d7af2..00000000000 Binary files a/res/drawable-xhdpi/ic_wifi_lock_signal_4.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_4_dark.png b/res/drawable-xhdpi/ic_wifi_lock_signal_4_dark.png new file mode 100644 index 00000000000..4d2942c69b3 Binary files /dev/null and b/res/drawable-xhdpi/ic_wifi_lock_signal_4_dark.png differ diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_4_light.png b/res/drawable-xhdpi/ic_wifi_lock_signal_4_light.png new file mode 100644 index 00000000000..bf26501a1b4 Binary files /dev/null and b/res/drawable-xhdpi/ic_wifi_lock_signal_4_light.png differ diff --git a/res/drawable-xhdpi/ic_wifi_signal_1.png b/res/drawable-xhdpi/ic_wifi_signal_1.png deleted file mode 100644 index 3fded085f44..00000000000 Binary files a/res/drawable-xhdpi/ic_wifi_signal_1.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_wifi_signal_1_dark.png b/res/drawable-xhdpi/ic_wifi_signal_1_dark.png new file mode 100644 index 00000000000..bf1634cd122 Binary files /dev/null and b/res/drawable-xhdpi/ic_wifi_signal_1_dark.png differ diff --git a/res/drawable-xhdpi/ic_wifi_signal_1_light.png b/res/drawable-xhdpi/ic_wifi_signal_1_light.png new file mode 100644 index 00000000000..0f58f3d5f20 Binary files /dev/null and b/res/drawable-xhdpi/ic_wifi_signal_1_light.png differ diff --git a/res/drawable-xhdpi/ic_wifi_signal_2.png b/res/drawable-xhdpi/ic_wifi_signal_2.png deleted file mode 100644 index 3a32026d33c..00000000000 Binary files a/res/drawable-xhdpi/ic_wifi_signal_2.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_wifi_signal_2_dark.png b/res/drawable-xhdpi/ic_wifi_signal_2_dark.png new file mode 100644 index 00000000000..5345ff30b4d Binary files /dev/null and b/res/drawable-xhdpi/ic_wifi_signal_2_dark.png differ diff --git a/res/drawable-xhdpi/ic_wifi_signal_2_light.png b/res/drawable-xhdpi/ic_wifi_signal_2_light.png new file mode 100644 index 00000000000..c5bcc7e6a93 Binary files /dev/null and b/res/drawable-xhdpi/ic_wifi_signal_2_light.png differ diff --git a/res/drawable-xhdpi/ic_wifi_signal_3.png b/res/drawable-xhdpi/ic_wifi_signal_3.png deleted file mode 100644 index 161694093c2..00000000000 Binary files a/res/drawable-xhdpi/ic_wifi_signal_3.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_wifi_signal_3_dark.png b/res/drawable-xhdpi/ic_wifi_signal_3_dark.png new file mode 100644 index 00000000000..8cc3a6ea1bb Binary files /dev/null and b/res/drawable-xhdpi/ic_wifi_signal_3_dark.png differ diff --git a/res/drawable-xhdpi/ic_wifi_signal_3_light.png b/res/drawable-xhdpi/ic_wifi_signal_3_light.png new file mode 100644 index 00000000000..1cdacc5af08 Binary files /dev/null and b/res/drawable-xhdpi/ic_wifi_signal_3_light.png differ diff --git a/res/drawable-xhdpi/ic_wifi_signal_4.png b/res/drawable-xhdpi/ic_wifi_signal_4.png deleted file mode 100644 index 8b256c32526..00000000000 Binary files a/res/drawable-xhdpi/ic_wifi_signal_4.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_wifi_signal_4_dark.png b/res/drawable-xhdpi/ic_wifi_signal_4_dark.png new file mode 100644 index 00000000000..c9aa4e58110 Binary files /dev/null and b/res/drawable-xhdpi/ic_wifi_signal_4_dark.png differ diff --git a/res/drawable-xhdpi/ic_wifi_signal_4_light.png b/res/drawable-xhdpi/ic_wifi_signal_4_light.png new file mode 100644 index 00000000000..3cf1c8da2a7 Binary files /dev/null and b/res/drawable-xhdpi/ic_wifi_signal_4_light.png differ diff --git a/res/drawable-xhdpi/ic_wps.png b/res/drawable-xhdpi/ic_wps.png deleted file mode 100644 index 71308f213f9..00000000000 Binary files a/res/drawable-xhdpi/ic_wps.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_wps_dark.png b/res/drawable-xhdpi/ic_wps_dark.png new file mode 100644 index 00000000000..3ea4a3b6bcb Binary files /dev/null and b/res/drawable-xhdpi/ic_wps_dark.png differ diff --git a/res/drawable-xhdpi/ic_wps_light.png b/res/drawable-xhdpi/ic_wps_light.png new file mode 100644 index 00000000000..f913d2c00ea Binary files /dev/null and b/res/drawable-xhdpi/ic_wps_light.png differ diff --git a/res/drawable-xxhdpi/ic_menu_add_dark.png b/res/drawable-xxhdpi/ic_menu_add_dark.png new file mode 100644 index 00000000000..5b4923fdabb Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_add_dark.png differ diff --git a/res/drawable-xxhdpi/ic_menu_add_light.png b/res/drawable-xxhdpi/ic_menu_add_light.png new file mode 100644 index 00000000000..767b8080127 Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_add_light.png differ diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_1_dark.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_1_dark.png new file mode 100644 index 00000000000..20739fab9f8 Binary files /dev/null and b/res/drawable-xxhdpi/ic_wifi_lock_signal_1_dark.png differ diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_1_light.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_1_light.png new file mode 100644 index 00000000000..c13edffdb1c Binary files /dev/null and b/res/drawable-xxhdpi/ic_wifi_lock_signal_1_light.png differ diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_2_dark.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_2_dark.png new file mode 100644 index 00000000000..9cd652a4d4a Binary files /dev/null and b/res/drawable-xxhdpi/ic_wifi_lock_signal_2_dark.png differ diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_2_light.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_2_light.png new file mode 100644 index 00000000000..cb7f0c254c0 Binary files /dev/null and b/res/drawable-xxhdpi/ic_wifi_lock_signal_2_light.png differ diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_3_dark.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_3_dark.png new file mode 100644 index 00000000000..99097df39f2 Binary files /dev/null and b/res/drawable-xxhdpi/ic_wifi_lock_signal_3_dark.png differ diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_3_light.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_3_light.png new file mode 100644 index 00000000000..a0961f4c6a9 Binary files /dev/null and b/res/drawable-xxhdpi/ic_wifi_lock_signal_3_light.png differ diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_4_dark.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_4_dark.png new file mode 100644 index 00000000000..6c00a9c9c15 Binary files /dev/null and b/res/drawable-xxhdpi/ic_wifi_lock_signal_4_dark.png differ diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_4_light.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_4_light.png new file mode 100644 index 00000000000..74e1a40116f Binary files /dev/null and b/res/drawable-xxhdpi/ic_wifi_lock_signal_4_light.png differ diff --git a/res/drawable-xxhdpi/ic_wifi_signal_1_dark.png b/res/drawable-xxhdpi/ic_wifi_signal_1_dark.png new file mode 100644 index 00000000000..b50fda532ae Binary files /dev/null and b/res/drawable-xxhdpi/ic_wifi_signal_1_dark.png differ diff --git a/res/drawable-xxhdpi/ic_wifi_signal_1_light.png b/res/drawable-xxhdpi/ic_wifi_signal_1_light.png new file mode 100644 index 00000000000..f6fad9d94b1 Binary files /dev/null and b/res/drawable-xxhdpi/ic_wifi_signal_1_light.png differ diff --git a/res/drawable-xxhdpi/ic_wifi_signal_2_dark.png b/res/drawable-xxhdpi/ic_wifi_signal_2_dark.png new file mode 100644 index 00000000000..f90602321b0 Binary files /dev/null and b/res/drawable-xxhdpi/ic_wifi_signal_2_dark.png differ diff --git a/res/drawable-xxhdpi/ic_wifi_signal_2_light.png b/res/drawable-xxhdpi/ic_wifi_signal_2_light.png new file mode 100644 index 00000000000..7f5859b40d0 Binary files /dev/null and b/res/drawable-xxhdpi/ic_wifi_signal_2_light.png differ diff --git a/res/drawable-xxhdpi/ic_wifi_signal_3_dark.png b/res/drawable-xxhdpi/ic_wifi_signal_3_dark.png new file mode 100644 index 00000000000..ef40952905c Binary files /dev/null and b/res/drawable-xxhdpi/ic_wifi_signal_3_dark.png differ diff --git a/res/drawable-xxhdpi/ic_wifi_signal_3_light.png b/res/drawable-xxhdpi/ic_wifi_signal_3_light.png new file mode 100644 index 00000000000..e3151b33f8b Binary files /dev/null and b/res/drawable-xxhdpi/ic_wifi_signal_3_light.png differ diff --git a/res/drawable-xxhdpi/ic_wifi_signal_4_dark.png b/res/drawable-xxhdpi/ic_wifi_signal_4_dark.png new file mode 100644 index 00000000000..13f94251153 Binary files /dev/null and b/res/drawable-xxhdpi/ic_wifi_signal_4_dark.png differ diff --git a/res/drawable-xxhdpi/ic_wifi_signal_4_light.png b/res/drawable-xxhdpi/ic_wifi_signal_4_light.png new file mode 100644 index 00000000000..96e25e5f5cf Binary files /dev/null and b/res/drawable-xxhdpi/ic_wifi_signal_4_light.png differ diff --git a/res/drawable-xxhdpi/ic_wps_dark.png b/res/drawable-xxhdpi/ic_wps_dark.png new file mode 100644 index 00000000000..8b38db86f79 Binary files /dev/null and b/res/drawable-xxhdpi/ic_wps_dark.png differ diff --git a/res/drawable-xxhdpi/ic_wps_light.png b/res/drawable-xxhdpi/ic_wps_light.png new file mode 100644 index 00000000000..00841755b76 Binary files /dev/null and b/res/drawable-xxhdpi/ic_wps_light.png differ diff --git a/res/drawable/wifi_signal.xml b/res/drawable/wifi_signal_dark.xml similarity index 93% rename from res/drawable/wifi_signal.xml rename to res/drawable/wifi_signal_dark.xml index 86c1ab09916..b578f47761b 100644 --- a/res/drawable/wifi_signal.xml +++ b/res/drawable/wifi_signal_dark.xml @@ -16,7 +16,7 @@ - - + + diff --git a/res/drawable/wifi_signal_light.xml b/res/drawable/wifi_signal_light.xml new file mode 100644 index 00000000000..f1f74e3105a --- /dev/null +++ b/res/drawable/wifi_signal_light.xml @@ -0,0 +1,22 @@ + + + + + + + + diff --git a/res/drawable/wifi_signal_lock_dark.xml b/res/drawable/wifi_signal_lock_dark.xml new file mode 100644 index 00000000000..37226a808aa --- /dev/null +++ b/res/drawable/wifi_signal_lock_dark.xml @@ -0,0 +1,23 @@ + + + + + + + + + + diff --git a/res/drawable/wifi_signal_lock_light.xml b/res/drawable/wifi_signal_lock_light.xml new file mode 100644 index 00000000000..bf2d3604c83 --- /dev/null +++ b/res/drawable/wifi_signal_lock_light.xml @@ -0,0 +1,23 @@ + + + + + + + + + + diff --git a/res/drawable/wifi_signal_lock.xml b/res/drawable/wifi_signal_open_dark.xml similarity index 92% rename from res/drawable/wifi_signal_lock.xml rename to res/drawable/wifi_signal_open_dark.xml index 2ad6d91d260..d696983dc21 100644 --- a/res/drawable/wifi_signal_lock.xml +++ b/res/drawable/wifi_signal_open_dark.xml @@ -15,9 +15,9 @@ --> - - - - + + + + diff --git a/res/drawable/wifi_signal_open.xml b/res/drawable/wifi_signal_open_light.xml similarity index 92% rename from res/drawable/wifi_signal_open.xml rename to res/drawable/wifi_signal_open_light.xml index b506dd3349e..c54e9e93d78 100644 --- a/res/drawable/wifi_signal_open.xml +++ b/res/drawable/wifi_signal_open_light.xml @@ -15,9 +15,9 @@ --> - - - - + + + + diff --git a/res/layout/preference_widget_wifi_signal.xml b/res/layout/preference_widget_wifi_signal.xml index 6df203c3abf..c2541a5f694 100644 --- a/res/layout/preference_widget_wifi_signal.xml +++ b/res/layout/preference_widget_wifi_signal.xml @@ -15,8 +15,8 @@ --> diff --git a/res/layout/setup_preference.xml b/res/layout/setup_preference.xml index 7e917d88587..d0cbc02d6a6 100644 --- a/res/layout/setup_preference.xml +++ b/res/layout/setup_preference.xml @@ -33,7 +33,6 @@ android:id="@+id/title_bar" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_alignBottom="@id/title" android:gravity="bottom" android:orientation="horizontal"> @@ -124,7 +123,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:src="@drawable/ic_menu_add" /> + android:src="?attr/ic_menu_add" /> + android:src="?attr/ic_wps" /> + + + + + + @drawable/ic_menu_add_light + @*android:drawable/ic_menu_moreoverflow_holo_light + @drawable/ic_wps_light + @drawable/wifi_signal_light + diff --git a/res/xml/settings_headers.xml b/res/xml/settings_headers.xml index 65c42efbbbb..1d27a35af9d 100644 --- a/res/xml/settings_headers.xml +++ b/res/xml/settings_headers.xml @@ -158,7 +158,7 @@
+ android:icon="@drawable/ic_menu_add_dark">
diff --git a/res/xml/user_settings.xml b/res/xml/user_settings.xml index cf393b35df6..3a0ab742d27 100644 --- a/res/xml/user_settings.xml +++ b/res/xml/user_settings.xml @@ -26,6 +26,6 @@ + android:icon="@drawable/ic_menu_add_dark" /> diff --git a/src/com/android/settings/UserDictionarySettings.java b/src/com/android/settings/UserDictionarySettings.java index 9f6df5072b9..da120048d5a 100644 --- a/src/com/android/settings/UserDictionarySettings.java +++ b/src/com/android/settings/UserDictionarySettings.java @@ -16,6 +16,9 @@ package com.android.settings; +import com.android.settings.inputmethod.UserDictionaryAddWordContents; +import com.android.settings.inputmethod.UserDictionarySettingsUtils; + import android.app.ListFragment; import android.content.ContentResolver; import android.content.Context; @@ -37,9 +40,6 @@ import android.widget.SectionIndexer; import android.widget.SimpleCursorAdapter; import android.widget.TextView; -import com.android.settings.inputmethod.UserDictionaryAddWordContents; -import com.android.settings.inputmethod.UserDictionarySettingsUtils; - import java.util.Locale; public class UserDictionarySettings extends ListFragment { @@ -165,7 +165,7 @@ public class UserDictionarySettings extends ListFragment { public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { MenuItem actionItem = menu.add(0, OPTIONS_MENU_ADD, 0, R.string.user_dict_settings_add_menu_title) - .setIcon(R.drawable.ic_menu_add); + .setIcon(R.drawable.ic_menu_add_dark); actionItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM | MenuItem.SHOW_AS_ACTION_WITH_TEXT); } @@ -236,8 +236,9 @@ public class UserDictionarySettings extends ListFragment { private AlphabetIndexer mIndexer; - private ViewBinder mViewBinder = new ViewBinder() { + private final ViewBinder mViewBinder = new ViewBinder() { + @Override public boolean setViewValue(View v, Cursor c, int columnIndex) { if (columnIndex == INDEX_SHORTCUT) { final String shortcut = c.getString(INDEX_SHORTCUT); @@ -268,14 +269,17 @@ public class UserDictionarySettings extends ListFragment { setViewBinder(mViewBinder); } + @Override public int getPositionForSection(int section) { return null == mIndexer ? 0 : mIndexer.getPositionForSection(section); } + @Override public int getSectionForPosition(int position) { return null == mIndexer ? 0 : mIndexer.getSectionForPosition(position); } + @Override public Object[] getSections() { return null == mIndexer ? null : mIndexer.getSections(); } diff --git a/src/com/android/settings/wifi/AccessPoint.java b/src/com/android/settings/wifi/AccessPoint.java index 20146eb27ae..c4d1f7c65fd 100644 --- a/src/com/android/settings/wifi/AccessPoint.java +++ b/src/com/android/settings/wifi/AccessPoint.java @@ -16,6 +16,8 @@ package com.android.settings.wifi; +import com.android.settings.R; + import android.content.Context; import android.net.NetworkInfo.DetailedState; import android.net.wifi.ScanResult; @@ -29,8 +31,6 @@ import android.util.Log; import android.view.View; import android.widget.ImageView; -import com.android.settings.R; - class AccessPoint extends Preference { static final String TAG = "Settings.AccessPoint"; @@ -211,7 +211,8 @@ class AccessPoint extends Preference { signal.setImageDrawable(null); } else { signal.setImageLevel(getLevel()); - signal.setImageResource(R.drawable.wifi_signal); + signal.setImageDrawable(getContext().getTheme().obtainStyledAttributes( + new int[] {R.attr.wifi_signal}).getDrawable(0)); signal.setImageState((security != SECURITY_NONE) ? STATE_SECURED : STATE_NONE, true); } diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index 9fc10107048..1caf58bcd1c 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -19,12 +19,9 @@ package com.android.settings.wifi; import static android.net.wifi.WifiConfiguration.INVALID_NETWORK_ID; import static android.os.UserManager.DISALLOW_CONFIG_WIFI; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.concurrent.atomic.AtomicBoolean; +import com.android.settings.R; +import com.android.settings.RestrictedSettingsFragment; +import com.android.settings.wifi.p2p.WifiP2pSettings; import android.app.ActionBar; import android.app.Activity; @@ -37,6 +34,7 @@ import android.content.Intent; import android.content.IntentFilter; import android.content.pm.PackageManager; import android.content.res.Resources; +import android.content.res.TypedArray; import android.location.LocationManager; import android.net.ConnectivityManager; import android.net.NetworkInfo; @@ -76,9 +74,12 @@ import android.widget.Switch; import android.widget.TextView; import android.widget.Toast; -import com.android.settings.R; -import com.android.settings.RestrictedSettingsFragment; -import com.android.settings.wifi.p2p.WifiP2pSettings; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.concurrent.atomic.AtomicBoolean; /** * Two types of UI are provided here. @@ -134,7 +135,7 @@ public class WifiSettings extends RestrictedSettingsFragment private DetailedState mLastState; private WifiInfo mLastInfo; - private AtomicBoolean mConnected = new AtomicBoolean(false); + private final AtomicBoolean mConnected = new AtomicBoolean(false); private WifiDialog mDialog; @@ -447,10 +448,11 @@ public class WifiSettings extends RestrictedSettingsFragment if (isRestrictedAndNotPinProtected()) return; final boolean wifiIsEnabled = mWifiManager.isWifiEnabled(); + TypedArray ta = getActivity().getTheme().obtainStyledAttributes( + new int[] {R.attr.ic_menu_add, R.attr.ic_wps}); if (mSetupWizardMode) { - // FIXME: add setIcon() when graphics are available menu.add(Menu.NONE, MENU_ID_WPS_PBC, 0, R.string.wifi_menu_wps_pbc) - .setIcon(R.drawable.ic_wps) + .setIcon(ta.getDrawable(1)) .setEnabled(wifiIsEnabled) .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); menu.add(Menu.NONE, MENU_ID_ADD_NETWORK, 0, R.string.wifi_add_network) @@ -458,11 +460,11 @@ public class WifiSettings extends RestrictedSettingsFragment .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); } else { menu.add(Menu.NONE, MENU_ID_WPS_PBC, 0, R.string.wifi_menu_wps_pbc) - .setIcon(R.drawable.ic_wps) + .setIcon(ta.getDrawable(1)) .setEnabled(wifiIsEnabled) .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); menu.add(Menu.NONE, MENU_ID_ADD_NETWORK, 0, R.string.wifi_add_network) - .setIcon(R.drawable.ic_menu_add) + .setIcon(ta.getDrawable(0)) .setEnabled(wifiIsEnabled) .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); menu.add(Menu.NONE, MENU_ID_SCAN, 0, R.string.wifi_menu_scan) @@ -481,6 +483,7 @@ public class WifiSettings extends RestrictedSettingsFragment //.setIcon(android.R.drawable.ic_menu_manage) .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER); } + ta.recycle(); super.onCreateOptionsMenu(menu, inflater); } @@ -808,7 +811,7 @@ public class WifiSettings extends RestrictedSettingsFragment /** A restricted multimap for use in constructAccessPoints */ private class Multimap { - private HashMap> store = new HashMap>(); + private final HashMap> store = new HashMap>(); /** retrieve a non-null list of values with key K */ List getAll(K key) { List values = store.get(key); diff --git a/src/com/android/settings/wifi/p2p/WifiP2pPeer.java b/src/com/android/settings/wifi/p2p/WifiP2pPeer.java index 1eb810eb68e..a364021dd5f 100644 --- a/src/com/android/settings/wifi/p2p/WifiP2pPeer.java +++ b/src/com/android/settings/wifi/p2p/WifiP2pPeer.java @@ -20,21 +20,18 @@ import com.android.settings.R; import android.content.Context; import android.net.wifi.WifiManager; -import android.net.wifi.p2p.WifiP2pManager; import android.net.wifi.p2p.WifiP2pDevice; import android.preference.Preference; import android.text.TextUtils; import android.view.View; import android.widget.ImageView; -import java.util.Comparator; - public class WifiP2pPeer extends Preference { private static final int[] STATE_SECURED = {R.attr.state_encrypted}; public WifiP2pDevice device; - private int mRssi; + private final int mRssi; private ImageView mSignal; private static final int SIGNAL_LEVELS = 4; @@ -57,7 +54,7 @@ public class WifiP2pPeer extends Preference { if (mRssi == Integer.MAX_VALUE) { mSignal.setImageDrawable(null); } else { - mSignal.setImageResource(R.drawable.wifi_signal); + mSignal.setImageResource(R.drawable.wifi_signal_dark); mSignal.setImageState(STATE_SECURED, true); } refresh();