diff --git a/Android.mk b/Android.mk index 7e0b1e4a5a5cff008650e3c150f9987d45ef08e1..43fedb618ce0efc706b0a74aaa2bea841b7e9738 100644 --- a/Android.mk +++ b/Android.mk @@ -21,7 +21,8 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \ androidx.cardview_cardview \ androidx.recyclerview_recyclerview \ androidx.palette_palette \ - androidx.legacy_legacy-support-v4 + androidx.legacy_legacy-support-v4 \ + androidx.webkit_webkit LOCAL_JAVA_LIBRARIES := voip-common diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 8494865b49abfdbf3f86d23a50f4daee7bfae33a..56981813a3598973e968862f94393329d7a4110a 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -286,7 +286,7 @@ + android:theme="@style/customDialogNoActionBar"> @@ -302,7 +302,7 @@ android:excludeFromRecents="true" android:launchMode="singleTop" android:taskAffinity="" - android:theme="@style/Theme.QuickContact" + android:theme="@style/Theme.QuickContact.White.TopBar" android:windowSoftInputMode="stateUnchanged"> diff --git a/res/drawable/fab_bg.xml b/res/drawable/fab_bg.xml index 007d3e2205970326bf43ef64f6729a8e52c31a06..40e44017a79faf6e4b04feae55bd85e5e42c8e5e 100644 --- a/res/drawable/fab_bg.xml +++ b/res/drawable/fab_bg.xml @@ -4,7 +4,7 @@ android:shape="oval"> + android:color="@color/primary_color_dark"/> - diff --git a/res/drawable/ic_add_contact_shortcut.xml b/res/drawable/ic_add_contact_shortcut.xml index 85a7e61bd7882f7fa7d95be77686a773fc606fc5..f56005ee1c356dd9895709d227280f16273390fe 100644 --- a/res/drawable/ic_add_contact_shortcut.xml +++ b/res/drawable/ic_add_contact_shortcut.xml @@ -22,6 +22,6 @@ android:viewportWidth="192.0"> - diff --git a/res/drawable/ic_work_profile.xml b/res/drawable/ic_work_profile.xml index d30e8e1c10fa6e87ea0b91b9bc1fef782686c8a1..168a5f9b33a22eed98992cb8f7fb0f717338625c 100644 --- a/res/drawable/ic_work_profile.xml +++ b/res/drawable/ic_work_profile.xml @@ -5,5 +5,5 @@ android:viewportHeight="24.0"> + android:fillColor="@color/accent"/> diff --git a/res/drawable/item_background_material_dark.xml b/res/drawable/item_background_material_dark.xml index 87b1e17471f638518a7cd389e99a1c8db0a27b6d..8437f61c1d27a98f91ee535da934f2e3a5807d67 100644 --- a/res/drawable/item_background_material_dark.xml +++ b/res/drawable/item_background_material_dark.xml @@ -18,6 +18,6 @@ - + \ No newline at end of file diff --git a/res/drawable/quantum_ic_account_circle_vd_theme_24.xml b/res/drawable/quantum_ic_account_circle_vd_theme_24.xml index df2f6e7a6355850f6826158f088741081b517668..cf08fb14150a54a726797323bfe244f1421bb746 100644 --- a/res/drawable/quantum_ic_account_circle_vd_theme_24.xml +++ b/res/drawable/quantum_ic_account_circle_vd_theme_24.xml @@ -19,8 +19,8 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?attr/colorControlNormal"> + android:tint="@color/accent"> diff --git a/res/drawable/quantum_ic_add_vd_theme_24.xml b/res/drawable/quantum_ic_add_vd_theme_24.xml index 627fc48c4e964c786d233d383fcdd0cbace5eede..8f76cfee2b84e2f8277338f744358466311c4041 100644 --- a/res/drawable/quantum_ic_add_vd_theme_24.xml +++ b/res/drawable/quantum_ic_add_vd_theme_24.xml @@ -19,8 +19,8 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?attr/colorControlNormal"> + android:tint="@color/accent"> diff --git a/res/drawable/quantum_ic_arrow_back_vd_theme_24.xml b/res/drawable/quantum_ic_arrow_back_vd_theme_24.xml index 174cf12fbab427e17b798f7b05dcaf2677f29744..6524874feaa367b67b4d0495bf2338ec7e6135b1 100644 --- a/res/drawable/quantum_ic_arrow_back_vd_theme_24.xml +++ b/res/drawable/quantum_ic_arrow_back_vd_theme_24.xml @@ -19,8 +19,8 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?attr/colorControlNormal"> + android:tint="@color/accent"> diff --git a/res/color/contact_list_name_text_color.xml b/res/drawable/quantum_ic_arrow_back_white_vd_theme_24.xml similarity index 54% rename from res/color/contact_list_name_text_color.xml rename to res/drawable/quantum_ic_arrow_back_white_vd_theme_24.xml index 2327e2ae1b7929fc3af27f92ffbfc7bac7cf90ef..aa7331fc6b4a600cd5fcd49c0a69866067944878 100644 --- a/res/color/contact_list_name_text_color.xml +++ b/res/drawable/quantum_ic_arrow_back_white_vd_theme_24.xml @@ -1,5 +1,4 @@ - - - - - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/res/drawable/quantum_ic_arrow_drop_down_vd_theme_24.xml b/res/drawable/quantum_ic_arrow_drop_down_vd_theme_24.xml index 87c39de0b6a837e74c6ee37d546f6acc4a80867a..66ba35ca8cca4ebd5acfd322b43f4f0e0d781bab 100644 --- a/res/drawable/quantum_ic_arrow_drop_down_vd_theme_24.xml +++ b/res/drawable/quantum_ic_arrow_drop_down_vd_theme_24.xml @@ -19,8 +19,8 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?attr/colorControlNormal"> + android:tint="@color/accent"> diff --git a/res/drawable/quantum_ic_assistant_vd_theme_24.xml b/res/drawable/quantum_ic_assistant_vd_theme_24.xml index 2d5135bda96f3331d86ad31a179532802934bbe1..ad48048dc092e99105a67b656bd71cd02e03a7cf 100644 --- a/res/drawable/quantum_ic_assistant_vd_theme_24.xml +++ b/res/drawable/quantum_ic_assistant_vd_theme_24.xml @@ -19,8 +19,8 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?attr/colorControlNormal"> + android:tint="@color/accent"> diff --git a/res/drawable/quantum_ic_business_vd_theme_24.xml b/res/drawable/quantum_ic_business_vd_theme_24.xml index 684265b4f48e60691c1294aa03f04d7a7466fc7f..b523eec08056bd569e85e27a5715c35a06ba6312 100644 --- a/res/drawable/quantum_ic_business_vd_theme_24.xml +++ b/res/drawable/quantum_ic_business_vd_theme_24.xml @@ -19,8 +19,8 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?attr/colorControlNormal"> + android:tint="@color/accent"> \ No newline at end of file diff --git a/res/drawable/quantum_ic_call_received_vd_theme_24.xml b/res/drawable/quantum_ic_call_received_vd_theme_24.xml index 3793f74b73fb175ed1378f4af9b145b8dcc5f2f9..69887b0266e11e9bfa6e91ac3e65e21300eb771f 100644 --- a/res/drawable/quantum_ic_call_received_vd_theme_24.xml +++ b/res/drawable/quantum_ic_call_received_vd_theme_24.xml @@ -19,8 +19,8 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?attr/colorControlNormal"> + android:tint="@color/accent"> \ No newline at end of file diff --git a/res/drawable/quantum_ic_camera_alt_vd_theme_24.xml b/res/drawable/quantum_ic_camera_alt_vd_theme_24.xml index 07ed76be111eb2c06aad9ea4fd51198c20f68674..c2605d37e3619666289887937a346fc70132c076 100644 --- a/res/drawable/quantum_ic_camera_alt_vd_theme_24.xml +++ b/res/drawable/quantum_ic_camera_alt_vd_theme_24.xml @@ -19,11 +19,11 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?attr/colorControlNormal"> + android:tint="@color/accent"> diff --git a/res/drawable/quantum_ic_cancel_vd_theme_24.xml b/res/drawable/quantum_ic_cancel_vd_theme_24.xml index 409ba75eb23765de8f01d54a2169f42c9f39d248..d6fa914bc1599cdde0caff187426a0827ebeff45 100644 --- a/res/drawable/quantum_ic_cancel_vd_theme_24.xml +++ b/res/drawable/quantum_ic_cancel_vd_theme_24.xml @@ -19,8 +19,8 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?attr/colorControlNormal"> + android:tint="@color/accent"> diff --git a/res/drawable/quantum_ic_circles_ext_vd_theme_24.xml b/res/drawable/quantum_ic_circles_ext_vd_theme_24.xml index 73baff26821180ac0355856cd5be8a04e5d32212..f29bf0b91c3bdd9ada2e71cdbbfcea87afa05fcd 100644 --- a/res/drawable/quantum_ic_circles_ext_vd_theme_24.xml +++ b/res/drawable/quantum_ic_circles_ext_vd_theme_24.xml @@ -19,8 +19,8 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?attr/colorControlNormal"> + android:tint="@color/accent"> diff --git a/res/drawable/quantum_ic_close_vd_theme_24.xml b/res/drawable/quantum_ic_close_vd_theme_24.xml index 3809f5c35c65cd3f3ef71501a0a9be02b45697fe..687efeaaff3f2dcca480e4e74f0eb2099db86ff4 100644 --- a/res/drawable/quantum_ic_close_vd_theme_24.xml +++ b/res/drawable/quantum_ic_close_vd_theme_24.xml @@ -19,8 +19,8 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?attr/colorControlNormal"> + android:tint="@color/accent"> diff --git a/res/drawable/quantum_ic_content_copy_vd_theme_24.xml b/res/drawable/quantum_ic_content_copy_vd_theme_24.xml index b43eb4aada9de263ad638e5422a3162f9ead9f59..9776c7f2ebe3d64450201af12942820b561d6ca4 100644 --- a/res/drawable/quantum_ic_content_copy_vd_theme_24.xml +++ b/res/drawable/quantum_ic_content_copy_vd_theme_24.xml @@ -19,8 +19,8 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?attr/colorControlNormal"> + android:tint="@color/accent"> diff --git a/res/drawable/quantum_ic_create_vd_theme_24.xml b/res/drawable/quantum_ic_create_vd_theme_24.xml index 8f161bc4380c9049b62dec95f6452d7ca2b8dc5c..18b0b1142e5e79fda8ee2c78e65b7793ef7a6937 100644 --- a/res/drawable/quantum_ic_create_vd_theme_24.xml +++ b/res/drawable/quantum_ic_create_vd_theme_24.xml @@ -19,8 +19,8 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?attr/colorControlNormal"> + android:tint="@color/accent"> diff --git a/res/drawable/quantum_ic_create_white_vd_theme_24.xml b/res/drawable/quantum_ic_create_white_vd_theme_24.xml new file mode 100644 index 0000000000000000000000000000000000000000..842a3cc622e464c366d7692b719ba4e01a45d32b --- /dev/null +++ b/res/drawable/quantum_ic_create_white_vd_theme_24.xml @@ -0,0 +1,25 @@ + + + + + \ No newline at end of file diff --git a/res/drawable/quantum_ic_delete_vd_theme_24.xml b/res/drawable/quantum_ic_delete_vd_theme_24.xml index 698a0bcfed8c1246a888d1afa9a44b057963d3ba..f4ca0a310295ab045cfa1db396d9e50c1e596ff0 100644 --- a/res/drawable/quantum_ic_delete_vd_theme_24.xml +++ b/res/drawable/quantum_ic_delete_vd_theme_24.xml @@ -19,8 +19,8 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?attr/colorControlNormal"> + android:tint="@color/accent"> diff --git a/res/drawable/quantum_ic_dialer_sip_vd_theme_24.xml b/res/drawable/quantum_ic_dialer_sip_vd_theme_24.xml index 6ef33dbd0d718d0fb27a1f1a588d611c0bec75d4..d2fb20e48e667a039882907402355b83c25ce7c2 100644 --- a/res/drawable/quantum_ic_dialer_sip_vd_theme_24.xml +++ b/res/drawable/quantum_ic_dialer_sip_vd_theme_24.xml @@ -19,8 +19,8 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?attr/colorControlNormal"> + android:tint="@color/accent"> diff --git a/res/drawable/quantum_ic_directions_vd_theme_24.xml b/res/drawable/quantum_ic_directions_vd_theme_24.xml index 7da99e052f0402858623b8df87ce893e8068f361..9d142aea66782f650f73b289fdbe1cb537c4dd4f 100644 --- a/res/drawable/quantum_ic_directions_vd_theme_24.xml +++ b/res/drawable/quantum_ic_directions_vd_theme_24.xml @@ -19,8 +19,8 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?attr/colorControlNormal"> + android:tint="@color/accent"> \ No newline at end of file diff --git a/res/drawable/quantum_ic_done_vd_theme_24.xml b/res/drawable/quantum_ic_done_vd_theme_24.xml index 0c810e80e4c835770732a0d86067fd54502b683d..bd15ece8d06d7fccf3e838db0f808aeb70561ed4 100644 --- a/res/drawable/quantum_ic_done_vd_theme_24.xml +++ b/res/drawable/quantum_ic_done_vd_theme_24.xml @@ -19,8 +19,8 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?attr/colorControlNormal"> + android:tint="@color/accent"> diff --git a/res/drawable/quantum_ic_drawer_emergency_info_24.xml b/res/drawable/quantum_ic_drawer_emergency_info_24.xml index 6b6a14336b69162c6c5557952ca738f0e70e9fb3..5850be17cadd524778678acc9c5ee6552a46c23e 100644 --- a/res/drawable/quantum_ic_drawer_emergency_info_24.xml +++ b/res/drawable/quantum_ic_drawer_emergency_info_24.xml @@ -3,8 +3,8 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?attr/colorControlNormal"> + android:tint="@color/accent"> + android:fillColor="@color/accent"/> diff --git a/res/drawable/quantum_ic_drawer_my_info_32.xml b/res/drawable/quantum_ic_drawer_my_info_32.xml index 4e310cb4a1a86f4fc715a6365d83f7ec35cf7845..7a7ced37062d105b6c46766dbcaf690c6077acae 100644 --- a/res/drawable/quantum_ic_drawer_my_info_32.xml +++ b/res/drawable/quantum_ic_drawer_my_info_32.xml @@ -5,15 +5,15 @@ android:viewportHeight="32.0"> + android:fillColor="@color/accent"/> diff --git a/res/drawable/quantum_ic_email_vd_theme_24.xml b/res/drawable/quantum_ic_email_vd_theme_24.xml index 724f45a770e8eb6b381298e7e74d0487774b2edf..4c7b3327fdff9f64007ab8b93f20387dc368ff4e 100644 --- a/res/drawable/quantum_ic_email_vd_theme_24.xml +++ b/res/drawable/quantum_ic_email_vd_theme_24.xml @@ -19,8 +19,8 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?attr/colorControlNormal"> + android:tint="@color/accent"> diff --git a/res/drawable/quantum_ic_error_vd_theme_24.xml b/res/drawable/quantum_ic_error_vd_theme_24.xml index b9dbeb41db9788ddf8660effcc898fc7c49cb30b..6381d6be1d7d5e918975670ecad6b0c0916fde9e 100644 --- a/res/drawable/quantum_ic_error_vd_theme_24.xml +++ b/res/drawable/quantum_ic_error_vd_theme_24.xml @@ -19,8 +19,8 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?attr/colorControlNormal"> + android:tint="@color/accent"> diff --git a/res/drawable/quantum_ic_event_vd_theme_24.xml b/res/drawable/quantum_ic_event_vd_theme_24.xml index e0107b123126d32eeb5ca788bf89af593a0567a1..1d5f63dc6e827e9476e2f2a77b977263ec2eb888 100644 --- a/res/drawable/quantum_ic_event_vd_theme_24.xml +++ b/res/drawable/quantum_ic_event_vd_theme_24.xml @@ -19,8 +19,8 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?attr/colorControlNormal"> + android:tint="@color/accent"> diff --git a/res/drawable/quantum_ic_expand_less_vd_theme_24.xml b/res/drawable/quantum_ic_expand_less_vd_theme_24.xml index 2f60a68c04810a79cd66c5181144315f9d0ec3e3..c48e5bc51eeee045b47ccf74f6c5bbe45df94281 100644 --- a/res/drawable/quantum_ic_expand_less_vd_theme_24.xml +++ b/res/drawable/quantum_ic_expand_less_vd_theme_24.xml @@ -19,8 +19,8 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?attr/colorControlNormal"> + android:tint="@color/accent"> diff --git a/res/drawable/quantum_ic_expand_more_vd_theme_24.xml b/res/drawable/quantum_ic_expand_more_vd_theme_24.xml index 9fbfe48ec35c5aa1e9715a7c6af38c07027d185b..8d85b3a05ba87b3e33bfcc4a46be937eb7d3b1cc 100644 --- a/res/drawable/quantum_ic_expand_more_vd_theme_24.xml +++ b/res/drawable/quantum_ic_expand_more_vd_theme_24.xml @@ -19,8 +19,8 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?attr/colorControlNormal"> + android:tint="@color/accent"> diff --git a/res/drawable/quantum_ic_hangout_vd_theme_24.xml b/res/drawable/quantum_ic_hangout_vd_theme_24.xml index ab07ba8fd0b0d33bbf3b8505a42ca5b0b9ac90e3..65b9bfb5f97303062c0fbd8e83ef3eba1d20855b 100644 --- a/res/drawable/quantum_ic_hangout_vd_theme_24.xml +++ b/res/drawable/quantum_ic_hangout_vd_theme_24.xml @@ -19,8 +19,8 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?attr/colorControlNormal"> + android:tint="@color/accent"> diff --git a/res/drawable/quantum_ic_hangout_video_vd_theme_24.xml b/res/drawable/quantum_ic_hangout_video_vd_theme_24.xml index 1ce818a97d699613179de58022c8dd8575bb75f3..03cb7c28c0debcdedeec9c35b0cab8928a03628e 100644 --- a/res/drawable/quantum_ic_hangout_video_vd_theme_24.xml +++ b/res/drawable/quantum_ic_hangout_video_vd_theme_24.xml @@ -19,8 +19,8 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?attr/colorControlNormal"> + android:tint="@color/accent"> diff --git a/res/drawable/quantum_ic_help_vd_theme_24.xml b/res/drawable/quantum_ic_help_vd_theme_24.xml index 385d7204c90251a4ea9a1e0bb1373bc32a36c6d8..b6734dfa8c7b4b7a4bd7726d40e6d4cf9668a856 100644 --- a/res/drawable/quantum_ic_help_vd_theme_24.xml +++ b/res/drawable/quantum_ic_help_vd_theme_24.xml @@ -19,8 +19,8 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?attr/colorControlNormal"> + android:tint="@color/accent"> diff --git a/res/drawable/quantum_ic_history_vd_theme_24.xml b/res/drawable/quantum_ic_history_vd_theme_24.xml index 51621fd908b5540253e3517eaa0b07d4206a950b..a4e9d517a8319854554c0f2fe4cd272c0368f0f2 100644 --- a/res/drawable/quantum_ic_history_vd_theme_24.xml +++ b/res/drawable/quantum_ic_history_vd_theme_24.xml @@ -19,8 +19,8 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?attr/colorControlNormal"> + android:tint="@color/accent"> diff --git a/res/drawable/quantum_ic_insert_comment_vd_theme_24.xml b/res/drawable/quantum_ic_insert_comment_vd_theme_24.xml index 247cb1bead9ab1415b5eba780aab39dff9280500..5b0c4bdda50306f30313bfc32edd7031149e088f 100644 --- a/res/drawable/quantum_ic_insert_comment_vd_theme_24.xml +++ b/res/drawable/quantum_ic_insert_comment_vd_theme_24.xml @@ -19,8 +19,8 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?attr/colorControlNormal"> + android:tint="@color/accent"> diff --git a/res/drawable/quantum_ic_label_vd_theme_24.xml b/res/drawable/quantum_ic_label_vd_theme_24.xml index 56308050578b25feb0c8223f972c2d18c611d5aa..529d2ae54e4609dedcca00efe287de06fad32326 100644 --- a/res/drawable/quantum_ic_label_vd_theme_24.xml +++ b/res/drawable/quantum_ic_label_vd_theme_24.xml @@ -19,8 +19,8 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?attr/colorControlNormal"> + android:tint="@color/accent"> diff --git a/res/drawable/quantum_ic_link_vd_theme_24.xml b/res/drawable/quantum_ic_link_vd_theme_24.xml index 67a167ebabc1195ec10a10e3d70ef07326cb05a0..39ae3a36b43c760785dbebacee392c1a86b88f4e 100644 --- a/res/drawable/quantum_ic_link_vd_theme_24.xml +++ b/res/drawable/quantum_ic_link_vd_theme_24.xml @@ -19,8 +19,8 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?attr/colorControlNormal"> + android:tint="@color/accent"> diff --git a/res/drawable/quantum_ic_menu_vd_theme_24.xml b/res/drawable/quantum_ic_menu_vd_theme_24.xml index 5b5d7b76eb541cf4a3bbcbe7fec616d8b32a2302..98621658c3b536873655a68a86082eb55a3cc51f 100644 --- a/res/drawable/quantum_ic_menu_vd_theme_24.xml +++ b/res/drawable/quantum_ic_menu_vd_theme_24.xml @@ -19,8 +19,8 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?attr/colorControlNormal"> + android:tint="@color/accent"> diff --git a/res/drawable/quantum_ic_message_vd_theme_24.xml b/res/drawable/quantum_ic_message_vd_theme_24.xml index a06a1da6ef8df5e97cb36b448792667924743527..7bd601ad02670caefa6663c0008876183fbf09c6 100644 --- a/res/drawable/quantum_ic_message_vd_theme_24.xml +++ b/res/drawable/quantum_ic_message_vd_theme_24.xml @@ -19,8 +19,8 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?attr/colorControlNormal"> + android:tint="@color/accent"> diff --git a/res/drawable/quantum_ic_mic_vd_theme_24.xml b/res/drawable/quantum_ic_mic_vd_theme_24.xml index ea4bef41bd5bb82fbd78d18fdaff8e868cd25af3..8f0e462d2bb961f600e1d11ef7e887de01018c29 100644 --- a/res/drawable/quantum_ic_mic_vd_theme_24.xml +++ b/res/drawable/quantum_ic_mic_vd_theme_24.xml @@ -19,8 +19,8 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?attr/colorControlNormal"> + android:tint="@color/accent"> diff --git a/res/drawable/quantum_ic_more_vert_vd_theme_24.xml b/res/drawable/quantum_ic_more_vert_vd_theme_24.xml index 442451fe1c135fa115883581d573662478735c5f..9111f6f05048f7a6b3629f2a7cdc597c2a686e56 100644 --- a/res/drawable/quantum_ic_more_vert_vd_theme_24.xml +++ b/res/drawable/quantum_ic_more_vert_vd_theme_24.xml @@ -19,8 +19,8 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?attr/colorControlNormal"> + android:tint="@color/accent"> diff --git a/res/drawable/quantum_ic_more_vert_white_vd_theme_24.xml b/res/drawable/quantum_ic_more_vert_white_vd_theme_24.xml new file mode 100644 index 0000000000000000000000000000000000000000..3ae916e5448ded20a3c8a2733f27bad7cc66ab13 --- /dev/null +++ b/res/drawable/quantum_ic_more_vert_white_vd_theme_24.xml @@ -0,0 +1,25 @@ + + + + + \ No newline at end of file diff --git a/res/drawable/quantum_ic_perm_phone_msg_vd_theme_24.xml b/res/drawable/quantum_ic_perm_phone_msg_vd_theme_24.xml index d7e0fb430c5549bee2bf79def6bb732c5c14561e..0026e9556ad7fc3378c3c9f6a466f23cc204c3c8 100644 --- a/res/drawable/quantum_ic_perm_phone_msg_vd_theme_24.xml +++ b/res/drawable/quantum_ic_perm_phone_msg_vd_theme_24.xml @@ -19,8 +19,8 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?attr/colorControlNormal"> + android:tint="@color/accent"> diff --git a/res/drawable/quantum_ic_person_add_vd_theme_24.xml b/res/drawable/quantum_ic_person_add_vd_theme_24.xml index 48a017f334cd68595a77dc9d85150f0e7cc7ad6e..c98d13339d0b0cd3918e72f906ddefef0454246b 100644 --- a/res/drawable/quantum_ic_person_add_vd_theme_24.xml +++ b/res/drawable/quantum_ic_person_add_vd_theme_24.xml @@ -19,8 +19,8 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?attr/colorControlNormal"> + android:tint="@color/accent"> diff --git a/res/drawable/quantum_ic_person_add_white_vd_theme_24.xml b/res/drawable/quantum_ic_person_add_white_vd_theme_24.xml new file mode 100644 index 0000000000000000000000000000000000000000..64a1ce95c08d5fa9fba1b118d8d29d37c5900a99 --- /dev/null +++ b/res/drawable/quantum_ic_person_add_white_vd_theme_24.xml @@ -0,0 +1,25 @@ + + + + + \ No newline at end of file diff --git a/res/drawable/quantum_ic_person_vd_theme_24.xml b/res/drawable/quantum_ic_person_vd_theme_24.xml index a5d9c8c06367b7ba6ddf8e0ea28d7ad6661742b0..aaee2f4af47496c35cc01525e31c2e424dd96f31 100644 --- a/res/drawable/quantum_ic_person_vd_theme_24.xml +++ b/res/drawable/quantum_ic_person_vd_theme_24.xml @@ -19,8 +19,8 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?attr/colorControlNormal"> + android:tint="@color/accent"> diff --git a/res/drawable/quantum_ic_phone_vd_theme_24.xml b/res/drawable/quantum_ic_phone_vd_theme_24.xml index 8d37e2bfed3a10602e3fa8fd3f9edb4b0cf9ac27..226f010ed48cb7b5349e8f6a071daec7c78bd14a 100644 --- a/res/drawable/quantum_ic_phone_vd_theme_24.xml +++ b/res/drawable/quantum_ic_phone_vd_theme_24.xml @@ -19,8 +19,8 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?attr/colorControlNormal"> + android:tint="@color/accent"> diff --git a/res/drawable/quantum_ic_place_vd_theme_24.xml b/res/drawable/quantum_ic_place_vd_theme_24.xml index 4276861aa7fc429345e309d0fc3780cd62cfdf7c..442fdae8d024ba90472baa4f23c0c32e653e2894 100644 --- a/res/drawable/quantum_ic_place_vd_theme_24.xml +++ b/res/drawable/quantum_ic_place_vd_theme_24.xml @@ -19,8 +19,8 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?attr/colorControlNormal"> + android:tint="@color/accent"> diff --git a/res/drawable/quantum_ic_public_vd_theme_24.xml b/res/drawable/quantum_ic_public_vd_theme_24.xml index 6dffe5ce2345f748cfdcdead8075989899230c57..9509debf97598ef39b051fb6c98233d5320be626 100644 --- a/res/drawable/quantum_ic_public_vd_theme_24.xml +++ b/res/drawable/quantum_ic_public_vd_theme_24.xml @@ -19,8 +19,8 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?attr/colorControlNormal"> + android:tint="@color/accent"> diff --git a/res/drawable/quantum_ic_search_vd_theme_24.xml b/res/drawable/quantum_ic_search_vd_theme_24.xml index 03dcbaa98b0f3021b3e14d4d28af245684c0a7a0..8b86c55d1ccf1d0feec286a0366461e247bc0473 100644 --- a/res/drawable/quantum_ic_search_vd_theme_24.xml +++ b/res/drawable/quantum_ic_search_vd_theme_24.xml @@ -19,8 +19,8 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?attr/colorControlNormal"> + android:tint="@color/accent"> diff --git a/res/drawable/quantum_ic_settings_vd_theme_24.xml b/res/drawable/quantum_ic_settings_vd_theme_24.xml index 1867c795536af25c8ca5a57b792c78a37708acf9..75a624fa13b0ca97a6794978ba518c514bc35a6f 100644 --- a/res/drawable/quantum_ic_settings_vd_theme_24.xml +++ b/res/drawable/quantum_ic_settings_vd_theme_24.xml @@ -19,8 +19,8 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?attr/colorControlNormal"> + android:tint="@color/accent"> diff --git a/res/drawable/quantum_ic_share_vd_theme_24.xml b/res/drawable/quantum_ic_share_vd_theme_24.xml index f024a22efda3b7c031004fb7927f26a4a805c364..14a315852b30fd9cf747ce00c3b451229f7a3626 100644 --- a/res/drawable/quantum_ic_share_vd_theme_24.xml +++ b/res/drawable/quantum_ic_share_vd_theme_24.xml @@ -19,8 +19,8 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?attr/colorControlNormal"> + android:tint="@color/accent"> diff --git a/res/drawable/quantum_ic_sim_card_vd_theme_24.xml b/res/drawable/quantum_ic_sim_card_vd_theme_24.xml index 2bc9387f6ab78464d58da97145010efd7f881263..72721c92c7d8db66886e1e9977beca04c3b3d607 100644 --- a/res/drawable/quantum_ic_sim_card_vd_theme_24.xml +++ b/res/drawable/quantum_ic_sim_card_vd_theme_24.xml @@ -19,8 +19,8 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?attr/colorControlNormal"> + android:tint="@color/accent"> diff --git a/res/drawable/quantum_ic_smartphone_vd_theme_24.xml b/res/drawable/quantum_ic_smartphone_vd_theme_24.xml index 9f987e75cb8f61670e3aa952d138aff32af0ae52..7fa28695aee2a07ebff262e85266ccf0d1bc66c7 100644 --- a/res/drawable/quantum_ic_smartphone_vd_theme_24.xml +++ b/res/drawable/quantum_ic_smartphone_vd_theme_24.xml @@ -19,8 +19,8 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?attr/colorControlNormal"> + android:tint="@color/accent"> diff --git a/res/drawable/quantum_ic_star_border_vd_theme_24.xml b/res/drawable/quantum_ic_star_border_vd_theme_24.xml index e266072cde683054abef6790bcf30afe2bdb2300..42f1d22f8c4ff5f0079a9314824b5ef159c882c7 100644 --- a/res/drawable/quantum_ic_star_border_vd_theme_24.xml +++ b/res/drawable/quantum_ic_star_border_vd_theme_24.xml @@ -19,8 +19,8 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?attr/colorControlNormal"> + android:tint="@color/accent"> diff --git a/res/drawable/quantum_ic_star_border_white_vd_theme_24.xml b/res/drawable/quantum_ic_star_border_white_vd_theme_24.xml new file mode 100644 index 0000000000000000000000000000000000000000..387287c9708f2fcabd350d10a472d10f6499e77a --- /dev/null +++ b/res/drawable/quantum_ic_star_border_white_vd_theme_24.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/res/drawable/quantum_ic_star_vd_theme_24.xml b/res/drawable/quantum_ic_star_vd_theme_24.xml index f5a93c6f039c632c5eb4b26edd12bd07421c6bee..c0ce965864684897ae085cdbb804ce902767f7c8 100644 --- a/res/drawable/quantum_ic_star_vd_theme_24.xml +++ b/res/drawable/quantum_ic_star_vd_theme_24.xml @@ -19,8 +19,8 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?attr/colorControlNormal"> + android:tint="@color/accent"> diff --git a/res/drawable/quantum_ic_star_white_vd_theme_24.xml b/res/drawable/quantum_ic_star_white_vd_theme_24.xml new file mode 100644 index 0000000000000000000000000000000000000000..7cb3e408bcd0f36bb74fd637c46db685ff4cd700 --- /dev/null +++ b/res/drawable/quantum_ic_star_white_vd_theme_24.xml @@ -0,0 +1,25 @@ + + + + + \ No newline at end of file diff --git a/res/drawable/quantum_ic_videocam_vd_theme_24.xml b/res/drawable/quantum_ic_videocam_vd_theme_24.xml index 87408576b698c0152179bdd99ec2ba8025481c11..9aff1b42165079f6a6181ac5d5082d13dbd8c306 100644 --- a/res/drawable/quantum_ic_videocam_vd_theme_24.xml +++ b/res/drawable/quantum_ic_videocam_vd_theme_24.xml @@ -19,8 +19,8 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?attr/colorControlNormal"> + android:tint="@color/accent"> diff --git a/res/drawable/quantum_launchscreen_contacts.xml b/res/drawable/quantum_launchscreen_contacts.xml index 276b2da337056794170f795d3b9aba22716cd5c9..2785e6536ec09a9d13fd18b5152d28207cf76319 100755 --- a/res/drawable/quantum_launchscreen_contacts.xml +++ b/res/drawable/quantum_launchscreen_contacts.xml @@ -16,7 +16,7 @@ - + diff --git a/res/layout/custom_contact_list_filter_group.xml b/res/layout/custom_contact_list_filter_group.xml index 036d650ff0f6676cf02dee326db7e3198f13215b..7fbca4ca02f48eb784a5b2725349e106271b7ada 100644 --- a/res/layout/custom_contact_list_filter_group.xml +++ b/res/layout/custom_contact_list_filter_group.xml @@ -77,7 +77,7 @@ android:gravity="center_vertical" android:orientation="vertical" android:duplicateParentState="true" - android:buttonTint="@color/color_default_blue1" + android:buttonTint="@color/accent" /> diff --git a/res/layout/date_picker.xml b/res/layout/date_picker.xml index 9bfb8de996e8cc3a969c7e39fe8f9b5f56dfbe5c..3ff874f0c8db05106ea474a90d22c90a56a9d82a 100644 --- a/res/layout/date_picker.xml +++ b/res/layout/date_picker.xml @@ -37,7 +37,7 @@ android:layout_gravity="center_horizontal" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:buttonTint="@color/color_default_blue1" + android:buttonTint="@color/accent" /> diff --git a/res/layout/default_account_checkbox.xml b/res/layout/default_account_checkbox.xml index 635f90e504e4c9277d6549bc6b61124a04bf4a38..3dae2a80992c8e1825068465ec445327b3d62a20 100644 --- a/res/layout/default_account_checkbox.xml +++ b/res/layout/default_account_checkbox.xml @@ -32,6 +32,6 @@ android:textAlignment="viewStart" android:text="@string/set_default_account" android:textColor="@color/dialtacts_secondary_text_color" - android:buttonTint="@color/color_default_blue1" + android:buttonTint="@color/accent" /> \ No newline at end of file diff --git a/res/layout/dialog_call_subject.xml b/res/layout/dialog_call_subject.xml index 61513ebe913e7fdd15486a919833bdda3de4092e..977345f86a9e3af34654fdac2b85887a6bb3f047 100644 --- a/res/layout/dialog_call_subject.xml +++ b/res/layout/dialog_call_subject.xml @@ -128,7 +128,7 @@ android:layout_width="25dp" android:layout_height="25dp" android:src="@drawable/quantum_ic_history_vd_theme_24" - android:tint="@color/call_subject_history_icon" + android:tint="@color/accent" android:layout_alignParentStart="true" android:layout_centerVertical="true" /> diff --git a/res/layout/dialog_title.xml b/res/layout/dialog_title.xml index 45f5f736769e60c7b92c7cc540fb9da390f1d4a1..e8e9ab2174f325fbbc739c5606eea0a68c59b753 100644 --- a/res/layout/dialog_title.xml +++ b/res/layout/dialog_title.xml @@ -18,10 +18,11 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:paddingTop="18dp" + android:paddingTop="4dp" android:paddingStart="24dp" android:paddingEnd="24dp" - android:textSize="20sp" + android:textSize="25sp" + android:textStyle="bold" android:textColor="@color/contacts_text_color" android:textAlignment="viewStart" android:fontFamily="sans-serif-medium" diff --git a/res/layout/drawer_item.xml b/res/layout/drawer_item.xml index 1bb6c7faeec9f91f74a8b6b04e5214e459d5fcb5..f7621a35d30ffa07eb7c815f4e4f9d8b297888a5 100644 --- a/res/layout/drawer_item.xml +++ b/res/layout/drawer_item.xml @@ -20,7 +20,6 @@ style="@style/DrawerItemStyle"> diff --git a/res/layout/edit_delete_button.xml b/res/layout/edit_delete_button.xml index 2eea95057b6c4abc4457ed681fb3ef1fe866e749..77769568747409c5af5306504212d00bfdbb4ba1 100644 --- a/res/layout/edit_delete_button.xml +++ b/res/layout/edit_delete_button.xml @@ -30,7 +30,7 @@ android:duplicateParentState="true" android:background="?android:attr/selectableItemBackground" android:src="@drawable/quantum_ic_close_vd_theme_24" - android:tint="@color/quantum_black_hint_text" + android:tint="@color/accent" android:paddingLeft="@dimen/editor_round_button_padding_left" android:paddingRight="@dimen/editor_round_button_padding_right" android:paddingStart="@dimen/editor_round_button_padding_left" diff --git a/res/layout/editor_account_header.xml b/res/layout/editor_account_header.xml index 9a4ed803b4371690f1b2ef59f4cbb2d95f4de3cc..5697ac05cbf376934752b55240e4b195ee0d2061 100644 --- a/res/layout/editor_account_header.xml +++ b/res/layout/editor_account_header.xml @@ -67,7 +67,7 @@ + android:tint="@color/accent"/> \ No newline at end of file diff --git a/res/layout/fragment_sim_import.xml b/res/layout/fragment_sim_import.xml index bea50d12dd76ff2705dca78015cb890da2aaa63a..f06dfef900c7abafbc89d39ff6999766791ab196 100644 --- a/res/layout/fragment_sim_import.xml +++ b/res/layout/fragment_sim_import.xml @@ -95,7 +95,7 @@ android:minWidth="0dp" android:scaleType="center" android:src="@drawable/quantum_ic_arrow_drop_down_vd_theme_24" - android:tint="?android:textColorSecondary" + android:tint="@color/accent" android:visibility="gone"/> diff --git a/res/layout/name_edit_expansion_view.xml b/res/layout/name_edit_expansion_view.xml index 066850f9aacd7e75da190d8f7b08d86504c46242..01064495b174d5e4f30c078709812cd6576d6b06 100644 --- a/res/layout/name_edit_expansion_view.xml +++ b/res/layout/name_edit_expansion_view.xml @@ -31,7 +31,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:duplicateParentState="true" - android:tint="@color/quantum_black_secondary_text" + android:tint="@color/accent" android:background="?android:attr/selectableItemBackground" android:paddingLeft="@dimen/editor_round_button_padding_left" android:paddingRight="@dimen/editor_round_button_padding_right" diff --git a/res/layout/quickcontact_collapsed_suggestion_card.xml b/res/layout/quickcontact_collapsed_suggestion_card.xml index ac2ec499c20706ceb4e0ae84ec3379ee1880d466..a3a47a6d81b7a005692f7a90852d35e68963f1e2 100644 --- a/res/layout/quickcontact_collapsed_suggestion_card.xml +++ b/res/layout/quickcontact_collapsed_suggestion_card.xml @@ -30,7 +30,7 @@ + android:background="@color/color_default_background"> @@ -51,7 +51,7 @@ android:paddingEnd="16dp" android:paddingStart="16dp" android:text="@string/menu_add_contacts" - android:textColor="@color/primary_color" + android:textColor="@color/secondary_text_color" android:textStyle="bold" android:visibility="gone"/> diff --git a/res/layout/sim_import_list_item_disabled.xml b/res/layout/sim_import_list_item_disabled.xml index 4647049f7263e40b035079c51f39cd9070c70a2b..455380541601d452fbba70ef0ed495e1b1163969 100644 --- a/res/layout/sim_import_list_item_disabled.xml +++ b/res/layout/sim_import_list_item_disabled.xml @@ -11,4 +11,4 @@ android:paddingEnd="@dimen/activity_horizontal_margin" android:paddingStart="@dimen/activity_horizontal_margin" android:textAppearance="?android:textAppearanceListItem" - android:textColor="@color/contact_list_name_text_color"/> + android:textColor="@color/color_default_primary_text"/> diff --git a/res/layout/structured_name_editor_view.xml b/res/layout/structured_name_editor_view.xml index 201fe094ca1ce25fff8a6ba0aad6eb49c518d2d9..60f42d1f96f0733d771635d3667a09b2364d99e6 100644 --- a/res/layout/structured_name_editor_view.xml +++ b/res/layout/structured_name_editor_view.xml @@ -32,6 +32,7 @@ diff --git a/res/menu/edit_contact.xml b/res/menu/edit_contact.xml index c049941d03399848da94007ad5fa730ba3cf2ead..0f5bb6944075dce5d6dcda09223adbf3f357d0bf 100644 --- a/res/menu/edit_contact.xml +++ b/res/menu/edit_contact.xml @@ -17,8 +17,8 @@ + contacts:showAsAction="ifRoom" + app:iconTint="@color/accent"/> + contacts:showAsAction="ifRoom" + app:iconTint="@color/accent"/> + contacts:showAsAction="ifRoom" + app:iconTint="@color/accent"/> diff --git a/res/values-night-v27/styles.xml b/res/values-night-v27/styles.xml new file mode 100644 index 0000000000000000000000000000000000000000..c8901e4e2bd3634e6e712abd4bc7b43992ddf14e --- /dev/null +++ b/res/values-night-v27/styles.xml @@ -0,0 +1,23 @@ + + + + + + + + + + \ No newline at end of file diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml deleted file mode 100644 index e88ed65b735b8264018d4e9c42451af999fb7d1f..0000000000000000000000000000000000000000 --- a/res/values-night/colors.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - #1f1f1f - - - #dadada - diff --git a/res/values-night/styles.xml b/res/values-night/styles.xml new file mode 100644 index 0000000000000000000000000000000000000000..e9adaebdffafdff69b418c85df3b6ce11d8fd222 --- /dev/null +++ b/res/values-night/styles.xml @@ -0,0 +1,4 @@ + + + - - + + diff --git a/res/values/colors.xml b/res/values/colors.xml index 88b4be8f12d2975a2ec58c7ae7beaca6e9bc9b3f..774ea6bf1082587be20bd51e0b6d47c689602ffd 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -14,43 +14,44 @@ limitations under the License. --> - #F5F5F5 + @color/primary_color_dark - #dd000000 + @color/color_default_primary_text - #89000000 + @color/color_default_secondary_text - #61000000 + @color/color_default_secondary_text - #737373 - #202020 + @color/color_default_secondary_text + @color/color_default_primary_text - #2a56c6 + @color/primary_color_dark - #0f000000 + @color/selection_color @color/accent - #ffffff + @color/primary_text_color - @color/primary_color + @color/primary_color_dark - #f6f6f6 + @color/selection_color - #bababa + @color/primary_color_dark - @lineageos.platform:color/color_default_primary - @lineageos.platform:color/color_default_primary_dark - - #546E7A - #607D8B + @lineageos.platform:color/color_default_primary_dark + @lineageos.platform:color/color_default_primary + @lineageos.platform:color/color_default_selector + @color/primary_color_dark + @color/primary_color @lineageos.platform:color/color_default_accent @lineageos.platform:color/color_default_primary_text @lineageos.platform:color/color_default_secondary_text @lineageos.platform:color/color_default_background + @lineageos.platform:color/color_default_foreground @lineageos.platform:color/color_default_blue1 @lineageos.platform:color/color_default_gray2 @lineageos.platform:color/color_default_gray1 @@ -62,16 +63,16 @@ @color/contacts_accent_color - #e0e0e0 + @lineageos.platform:color/color_default_divider - @android:color/black + @color/primary_text_color - #ffffff + @color/color_default_background - #f4f4f4 + @color/divider_line_color_light #2aad6f #ff2e58 @@ -79,23 +80,20 @@ @color/background_primary - - #7f7f7f - - #40000000 + @color/secondary_text_color - #40000000 + @color/secondary_text_color - #26000000 + @color/secondary_text_color - #4D000000 + @color/secondary_text_color - #efefef + @color/color_default_background #0f9d58 @@ -107,27 +105,27 @@ #a0ffffff - #363636 + @color/color_default_primary_text - @color/dialtacts_secondary_text_color + @color/color_default_secondary_text @color/color_default_gray1 - #363636 + @color/primary_color - #2a56c6 + @color/accent - #DDDDDD + @color/color_default_secondary_text - #333333 + @color/primary_text_color - #737373 + @color/secondary_text_color #7f000000 @@ -190,29 +188,29 @@ #ffffff - #ffffff + @color/accent @color/actionbar_background_color - #ffffff + @color/color_default_primary_text #8C000000 - #DF000000 + @color/color_default_primary_text #777777 - #000000 + @color/color_default_primary_text - #ffffff + @color/primary_color_dark - #66000000 + @color/secondary_text_color - @color/dialtacts_theme_color + @color/accent @lineageos.platform:color/color_default_background @@ -223,46 +221,46 @@ #d1041c - #000000 + @color/color_default_background - #d8d8d8 + @color/divider_line_color_light #00c853 - #ffffff - @color/searchbox_hint_text_color + @color/color_default_background + @color/primary_color_dark - #ffffff + @color/color_default_primary_text - #333333 + @color/primary_color_dark @color/actionbar_text_color_black - #dbdbdb + @color/divider_line_color_light #f50057 - #333333 + @color/primary_text_color - #7f7f7f + @color/secondary_text_color - #e0e0e0 + @color/color_default_background - #E5E5E5 + @color/divider_line_color_light - @lineageos.platform:color/color_default_background + @color/primary_color_dark - #E8E8E8 + @color/selection_color #1A000000 diff --git a/res/values/styles.xml b/res/values/styles.xml index 4f7511f14a474b05d80c6742713e061103bbd871..8b1167700d2769590fd3e1677c934245b45ef981 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -1,5 +1,4 @@ - - - + - - + @@ -107,7 +117,7 @@ ?android:attr/listChoiceBackgroundIndicator - + - - - @@ -275,29 +288,67 @@ @color/accent - + - + + + - @@ -454,12 +510,12 @@ background and text color. See also android:style/Widget.Holo.TextView.ListSepar - @@ -533,6 +591,11 @@ background and text color. See also android:style/Widget.Holo.TextView.ListSepar and exit animations --> true @color/contextual_selection_bar_status_bar_color + @color/accent + @color/primary_color + @color/primary_color_dark + @color/primary_text_color + @color/secondary_text_color @@ -613,4 +676,27 @@ background and text color. See also android:style/Widget.Holo.TextView.ListSepar @color/quantum_black_secondary_text match_parent + + + + + + + + + + diff --git a/src/com/android/contacts/ContactsApplication.java b/src/com/android/contacts/ContactsApplication.java index fcd282f7cd17a19f85b1e05a6babb8cedc98e71e..18447696c4745906569b638613e9abba6a4446c5 100644 --- a/src/com/android/contacts/ContactsApplication.java +++ b/src/com/android/contacts/ContactsApplication.java @@ -39,8 +39,6 @@ import com.android.contactsbind.analytics.AnalyticsUtil; import com.google.common.annotations.VisibleForTesting; -import androidx.appcompat.app.AppCompatDelegate; - public class ContactsApplication extends Application { private static final boolean ENABLE_LOADER_LOG = false; // Don't submit with true private static final boolean ENABLE_FRAGMENT_LOG = false; // Don't submit with true @@ -102,7 +100,6 @@ public class ContactsApplication extends Application { @Override public void onCreate() { super.onCreate(); - AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO); if (Log.isLoggable(Constants.PERFORMANCE_TAG, Log.DEBUG)) { Log.d(Constants.PERFORMANCE_TAG, "ContactsApplication.onCreate start"); diff --git a/src/com/android/contacts/NonPhoneActivity.java b/src/com/android/contacts/NonPhoneActivity.java index ba56d70908fad59388edbd76e66aa9d8fb33a72a..6bf79300925665eeda784d4904a30f6a8c2eb4c4 100644 --- a/src/com/android/contacts/NonPhoneActivity.java +++ b/src/com/android/contacts/NonPhoneActivity.java @@ -73,7 +73,7 @@ public class NonPhoneActivity extends ContactsActivity { @Override public Dialog onCreateDialog(Bundle savedInstanceState) { final AlertDialog alertDialog; - alertDialog = new AlertDialog.Builder(getActivity(), R.style.NonPhoneDialogTheme) + alertDialog = new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme) .create(); alertDialog.setTitle(R.string.non_phone_caption); alertDialog.setMessage(getArgumentPhoneNumber()); diff --git a/src/com/android/contacts/activities/ActionBarAdapter.java b/src/com/android/contacts/activities/ActionBarAdapter.java index 3b862e4b8e3231198cce190a3925c3558fdc8624..fce6659e1859708f3a2a2d106e8bb5bee2310f86 100644 --- a/src/com/android/contacts/activities/ActionBarAdapter.java +++ b/src/com/android/contacts/activities/ActionBarAdapter.java @@ -466,7 +466,7 @@ public class ActionBarAdapter implements OnCloseListener { R.color.actionbar_color_grey_solid); } else { iconColor = mActivity.getResources().getColor( - R.color.color_default_blue1); + R.color.accent); } overflow.setImageTintList(ColorStateList.valueOf(iconColor)); } diff --git a/src/com/android/contacts/activities/ContactEditorAccountsChangedActivity.java b/src/com/android/contacts/activities/ContactEditorAccountsChangedActivity.java index dea134b5f524ee26c4f1c52b569fed6f56872a49..f0117eeabe480111d277a113c128eaa8cbb5fd01 100644 --- a/src/com/android/contacts/activities/ContactEditorAccountsChangedActivity.java +++ b/src/com/android/contacts/activities/ContactEditorAccountsChangedActivity.java @@ -203,7 +203,7 @@ public class ContactEditorAccountsChangedActivity extends Activity if (mDialog != null && mDialog.isShowing()) { mDialog.dismiss(); } - mDialog = new AlertDialog.Builder(this) + mDialog = new AlertDialog.Builder(this, R.style.ContactsAlertDialogTheme) .setView(view) .setOnCancelListener(new DialogInterface.OnCancelListener() { @Override diff --git a/src/com/android/contacts/activities/ContactEditorActivity.java b/src/com/android/contacts/activities/ContactEditorActivity.java index a2a449f6c902dd5c0d98f1665940f8ab56d6243c..f07925217995091462aab54c7e1755e5326520ca 100644 --- a/src/com/android/contacts/activities/ContactEditorActivity.java +++ b/src/com/android/contacts/activities/ContactEditorActivity.java @@ -386,14 +386,6 @@ public class ContactEditorActivity extends AppCompatContactsActivity implements if (Intent.ACTION_INSERT.equals(action)) { DynamicShortcuts.reportShortcutUsed(this, DynamicShortcuts.SHORTCUT_ADD_CONTACT); } - // this.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); - if(Build.VERSION.SDK_INT >= 27) { - this.getWindow().getDecorView().setSystemUiVisibility(FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS | - View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR | - View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); - } - - } @Override diff --git a/src/com/android/contacts/activities/ContactSelectionActivity.java b/src/com/android/contacts/activities/ContactSelectionActivity.java index 7b66ee040ee415bd2af5ab4b625959b39204d589..a9c56afe6a3db218ba5dd530e9d1987b7b439166 100644 --- a/src/com/android/contacts/activities/ContactSelectionActivity.java +++ b/src/com/android/contacts/activities/ContactSelectionActivity.java @@ -135,15 +135,6 @@ public class ContactSelectionActivity extends AppCompatContactsActivity implemen prepareSearchViewAndActionBar(savedState); configureActivityTitle(); - - // this.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); - - if(Build.VERSION.SDK_INT >= 27) { - this.getWindow().getDecorView().setSystemUiVisibility(FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS | - View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR | - View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); - } - } public boolean isSelectionMode() { @@ -701,7 +692,7 @@ public class ContactSelectionActivity extends AppCompatContactsActivity implemen final Drawable searchIcon = searchItem.getIcon(); if (searchIcon != null) { searchIcon.mutate().setColorFilter(ContextCompat.getColor(this, - R.color.color_default_blue1), PorterDuff.Mode.SRC_ATOP); + R.color.accent), PorterDuff.Mode.SRC_ATOP); } return true; } diff --git a/src/com/android/contacts/activities/LicenseActivity.java b/src/com/android/contacts/activities/LicenseActivity.java index 255420e3aef92c175d0ac0219c6612b93bc7258c..9d21a05dde35ce6512d28a6abd42244322d41df1 100644 --- a/src/com/android/contacts/activities/LicenseActivity.java +++ b/src/com/android/contacts/activities/LicenseActivity.java @@ -15,6 +15,7 @@ */ package com.android.contacts.activities; +import android.graphics.drawable.ColorDrawable; import android.os.Build; import android.os.Bundle; import androidx.appcompat.app.ActionBar; @@ -22,6 +23,10 @@ import androidx.appcompat.app.AppCompatActivity; import android.view.MenuItem; import android.view.View; import android.webkit.WebView; +import android.content.res.Configuration; + +import androidx.webkit.WebViewFeature; +import androidx.webkit.WebSettingsCompat; import com.android.contacts.R; @@ -42,16 +47,10 @@ public class LicenseActivity extends AppCompatActivity { mWebView.loadUrl(LICENSE_FILE); final ActionBar actionBar = getSupportActionBar(); if (actionBar != null) { + actionBar.setBackgroundDrawable(new ColorDrawable(getColor(R.color.primary_color_dark))); actionBar.setDisplayOptions(ActionBar.DISPLAY_HOME_AS_UP, ActionBar.DISPLAY_HOME_AS_UP); } - //this.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); - - if(Build.VERSION.SDK_INT >= 27) { - this.getWindow().getDecorView().setSystemUiVisibility(FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS | - View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR | - View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); - } - + handleDayNightMode(mWebView); } @Override @@ -68,4 +67,23 @@ public class LicenseActivity extends AppCompatActivity { } return super.onOptionsItemSelected(item); } + + private void handleDayNightMode(WebView webView) { + if (WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK)) { + if (isInDarkMode()) { + WebSettingsCompat.setForceDark(webView.getSettings(), WebSettingsCompat.FORCE_DARK_ON); + } else { + WebSettingsCompat.setForceDark(webView.getSettings(), WebSettingsCompat.FORCE_DARK_AUTO); + } + } + } + + + private boolean isInDarkMode() { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.FROYO) { + int nightModeFlags = getApplication().getApplicationContext().getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK; + return nightModeFlags == Configuration.UI_MODE_NIGHT_YES; + } + return false; + } } diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java index 6f59389e4104f455913e7672f4bf38505d15e8dc..6f4078b9c5b2f225e4a4c6056181ec6153f1d168 100644 --- a/src/com/android/contacts/activities/PeopleActivity.java +++ b/src/com/android/contacts/activities/PeopleActivity.java @@ -196,7 +196,6 @@ public class PeopleActivity extends AppCompatContactsActivity implements private ContactsActionBarDrawerToggle mToggle; private Toolbar mToolbar; - public static int color_default_blue1; public static int color_default_primary_text; @@ -393,7 +392,7 @@ public class PeopleActivity extends AppCompatContactsActivity implements mToggle = new ContactsActionBarDrawerToggle(this, mDrawerLayout, mToolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close); mDrawerLayout.setDrawerListener(mToggle); - mToggle.getDrawerArrowDrawable().setColor(getResources().getColor(R.color.color_default_blue1)); + mToggle.getDrawerArrowDrawable().setColor(getResources().getColor(R.color.accent)); // Set fallback handler for when drawer is disabled. mToggle.setToolbarNavigationClickListener(new View.OnClickListener() { @Override @@ -653,7 +652,7 @@ public class PeopleActivity extends AppCompatContactsActivity implements LocalBroadcastManager.getInstance(this).registerReceiver(mSaveServiceListener, new IntentFilter(ContactSaveService.BROADCAST_GROUP_DELETED)); - mToggle.getDrawerArrowDrawable().setColor(getResources().getColor(R.color.color_default_blue1)); + mToggle.getDrawerArrowDrawable().setColor(getResources().getColor(R.color.accent)); } public void updateStatusBarBackground() { @@ -1322,20 +1321,9 @@ public class PeopleActivity extends AppCompatContactsActivity implements * */ private int fetchAccentColor() { - - // this.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); - - if(Build.VERSION.SDK_INT >= 27) { - this.getWindow().getDecorView().setSystemUiVisibility(FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS | - View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR | - View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); - } - int color=getResources().getColor(R.color.accent); color_default_primary_text=getResources().getColor(R.color.color_default_primary_text); - color_default_blue1=getResources().getColor(R.color.color_default_blue1); - //getSupportActionBar().setBackgroundDrawable(new ColorDrawable(color_accent)); getSupportActionBar().getThemedContext(); mToolbar.setTitleTextColor(color_default_primary_text); diff --git a/src/com/android/contacts/activities/ShowOrCreateActivity.java b/src/com/android/contacts/activities/ShowOrCreateActivity.java index 8c943640e0ba62b5a2ac0782acfd18edb2764c24..634dd589c60a60151091f09b8794aff5354a0e47 100755 --- a/src/com/android/contacts/activities/ShowOrCreateActivity.java +++ b/src/com/android/contacts/activities/ShowOrCreateActivity.java @@ -219,7 +219,7 @@ public final class ShowOrCreateActivity extends ContactsActivity final CharSequence message = getResources().getString( R.string.add_contact_dlg_message_fmt, mCreateDescrip); - return new AlertDialog.Builder(this) + return new AlertDialog.Builder(this, R.style.ContactsAlertDialogTheme) .setMessage(message) .setPositiveButton(android.R.string.ok, new IntentClickListener(this, createIntent)) diff --git a/src/com/android/contacts/detail/ContactDisplayUtils.java b/src/com/android/contacts/detail/ContactDisplayUtils.java index ef9124aed2bee239b7c43fb5d4d724d0c4fc3507..edf01d4ce8c88a67a21c04b672d4ced55ca34407 100644 --- a/src/com/android/contacts/detail/ContactDisplayUtils.java +++ b/src/com/android/contacts/detail/ContactDisplayUtils.java @@ -160,8 +160,8 @@ public class ContactDisplayUtils { if (!isDirectoryEntry && !isUserProfile) { starredMenuItem.setVisible(true); final int resId = isStarred - ? R.drawable.quantum_ic_star_vd_theme_24 - : R.drawable.quantum_ic_star_border_vd_theme_24; + ? R.drawable.quantum_ic_star_white_vd_theme_24 + : R.drawable.quantum_ic_star_border_white_vd_theme_24; starredMenuItem.setIcon(resId); starredMenuItem.setChecked(isStarred); starredMenuItem.setTitle(isStarred ? R.string.menu_removeStar : R.string.menu_addStar); diff --git a/src/com/android/contacts/dialog/ClearFrequentsDialog.java b/src/com/android/contacts/dialog/ClearFrequentsDialog.java index 7591de3ff7811cdb84bb0b0dd2793b0284fc4950..bf012e067f0d352082f1c36ec19372bbb738c648 100644 --- a/src/com/android/contacts/dialog/ClearFrequentsDialog.java +++ b/src/com/android/contacts/dialog/ClearFrequentsDialog.java @@ -70,7 +70,7 @@ public class ClearFrequentsDialog extends DialogFragment { task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); } }; - return new AlertDialog.Builder(getActivity()) + return new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme) .setTitle(R.string.clearFrequentsConfirmation_title) .setMessage(R.string.clearFrequentsConfirmation) .setNegativeButton(android.R.string.cancel, null) diff --git a/src/com/android/contacts/drawer/DrawerAdapter.java b/src/com/android/contacts/drawer/DrawerAdapter.java index ad0d551f863bc477be5668760fa1e6a612615855..1806ce49cc143586ad7bc7051bb32852f61db903 100644 --- a/src/com/android/contacts/drawer/DrawerAdapter.java +++ b/src/com/android/contacts/drawer/DrawerAdapter.java @@ -17,6 +17,7 @@ package com.android.contacts.drawer; import android.app.Activity; +import android.graphics.Color; import android.graphics.PorterDuff; import android.net.Uri; import android.provider.ContactsContract.DisplayNameSources; @@ -135,7 +136,7 @@ public class DrawerAdapter extends BaseAdapter { // Misc Items mMiscItems.add(new DividerItem()); mMiscItems.add(new MiscItem(R.id.nav_settings, R.string.menu_settings, - lineageos.platform.R.drawable.ic_settings)); + R.drawable.quantum_ic_settings_vd_theme_24)); if (HelpUtils.isHelpAndFeedbackAvailable()) { mMiscItems.add(new MiscItem(R.id.nav_help, R.string.menu_help, R.drawable.quantum_ic_help_vd_theme_24)); @@ -388,7 +389,9 @@ public class DrawerAdapter extends BaseAdapter { final ImageView iconView = (ImageView) result.findViewById(R.id.icon); iconView.setImageResource(item.icon); // iconView.setColorFilter(mActivity.getResources().getColor(R.color.color_default_light_grey)); - iconView.setColorFilter(mActivity.getResources().getColor(R.color.color_default_light_grey), android.graphics.PorterDuff.Mode.MULTIPLY); + if (item.viewType != VIEW_TYPE_ACCOUNT_ENTRY) { + iconView.setColorFilter(mActivity.getResources().getColor(R.color.accent, null), PorterDuff.Mode.SRC_ATOP); + } result.setId(item.id); updateSelectedStatus(textView, iconView, false); diff --git a/src/com/android/contacts/editor/CancelEditDialogFragment.java b/src/com/android/contacts/editor/CancelEditDialogFragment.java index 7f398577cb3c1b8d8580bbe2f1655754d84b8394..98522671797aeeaf8a462d273a645d7b7e20569f 100644 --- a/src/com/android/contacts/editor/CancelEditDialogFragment.java +++ b/src/com/android/contacts/editor/CancelEditDialogFragment.java @@ -43,7 +43,7 @@ public class CancelEditDialogFragment extends DialogFragment { @Override public Dialog onCreateDialog(Bundle savedInstanceState) { - return new AlertDialog.Builder(getActivity()) + return new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme) .setIconAttribute(android.R.attr.alertDialogIcon) .setMessage(R.string.cancel_confirmation_dialog_message) .setPositiveButton(R.string.cancel_confirmation_dialog_cancel_editing_button, diff --git a/src/com/android/contacts/editor/JoinContactConfirmationDialogFragment.java b/src/com/android/contacts/editor/JoinContactConfirmationDialogFragment.java index d238c384c55ac05b5cbf1a6e9abc0189e62f5863..3a7bc8907bc962a3f9f88ffaa481e97ca893f170 100644 --- a/src/com/android/contacts/editor/JoinContactConfirmationDialogFragment.java +++ b/src/com/android/contacts/editor/JoinContactConfirmationDialogFragment.java @@ -69,7 +69,7 @@ public class JoinContactConfirmationDialogFragment extends DialogFragment { @Override public Dialog onCreateDialog(Bundle savedInstanceState) { - final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); + final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme); builder.setMessage(R.string.joinConfirmation); builder.setPositiveButton(R.string.joinConfirmation_positive_button, new DialogInterface.OnClickListener() { diff --git a/src/com/android/contacts/editor/LabeledEditorView.java b/src/com/android/contacts/editor/LabeledEditorView.java index df4c5f9924fec114192fbbfdf8125d65a7440211..00e5187dc1a37788dd3afd4fd9199946eba2c7aa 100644 --- a/src/com/android/contacts/editor/LabeledEditorView.java +++ b/src/com/android/contacts/editor/LabeledEditorView.java @@ -439,7 +439,7 @@ public abstract class LabeledEditorView extends LinearLayout implements Editor, * no empty text is allowed in any custom label. */ private Dialog createCustomDialog() { - final AlertDialog.Builder builder = new AlertDialog.Builder(getContext()); + final AlertDialog.Builder builder = new AlertDialog.Builder(getContext(), R.style.ContactsAlertDialogTheme); final LayoutInflater layoutInflater = LayoutInflater.from(builder.getContext()); builder.setTitle(R.string.customLabelPickerTitle); diff --git a/src/com/android/contacts/editor/PhotoSourceDialogFragment.java b/src/com/android/contacts/editor/PhotoSourceDialogFragment.java index 4ca4d30d03d1848bed56e96f14ec8e45f1fd8fab..c2a6b603ee00914b2a54b7f93ff7b9cf94109b93 100644 --- a/src/com/android/contacts/editor/PhotoSourceDialogFragment.java +++ b/src/com/android/contacts/editor/PhotoSourceDialogFragment.java @@ -72,30 +72,27 @@ public class PhotoSourceDialogFragment extends DialogFragment { for (int i = 0; i < items.length; i++) { items[i] = choices.get(i).toString(); } - final OnClickListener clickListener = new OnClickListener() { - @Override - public void onClick(DialogInterface dialogInterface, int which) { - final Listener listener = (Listener) getActivity(); - final ChoiceListItem choice = choices.get(which); - switch (choice.getId()) { - case ChoiceListItem.ID_REMOVE: - listener.onRemovePictureChosen(); - break; - case ChoiceListItem.ID_TAKE_PHOTO: - listener.onTakePhotoChosen(); - break; - case ChoiceListItem.ID_PICK_PHOTO: - listener.onPickFromGalleryChosen(); - break; - } - dismiss(); + final OnClickListener clickListener = (dialogInterface, which) -> { + final Listener listener = (Listener) getActivity(); + final ChoiceListItem choice = choices.get(which); + switch (choice.getId()) { + case ChoiceListItem.ID_REMOVE: + listener.onRemovePictureChosen(); + break; + case ChoiceListItem.ID_TAKE_PHOTO: + listener.onTakePhotoChosen(); + break; + case ChoiceListItem.ID_PICK_PHOTO: + listener.onPickFromGalleryChosen(); + break; } + dismiss(); }; // Build the AlertDialog final TextView title = (TextView) View.inflate(getActivity(), R.layout.dialog_title, null); title.setText(R.string.menu_change_photo); - final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); + final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme); builder.setCustomTitle(title); builder.setItems(items, clickListener); builder.setNegativeButton(android.R.string.cancel, /* listener =*/ null); diff --git a/src/com/android/contacts/editor/PickRawContactDialogFragment.java b/src/com/android/contacts/editor/PickRawContactDialogFragment.java index 5a9c9fd07f69659d52c874794c3771c2d3876aa1..2efd6fbc942bc79d97e4ae00711e977a8c53fe0c 100644 --- a/src/com/android/contacts/editor/PickRawContactDialogFragment.java +++ b/src/com/android/contacts/editor/PickRawContactDialogFragment.java @@ -176,7 +176,7 @@ public class PickRawContactDialogFragment extends DialogFragment { throw new IllegalArgumentException("Dialog created with null RawContactsMetadata"); } - final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); + final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme); mAdapter = new RawContactAccountListAdapter(getContext(), metadata); if (metadata.showReadOnly) { builder.setTitle(R.string.contact_editor_pick_linked_contact_dialog_title); diff --git a/src/com/android/contacts/editor/SelectAccountDialogFragment.java b/src/com/android/contacts/editor/SelectAccountDialogFragment.java index 3b41c86aded109da06585a6fe0b6511199820da9..71e2b6aab0f07f258a87015dea5d0293a27e4bee 100644 --- a/src/com/android/contacts/editor/SelectAccountDialogFragment.java +++ b/src/com/android/contacts/editor/SelectAccountDialogFragment.java @@ -90,7 +90,7 @@ public final class SelectAccountDialogFragment extends DialogFragment @Override public Dialog onCreateDialog(Bundle savedInstanceState) { - final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); + final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme); final Bundle args = getArguments(); mAccountsAdapter = new AccountsListAdapter(builder.getContext()); diff --git a/src/com/android/contacts/editor/SplitContactConfirmationDialogFragment.java b/src/com/android/contacts/editor/SplitContactConfirmationDialogFragment.java index 9b4e2348cc0fe482100a838a31a14cc05c76d448..6bda7f1de4258dddf81f07bf2aad54cec41ed8d5 100644 --- a/src/com/android/contacts/editor/SplitContactConfirmationDialogFragment.java +++ b/src/com/android/contacts/editor/SplitContactConfirmationDialogFragment.java @@ -77,7 +77,7 @@ public class SplitContactConfirmationDialogFragment extends DialogFragment { @Override public Dialog onCreateDialog(Bundle savedInstanceState) { - final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); + final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme); builder.setMessage(mHasPendingChanges ? R.string.splitConfirmationWithPendingChanges : R.string.splitConfirmation); diff --git a/src/com/android/contacts/editor/SuggestionEditConfirmationDialogFragment.java b/src/com/android/contacts/editor/SuggestionEditConfirmationDialogFragment.java index df2277315a6c0c839ad08e31cf7419434c925ec6..32b0823f5c932a2a8072e5c186c0d5e57ec1611e 100644 --- a/src/com/android/contacts/editor/SuggestionEditConfirmationDialogFragment.java +++ b/src/com/android/contacts/editor/SuggestionEditConfirmationDialogFragment.java @@ -44,7 +44,7 @@ public class SuggestionEditConfirmationDialogFragment extends DialogFragment { @Override public Dialog onCreateDialog(Bundle savedInstanceState) { - return new AlertDialog.Builder(getActivity()) + return new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme) .setIconAttribute(android.R.attr.alertDialogIcon) .setMessage(R.string.aggregation_suggestion_edit_dialog_message) .setPositiveButton(android.R.string.yes, diff --git a/src/com/android/contacts/group/GroupNameEditDialogFragment.java b/src/com/android/contacts/group/GroupNameEditDialogFragment.java index 392bf249c57ea7b86e9f4e3df3bf51a12da91410..498d5fa6e9e78fd0d6c5064016659097fee412eb 100644 --- a/src/com/android/contacts/group/GroupNameEditDialogFragment.java +++ b/src/com/android/contacts/group/GroupNameEditDialogFragment.java @@ -143,7 +143,7 @@ public final class GroupNameEditDialogFragment extends DialogFragment implements title.setText(mIsInsert ? R.string.group_name_dialog_insert_title : R.string.group_name_dialog_update_title); - final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), getTheme()) + final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme) .setCustomTitle(title) .setView(R.layout.group_name_edit_dialog) .setNegativeButton(android.R.string.cancel, new OnClickListener() { @@ -162,48 +162,45 @@ public final class GroupNameEditDialogFragment extends DialogFragment implements final AlertDialog alertDialog = builder.create(); alertDialog.getWindow().setSoftInputMode( WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE); - alertDialog.setOnShowListener(new DialogInterface.OnShowListener() { - @Override - public void onShow(DialogInterface dialog) { - mGroupNameEditText = (EditText) alertDialog.findViewById(android.R.id.text1); - mGroupNameTextLayout = - (TextInputLayout) alertDialog.findViewById(R.id.text_input_layout); - if (!TextUtils.isEmpty(mGroupName)) { - mGroupNameEditText.setText(mGroupName); - // Guard against already created group names that are longer than the max - final int maxLength = getResources().getInteger( - R.integer.group_name_max_length); - mGroupNameEditText.setSelection( - mGroupName.length() > maxLength ? maxLength : mGroupName.length()); - } - showInputMethod(mGroupNameEditText); + alertDialog.setOnShowListener((DialogInterface.OnShowListener) dialog -> { + mGroupNameEditText = (EditText) alertDialog.findViewById(android.R.id.text1); + mGroupNameTextLayout = + (TextInputLayout) alertDialog.findViewById(R.id.text_input_layout); + if (!TextUtils.isEmpty(mGroupName)) { + mGroupNameEditText.setText(mGroupName); + // Guard against already created group names that are longer than the max + final int maxLength = getResources().getInteger( + R.integer.group_name_max_length); + mGroupNameEditText.setSelection( + mGroupName.length() > maxLength ? maxLength : mGroupName.length()); + } + showInputMethod(mGroupNameEditText); - final Button createButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE); - createButton.setEnabled(!TextUtils.isEmpty(getGroupName())); + final Button createButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE); + createButton.setEnabled(!TextUtils.isEmpty(getGroupName())); - // Override the click listener to prevent dismissal if creating a duplicate group. - createButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - maybePersistCurrentGroupName(v); - } - }); - mGroupNameEditText.addTextChangedListener(new TextWatcher() { - @Override - public void beforeTextChanged(CharSequence s, int start, int count, int after) { - } + // Override the click listener to prevent dismissal if creating a duplicate group. + createButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + maybePersistCurrentGroupName(v); + } + }); + mGroupNameEditText.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence s, int start, int count, int after) { + } - @Override - public void onTextChanged(CharSequence s, int start, int before, int count) { - } + @Override + public void onTextChanged(CharSequence s, int start, int before, int count) { + } - @Override - public void afterTextChanged(Editable s) { - mGroupNameTextLayout.setError(null); - createButton.setEnabled(!TextUtils.isEmpty(s)); - } - }); - } + @Override + public void afterTextChanged(Editable s) { + mGroupNameTextLayout.setError(null); + createButton.setEnabled(!TextUtils.isEmpty(s)); + } + }); }); return alertDialog; diff --git a/src/com/android/contacts/interactions/ContactDeletionInteraction.java b/src/com/android/contacts/interactions/ContactDeletionInteraction.java index 240588bd17882f163308a470ebfbb4db13a02cca..5a8b0543bb11880e4d0da8bfb4aa61f095a4a02e 100644 --- a/src/com/android/contacts/interactions/ContactDeletionInteraction.java +++ b/src/com/android/contacts/interactions/ContactDeletionInteraction.java @@ -302,7 +302,7 @@ public class ContactDeletionInteraction extends Fragment } private void showDialog(int messageId, int positiveButtonId, final Uri contactUri) { - mDialog = new AlertDialog.Builder(getActivity()) + mDialog = new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme) .setIconAttribute(android.R.attr.alertDialogIcon) .setMessage(messageId) .setNegativeButton(android.R.string.cancel, null) diff --git a/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java b/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java index efd1f081cd0dfbc3087556ee4ea686a0f7f860a7..926ce9acf08a2e78510410d9ac21243927f9b123 100644 --- a/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java +++ b/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java @@ -270,34 +270,23 @@ public class ContactMultiDeletionInteraction extends Fragment private void showDialog(int messageId, int positiveButtonId, final long[] contactIds, final String[] namesArray) { - mDialog = new AlertDialog.Builder(getActivity()) + mDialog = new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme) .setIconAttribute(android.R.attr.alertDialogIcon) .setMessage(messageId) .setNegativeButton(android.R.string.cancel, null) .setPositiveButton(positiveButtonId, - new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int whichButton) { - doDeleteContact(contactIds, namesArray); - } - } + (dialog, whichButton) -> doDeleteContact(contactIds, namesArray) ) .create(); - mDialog.setOnDismissListener(new OnDismissListener() { - @Override - public void onDismiss(DialogInterface dialog) { - mIsLoaderActive = false; - mDialog = null; - } + mDialog.setOnDismissListener(dialog -> { + mIsLoaderActive = false; + mDialog = null; }); - mDialog.setOnShowListener( new DialogInterface.OnShowListener() { - @Override - public void onShow(DialogInterface arg0) { - mDialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(getResources().getColor(R.color.color_default_blue1)); - mDialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(getResources().getColor(R.color.color_default_blue1)); - } + mDialog.setOnShowListener(arg0 -> { + mDialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(getResources().getColor(R.color.accent)); + mDialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(getResources().getColor(R.color.accent)); }); mDialog.show(); diff --git a/src/com/android/contacts/interactions/ExportDialogFragment.java b/src/com/android/contacts/interactions/ExportDialogFragment.java index c7ce072302e391d54a02138318699cafe673f5fd..104b984426d24f5ca1ca52bce0aff8af598492d7 100644 --- a/src/com/android/contacts/interactions/ExportDialogFragment.java +++ b/src/com/android/contacts/interactions/ExportDialogFragment.java @@ -160,10 +160,8 @@ public class ExportDialogFragment extends DialogFragment { } } }; - final TextView title = (TextView) View.inflate(getActivity(), R.layout.dialog_title, null); - title.setText(R.string.dialog_export); - return new AlertDialog.Builder(getActivity()) - .setCustomTitle(title) + return new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme) + .setTitle(R.string.dialog_export) .setSingleChoiceItems(adapter, -1, clickListener) .create(); } diff --git a/src/com/android/contacts/interactions/GroupDeletionDialogFragment.java b/src/com/android/contacts/interactions/GroupDeletionDialogFragment.java index 01361b2a37be114562154e2c01e8e517a21bf5f2..c686da5872b9769e353eb61be16ced08646d4578 100644 --- a/src/com/android/contacts/interactions/GroupDeletionDialogFragment.java +++ b/src/com/android/contacts/interactions/GroupDeletionDialogFragment.java @@ -48,7 +48,7 @@ public class GroupDeletionDialogFragment extends DialogFragment { String label = getArguments().getString(ARG_LABEL); String message = getActivity().getString(R.string.delete_group_dialog_message, label); - return new AlertDialog.Builder(getActivity()) + return new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme) .setIconAttribute(android.R.attr.alertDialogIcon) .setMessage(message) .setPositiveButton(android.R.string.ok, diff --git a/src/com/android/contacts/interactions/ImportDialogFragment.java b/src/com/android/contacts/interactions/ImportDialogFragment.java index 7f41823a89917e24c939b6fa6d4b724059c8ff74..bf99f49358ef11d74f11e291938f69b10f1d1ca0 100644 --- a/src/com/android/contacts/interactions/ImportDialogFragment.java +++ b/src/com/android/contacts/interactions/ImportDialogFragment.java @@ -207,7 +207,7 @@ public class ImportDialogFragment extends DialogFragment { } }; - final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), getTheme()) + final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme) .setTitle(R.string.dialog_import) .setNegativeButton(android.R.string.cancel, null); if (adapter.isEmpty()) { @@ -220,8 +220,8 @@ public class ImportDialogFragment extends DialogFragment { dialog.setOnShowListener( new DialogInterface.OnShowListener() { @Override public void onShow(DialogInterface arg0) { - dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(getResources().getColor(R.color.color_default_blue1)); - //dialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(getResources().getColor(R.color.color_default_blue1)); + dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(getResources().getColor(R.color.accent)); + //dialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(getResources().getColor(R.color.accent)); } }); diff --git a/src/com/android/contacts/list/AccountFilterActivity.java b/src/com/android/contacts/list/AccountFilterActivity.java index ab26cb45fa780cbbeeeba9ee0cc1511dfb136f7d..6b2f755e4a0016ad29a287ec86d79f9c3ad0fd6c 100644 --- a/src/com/android/contacts/list/AccountFilterActivity.java +++ b/src/com/android/contacts/list/AccountFilterActivity.java @@ -74,7 +74,7 @@ public class AccountFilterActivity extends Activity implements AdapterView.OnIte int resINT = getResources().getIdentifier(resName, "drawable", getPackageName()); final Drawable upArrow = getResources().getDrawable(resINT); - upArrow.setColorFilter(getResources().getColor(R.color.color_default_blue1), PorterDuff.Mode.SRC_ATOP); + upArrow.setColorFilter(getResources().getColor(R.color.accent), PorterDuff.Mode.SRC_ATOP); actionBar.setHomeAsUpIndicator(upArrow); actionBar.setDisplayHomeAsUpEnabled(true); @@ -92,14 +92,6 @@ public class AccountFilterActivity extends Activity implements AdapterView.OnIte filters.add(ContactListFilter.createFilterWithType( ContactListFilter.FILTER_TYPE_CUSTOM)); mListView.setAdapter(new FilterListAdapter(this, filters, mCurrentFilterType)); - // this.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); - - if(Build.VERSION.SDK_INT >= 27) { - this.getWindow().getDecorView().setSystemUiVisibility(FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS | - View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR | - View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); - } - } @Override diff --git a/src/com/android/contacts/list/ContactListItemView.java b/src/com/android/contacts/list/ContactListItemView.java index aafe5b188d960cd7919a673ada266d0eb19d5df8..3575a92cef4f5b126882bee0e0069de3901e18c5 100644 --- a/src/com/android/contacts/list/ContactListItemView.java +++ b/src/com/android/contacts/list/ContactListItemView.java @@ -1157,7 +1157,7 @@ public class ContactListItemView extends ViewGroup mNameTextView.setSingleLine(true); mNameTextView.setEllipsize(getTextEllipsis()); mNameTextView.setTextColor(ResourcesCompat.getColorStateList(getResources(), - R.color.contact_list_name_text_color, getContext().getTheme())); + R.color.color_default_primary_text, getContext().getTheme())); mNameTextView.setTextSize(TypedValue.COMPLEX_UNIT_PX, mNameTextViewTextSize); // Manually call setActivated() since this view may be added after the first // setActivated() call toward this whole item view. diff --git a/src/com/android/contacts/list/CustomContactListFilterActivity.java b/src/com/android/contacts/list/CustomContactListFilterActivity.java index e0e60dabf735198c6f433a45517041a3f5be413b..4ba748cfc117e1c9ceb4ab0167569c27350213a9 100644 --- a/src/com/android/contacts/list/CustomContactListFilterActivity.java +++ b/src/com/android/contacts/list/CustomContactListFilterActivity.java @@ -137,7 +137,7 @@ public class CustomContactListFilterActivity extends Activity implements int resINT = getResources().getIdentifier(resName, "drawable", getPackageName()); final Drawable upArrow = getResources().getDrawable(resINT); - upArrow.setColorFilter(getResources().getColor(R.color.color_default_blue1), PorterDuff.Mode.SRC_ATOP); + upArrow.setColorFilter(getResources().getColor(R.color.accent), PorterDuff.Mode.SRC_ATOP); actionBar.setHomeAsUpIndicator(upArrow); // android.R.id.home will be triggered in onOptionsItemSelected() @@ -146,14 +146,6 @@ public class CustomContactListFilterActivity extends Activity implements } - //this.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); - - if(Build.VERSION.SDK_INT >= 27) { - this.getWindow().getDecorView().setSystemUiVisibility(FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS | - View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR | - View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); - } - } public static class CustomFilterConfigurationLoader extends ListenableFutureLoader { @@ -816,7 +808,7 @@ public class CustomContactListFilterActivity extends Activity implements if (syncMode == SYNC_MODE_EVERYTHING && shouldSyncUngrouped && !child.equals(account.mUngrouped)) { // Warn before removing this group when it would cause ungrouped to stop syncing - final AlertDialog.Builder builder = new AlertDialog.Builder(this); + final AlertDialog.Builder builder = new AlertDialog.Builder(this, R.style.ContactsAlertDialogTheme); final CharSequence removeMessage = this.getString( R.string.display_warn_remove_ungrouped, title); builder.setTitle(R.string.menu_sync_remove); @@ -1008,7 +1000,7 @@ public class CustomContactListFilterActivity extends Activity implements @Override public Dialog onCreateDialog(Bundle savedInstanceState) { - return new AlertDialog.Builder(getActivity(), getTheme()) + return new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme) .setMessage(R.string.leave_customize_confirmation_dialog_message) .setNegativeButton(android.R.string.no, null) .setPositiveButton(android.R.string.yes, this) diff --git a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java index bb553ad66f196ef63b2fd320e529940080a6881a..f153db74a453c9c0c7def201c426c68f45c4b116 100644 --- a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java +++ b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java @@ -1004,7 +1004,7 @@ public class DefaultContactBrowseListFragment extends ContactBrowseListFragment if (searchIcon != null) { searchIcon.mutate().setColorFilter(ContextCompat.getColor(mActivity, - R.color.color_default_blue1), PorterDuff.Mode.SRC_ATOP); + R.color.accent), PorterDuff.Mode.SRC_ATOP); } } @@ -1036,7 +1036,7 @@ public class DefaultContactBrowseListFragment extends ContactBrowseListFragment final Drawable icon = menu.getItem(i).getIcon(); if (icon != null && !isSearchOrSelectionMode) { icon.mutate().setColorFilter(ContextCompat.getColor(getContext(), - R.color.color_default_blue1), PorterDuff.Mode.SRC_ATOP); + R.color.accent), PorterDuff.Mode.SRC_ATOP); } } } diff --git a/src/com/android/contacts/list/EnableGlobalSyncDialogFragment.java b/src/com/android/contacts/list/EnableGlobalSyncDialogFragment.java index 08822d10c6a39898e2e3c3822a3d079fd7a9c2b6..7be9fc889979b4397f321084d9de584eda0e3227 100644 --- a/src/com/android/contacts/list/EnableGlobalSyncDialogFragment.java +++ b/src/com/android/contacts/list/EnableGlobalSyncDialogFragment.java @@ -65,7 +65,7 @@ public class EnableGlobalSyncDialogFragment extends DialogFragment{ @Override public Dialog onCreateDialog(Bundle savedInstanceState) { final Listener targetListener = (Listener) getTargetFragment(); - final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); + final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme); builder.setTitle(R.string.turn_auto_sync_on_dialog_title) .setMessage(R.string.turn_auto_sync_on_dialog_body) .setPositiveButton(R.string.turn_auto_sync_on_dialog_confirm_btn, diff --git a/src/com/android/contacts/preference/ContactsPreferenceActivity.java b/src/com/android/contacts/preference/ContactsPreferenceActivity.java index 8d74e387d21d73b5c183f71adc3179b07bb108b8..c153cc7bffcb6ace4f0b9d924bd794208b3c104f 100644 --- a/src/com/android/contacts/preference/ContactsPreferenceActivity.java +++ b/src/com/android/contacts/preference/ContactsPreferenceActivity.java @@ -18,6 +18,7 @@ package com.android.contacts.preference; import android.content.res.Configuration; import android.database.Cursor; +import android.graphics.drawable.ColorDrawable; import android.os.Build; import android.os.Bundle; import android.preference.PreferenceActivity; @@ -76,6 +77,7 @@ public final class ContactsPreferenceActivity extends PreferenceActivity final ActionBar actionBar = mCompatDelegate.getSupportActionBar(); if (actionBar != null) { + actionBar.setBackgroundDrawable(new ColorDrawable(getColor(R.color.primary_color_dark))); actionBar.setDisplayOptions(ActionBar.DISPLAY_HOME_AS_UP, ActionBar.DISPLAY_HOME_AS_UP); } @@ -102,14 +104,6 @@ public final class ContactsPreferenceActivity extends PreferenceActivity setActivityTitle(R.string.activity_title_settings); } } - //this.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); - - if(Build.VERSION.SDK_INT >= 27) { - this.getWindow().getDecorView().setSystemUiVisibility(FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS | - View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR | - View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); - } - } @Override @@ -207,10 +201,11 @@ public final class ContactsPreferenceActivity extends PreferenceActivity private void setActivityTitle(@StringRes int res) { final ActionBar actionBar = mCompatDelegate.getSupportActionBar(); if (actionBar != null) { + actionBar.setBackgroundDrawable(new ColorDrawable(getColor(R.color.primary_color_dark))); //actionBar.setTitle(res); String title=this.getResources().getString(res); - actionBar.setTitle(Html.fromHtml(""+title+" ")); + actionBar.setTitle(title); } } diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java index 1952d50f90c05b52dcc75b728480ff9f69de7f85..56d8c09f3bc7d387fe5af9a378ada9fadac4e672 100644 --- a/src/com/android/contacts/quickcontact/QuickContactActivity.java +++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java @@ -17,6 +17,7 @@ package com.android.contacts.quickcontact; +import androidx.core.content.ContextCompat; import android.accounts.Account; import android.animation.ArgbEvaluator; import android.animation.ObjectAnimator; @@ -1187,6 +1188,8 @@ public class QuickContactActivity extends ContactsActivity { private void initializeNoContactDetailCard(boolean areAllRawContactsSimAccounts) { final Drawable phoneIcon = ResourcesCompat.getDrawable(getResources(), lineageos.platform.R.drawable.ic_phone, null).mutate(); + phoneIcon.setColorFilter(ContextCompat.getColor(this, R.color.accent), + PorterDuff.Mode.SRC_ATOP); final Entry phonePromptEntry = new Entry(CARD_ENTRY_ID_EDIT_CONTACT, phoneIcon, getString(R.string.quickcontact_add_phone_number), /* subHeader = */ null, /* subHeaderIcon = */ null, /* text = */ null, @@ -1209,6 +1212,8 @@ public class QuickContactActivity extends ContactsActivity { if (!areAllRawContactsSimAccounts) { final Drawable emailIcon = ResourcesCompat.getDrawable(getResources(), R.drawable.quantum_ic_email_vd_theme_24, null).mutate(); + emailIcon.setColorFilter(ContextCompat.getColor(this, R.color.accent), + PorterDuff.Mode.SRC_ATOP); final Entry emailPromptEntry = new Entry(CARD_ENTRY_ID_EDIT_CONTACT, emailIcon, getString(R.string.quickcontact_add_email), /* subHeader = */ null, /* subHeaderIcon = */ null, @@ -1228,8 +1233,10 @@ public class QuickContactActivity extends ContactsActivity { final int subHeaderTextColor = getResources().getColor( R.color.quickcontact_entry_sub_header_text_color); - final PorterDuffColorFilter greyColorFilter = - new PorterDuffColorFilter(subHeaderTextColor, PorterDuff.Mode.SRC_ATOP); + final int accentColor = getResources().getColor( + R.color.accent); + final PorterDuffColorFilter accentColorFilter = + new PorterDuffColorFilter(accentColor, PorterDuff.Mode.SRC_ATOP); mNoContactDetailsCard.initialize(promptEntries, 2, /* isExpanded = */ true, /* isAlwaysExpanded = */ true, mExpandingEntryCardViewListener, mScroller); if (mNoContactDetailsCard.getVisibility() == View.GONE && mShouldLog) { @@ -1238,7 +1245,7 @@ public class QuickContactActivity extends ContactsActivity { } mNoContactDetailsCard.setVisibility(View.VISIBLE); mNoContactDetailsCard.setEntryHeaderColor(subHeaderTextColor); - mNoContactDetailsCard.setColorAndFilter(subHeaderTextColor, greyColorFilter); + mNoContactDetailsCard.setColorAndFilter(subHeaderTextColor, accentColorFilter); } /** @@ -2047,14 +2054,14 @@ public class QuickContactActivity extends ContactsActivity { } private void setThemeColor(MaterialPalette palette) { - // If the color is invalid, use the predefined default + // If the color is invalid, use the predefined mColorFilterColor = palette.mPrimaryColor; mScroller.setHeaderTintColor(mColorFilterColor); mStatusBarColor = palette.mSecondaryColor; updateStatusBarColor(); - mColorFilter = new PorterDuffColorFilter(mColorFilterColor, PorterDuff.Mode.SRC_ATOP); + mContactCard.setColorAndFilter(mColorFilterColor, mColorFilter); mAboutCard.setColorAndFilter(mColorFilterColor, mColorFilter); } @@ -2353,10 +2360,10 @@ public class QuickContactActivity extends ContactsActivity { editMenuItem.setVisible(true); if (DirectoryContactUtil.isDirectoryContact(mContactData) || InvisibleContactUtil .isInvisibleAndAddable(mContactData, this)) { - editMenuItem.setIcon(R.drawable.quantum_ic_person_add_vd_theme_24); + editMenuItem.setIcon(R.drawable.quantum_ic_person_add_white_vd_theme_24); editMenuItem.setTitle(R.string.menu_add_contact); } else if (isContactEditable()) { - editMenuItem.setIcon(R.drawable.quantum_ic_create_vd_theme_24); + editMenuItem.setIcon(R.drawable.quantum_ic_create_white_vd_theme_24); editMenuItem.setTitle(R.string.menu_editContact); } else { editMenuItem.setVisible(false); @@ -2399,6 +2406,14 @@ public class QuickContactActivity extends ContactsActivity { final MenuItem helpMenu = menu.findItem(R.id.menu_help); helpMenu.setVisible(HelpUtils.isHelpAndFeedbackAvailable()); + for (int i = 0; i < menu.size(); ++i) { + final Drawable icon = menu.getItem(i).getIcon(); + if (icon != null) { + icon.mutate().setColorFilter(ContextCompat.getColor(this, + android.R.color.white), PorterDuff.Mode.SRC_ATOP); + } + } + return true; } return false; diff --git a/src/com/android/contacts/util/AccountSelectionUtil.java b/src/com/android/contacts/util/AccountSelectionUtil.java index 2b226d0a101b596db8f954bfa4e3bdcf4b49f9e8..24f9a465fd23a3d0b90972f085e83ae0dd976c59 100644 --- a/src/com/android/contacts/util/AccountSelectionUtil.java +++ b/src/com/android/contacts/util/AccountSelectionUtil.java @@ -146,7 +146,7 @@ public class AccountSelectionUtil { } }; } - final AlertDialog.Builder builder = new AlertDialog.Builder(activity); + final AlertDialog.Builder builder = new AlertDialog.Builder(activity, R.style.ContactsAlertDialogTheme); final TextView title = (TextView) View.inflate(activity, R.layout.dialog_title, null); title.setText(R.string.dialog_new_contact_account); builder.setCustomTitle(title); diff --git a/src/com/android/contacts/util/MaterialColorMapUtils.java b/src/com/android/contacts/util/MaterialColorMapUtils.java index c1616cec7db9c7e7a96bf8dd6d1e36ffb212d0b7..4e4ab5c4081765a4df020593fc98f3ed95335bb7 100644 --- a/src/com/android/contacts/util/MaterialColorMapUtils.java +++ b/src/com/android/contacts/util/MaterialColorMapUtils.java @@ -200,6 +200,6 @@ public class MaterialColorMapUtils { && ((PeopleActivity) activity).isGroupView(); return isGroupView ? ContextCompat.getColor(activity, R.color.group_primary_color) - : ContextCompat.getColor(activity, R.color.primary_color); + : ContextCompat.getColor(activity, R.color.primary_color_dark); } } diff --git a/src/com/android/contacts/vcard/CancelActivity.java b/src/com/android/contacts/vcard/CancelActivity.java index a6b58cc86bf91e7cc29034597d579c114f29250f..33c65ceb0f343e31a89195c415718c8bd257567c 100644 --- a/src/com/android/contacts/vcard/CancelActivity.java +++ b/src/com/android/contacts/vcard/CancelActivity.java @@ -89,14 +89,14 @@ public class CancelActivity extends Activity implements ServiceConnection { } else { message = getString(R.string.cancel_export_confirmation_message, mDisplayName); } - final AlertDialog.Builder builder = new AlertDialog.Builder(this) + final AlertDialog.Builder builder = new AlertDialog.Builder(this, R.style.ContactsAlertDialogTheme) .setMessage(message) .setPositiveButton(R.string.yes_button, new RequestCancelListener()) .setOnCancelListener(mCancelListener) .setNegativeButton(R.string.no_button, mCancelListener); return builder.create(); } else if (id == R.id.dialog_cancel_failed) { - final AlertDialog.Builder builder = new AlertDialog.Builder(this) + final AlertDialog.Builder builder = new AlertDialog.Builder(this, R.style.ContactsAlertDialogTheme) .setTitle(R.string.cancel_vcard_import_or_export_failed) .setIconAttribute(android.R.attr.alertDialogIcon) .setMessage(getString(R.string.fail_reason_unknown)) diff --git a/src/com/android/contacts/vcard/ExportVCardActivity.java b/src/com/android/contacts/vcard/ExportVCardActivity.java index 690f2070c2e52a68d5f3898a8b7110337b65bfde..05818603c050256a6388bbd415a612fec7741566 100644 --- a/src/com/android/contacts/vcard/ExportVCardActivity.java +++ b/src/com/android/contacts/vcard/ExportVCardActivity.java @@ -178,7 +178,7 @@ public class ExportVCardActivity extends Activity implements ServiceConnection, protected Dialog onCreateDialog(int id, Bundle bundle) { if (id == R.id.dialog_fail_to_export_with_reason) { mProcessOngoing = false; - return new AlertDialog.Builder(this) + return new AlertDialog.Builder(this, R.style.ContactsAlertDialogTheme) .setTitle(R.string.exporting_contact_failed_title) .setMessage(getString(R.string.exporting_contact_failed_message, mErrorReason != null ? mErrorReason : diff --git a/src/com/android/contacts/vcard/ImportVCardActivity.java b/src/com/android/contacts/vcard/ImportVCardActivity.java index 2c69cdfd690b982181d1c8708ed334db5fcfa309..257bb23b370dbe02f57fbc8ef50d6c694beb5815 100644 --- a/src/com/android/contacts/vcard/ImportVCardActivity.java +++ b/src/com/android/contacts/vcard/ImportVCardActivity.java @@ -759,7 +759,7 @@ public class ImportVCardActivity extends Activity implements ImportVCardDialogFr Log.e(LOG_TAG, "Error message is null while it must not."); message = getString(R.string.fail_reason_unknown); } - final AlertDialog.Builder builder = new AlertDialog.Builder(this) + final AlertDialog.Builder builder = new AlertDialog.Builder(this, R.style.ContactsAlertDialogTheme) .setTitle(getString(R.string.reading_vcard_failed_title)) .setIconAttribute(android.R.attr.alertDialogIcon) .setMessage(message) diff --git a/src/com/android/contacts/vcard/ImportVCardDialogFragment.java b/src/com/android/contacts/vcard/ImportVCardDialogFragment.java index 521a610ddade18933895ff63320841d72d519563..339e674160b258d23134fe977c36906576104634 100644 --- a/src/com/android/contacts/vcard/ImportVCardDialogFragment.java +++ b/src/com/android/contacts/vcard/ImportVCardDialogFragment.java @@ -65,7 +65,7 @@ public class ImportVCardDialogFragment extends DialogFragment { final Uri sourceUri = getArguments().getParcelable(ARG_SOURCE_URI); final String sourceDisplayName = getArguments().getString(ARG_SOURCE_DISPLAY_NAME); - return new AlertDialog.Builder(getActivity()) + return new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme) .setIconAttribute(android.R.attr.alertDialogIcon) .setMessage(R.string.import_from_vcf_file_confirmation_message) .setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() { diff --git a/src/com/android/contacts/widget/SelectPhoneAccountDialogFragment.java b/src/com/android/contacts/widget/SelectPhoneAccountDialogFragment.java index da2b468da63a8855f7127a324fb1362fdf9c0a38..242a3e52fb19933b11e1f855cff8df2d945c4fd5 100644 --- a/src/com/android/contacts/widget/SelectPhoneAccountDialogFragment.java +++ b/src/com/android/contacts/widget/SelectPhoneAccountDialogFragment.java @@ -185,7 +185,7 @@ public class SelectPhoneAccountDialogFragment extends DialogFragment { } }; - AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); + AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme); ListAdapter selectAccountListAdapter = new SelectAccountListAdapter( builder.getContext(), R.layout.select_account_list_item, diff --git a/tests/res/layout/fill_call_log_test.xml b/tests/res/layout/fill_call_log_test.xml index 51a97a8b95ac2c9780b4e01570fe0e174a0fd193..9568db545934e3e45e065d14de2f0e13c8c758f4 100644 --- a/tests/res/layout/fill_call_log_test.xml +++ b/tests/res/layout/fill_call_log_test.xml @@ -38,7 +38,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/useRandomNumbers" - android:buttonTint="@color/color_default_blue1" + android:buttonTint="@color/accent" />