From 63394e79045aec378cc98b819c879e67a961270d Mon Sep 17 00:00:00 2001 From: Fahim Date: Thu, 3 Jun 2021 20:06:14 +0600 Subject: [PATCH 1/5] 2824-Pie-Dark-mode implementation --- AndroidManifest.xml | 2 +- assets/licenses_night.html | 247 ++++++++++++++++++ res/color/contact_list_name_text_color.xml | 19 -- res/drawable/fab_bg.xml | 2 +- res/drawable/ic_add_circle_24dp.xml | 2 +- res/drawable/ic_add_contact_shortcut.xml | 2 +- res/drawable/ic_work_profile.xml | 2 +- .../item_background_material_dark.xml | 2 +- .../quantum_ic_account_circle_vd_theme_24.xml | 17 +- res/drawable/quantum_ic_add_vd_theme_24.xml | 17 +- .../quantum_ic_arrow_back_vd_theme_24.xml | 17 +- ...quantum_ic_arrow_drop_down_vd_theme_24.xml | 17 +- .../quantum_ic_assistant_vd_theme_24.xml | 17 +- .../quantum_ic_business_vd_theme_24.xml | 17 +- .../quantum_ic_call_received_vd_theme_24.xml | 17 +- .../quantum_ic_camera_alt_vd_theme_24.xml | 21 +- .../quantum_ic_cancel_vd_theme_24.xml | 17 +- .../quantum_ic_circles_ext_vd_theme_24.xml | 17 +- res/drawable/quantum_ic_close_vd_theme_24.xml | 17 +- .../quantum_ic_content_copy_vd_theme_24.xml | 17 +- .../quantum_ic_create_vd_theme_24.xml | 17 +- .../quantum_ic_delete_vd_theme_24.xml | 17 +- .../quantum_ic_dialer_sip_vd_theme_24.xml | 17 +- .../quantum_ic_directions_vd_theme_24.xml | 17 +- res/drawable/quantum_ic_done_vd_theme_24.xml | 17 +- .../quantum_ic_drawer_emergency_info_24.xml | 14 +- res/drawable/quantum_ic_drawer_my_info_32.xml | 24 +- res/drawable/quantum_ic_email_vd_theme_24.xml | 17 +- res/drawable/quantum_ic_error_vd_theme_24.xml | 17 +- res/drawable/quantum_ic_event_vd_theme_24.xml | 17 +- .../quantum_ic_expand_less_vd_theme_24.xml | 17 +- .../quantum_ic_expand_more_vd_theme_24.xml | 17 +- .../quantum_ic_hangout_vd_theme_24.xml | 17 +- .../quantum_ic_hangout_video_vd_theme_24.xml | 17 +- res/drawable/quantum_ic_help_vd_theme_24.xml | 17 +- .../quantum_ic_history_vd_theme_24.xml | 17 +- .../quantum_ic_insert_comment_vd_theme_24.xml | 17 +- res/drawable/quantum_ic_label_vd_theme_24.xml | 17 +- res/drawable/quantum_ic_link_vd_theme_24.xml | 17 +- res/drawable/quantum_ic_menu_vd_theme_24.xml | 17 +- .../quantum_ic_message_vd_theme_24.xml | 17 +- res/drawable/quantum_ic_mic_vd_theme_24.xml | 17 +- .../quantum_ic_more_vert_vd_theme_24.xml | 17 +- .../quantum_ic_perm_phone_msg_vd_theme_24.xml | 17 +- .../quantum_ic_person_add_vd_theme_24.xml | 17 +- .../quantum_ic_person_vd_theme_24.xml | 17 +- res/drawable/quantum_ic_phone_vd_theme_24.xml | 17 +- res/drawable/quantum_ic_place_vd_theme_24.xml | 17 +- .../quantum_ic_public_vd_theme_24.xml | 17 +- .../quantum_ic_search_vd_theme_24.xml | 17 +- .../quantum_ic_settings_vd_theme_24.xml | 17 +- res/drawable/quantum_ic_share_vd_theme_24.xml | 17 +- .../quantum_ic_sim_card_vd_theme_24.xml | 17 +- .../quantum_ic_smartphone_vd_theme_24.xml | 17 +- .../quantum_ic_star_border_vd_theme_24.xml | 17 +- res/drawable/quantum_ic_star_vd_theme_24.xml | 17 +- .../quantum_ic_videocam_vd_theme_24.xml | 17 +- .../quantum_launchscreen_contacts.xml | 2 +- res/layout-v23/edit_spinner.xml | 1 + res/layout/contact_editor_fields.xml | 2 +- .../contact_editor_label_name_dialog.xml | 2 + .../custom_contact_list_filter_group.xml | 2 +- res/layout/date_picker.xml | 2 +- res/layout/default_account_checkbox.xml | 2 +- res/layout/dialog_call_subject.xml | 2 +- res/layout/edit_delete_button.xml | 2 +- res/layout/edit_simple_spinner_item.xml | 2 +- res/layout/edit_spinner.xml | 2 +- res/layout/editor_account_header.xml | 2 +- res/layout/expanding_entry_card_view.xml | 1 + res/layout/floating_action_button.xml | 2 +- res/layout/fragment_sim_import.xml | 2 +- res/layout/group_membership_list_item.xml | 2 + res/layout/name_edit_expansion_view.xml | 2 +- ...quickcontact_collapsed_suggestion_card.xml | 71 ++--- res/layout/quickcontact_content.xml | 2 +- ...ickcontact_expanding_entry_card_button.xml | 1 + res/layout/search_bar_expanded.xml | 2 +- res/layout/select_dialog_item.xml | 3 +- res/layout/selection_bar.xml | 4 +- res/layout/sim_import_list_item_disabled.xml | 2 +- res/menu/edit_contact.xml | 4 +- res/menu/people_options.xml | 22 +- res/values-night-v27/styles.xml | 22 ++ res/values-night/styles.xml | 4 + res/values-v27/styles.xml | 138 +--------- res/values/colors.xml | 115 ++++---- res/values/styles.xml | 161 ++++++++---- .../contacts/activities/ActionBarAdapter.java | 2 +- .../activities/ContactEditorActivity.java | 11 - .../activities/ContactSelectionActivity.java | 14 +- .../contacts/activities/LicenseActivity.java | 33 ++- .../contacts/activities/PeopleActivity.java | 19 +- .../editor/PhotoSourceDialogFragment.java | 2 +- .../ContactMultiDeletionInteraction.java | 4 +- .../interactions/ExportDialogFragment.java | 4 +- .../interactions/ImportDialogFragment.java | 6 +- .../contacts/list/AccountFilterActivity.java | 12 +- .../contacts/list/ContactListItemView.java | 2 +- .../list/CustomContactListFilterActivity.java | 13 +- .../DefaultContactBrowseListFragment.java | 4 +- .../ContactsPreferenceActivity.java | 12 +- .../quickcontact/QuickContactActivity.java | 23 +- .../contacts/util/MaterialColorMapUtils.java | 2 +- tests/res/layout/fill_call_log_test.xml | 2 +- 105 files changed, 989 insertions(+), 878 deletions(-) create mode 100644 assets/licenses_night.html delete mode 100644 res/color/contact_list_name_text_color.xml create mode 100644 res/values-night-v27/styles.xml create mode 100644 res/values-night/styles.xml diff --git a/AndroidManifest.xml b/AndroidManifest.xml index f91df2770e..85fd99b563 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -297,7 +297,7 @@ + android:theme="@style/customDialogNoActionBar"> diff --git a/assets/licenses_night.html b/assets/licenses_night.html new file mode 100644 index 0000000000..1f5d2d0dd9 --- /dev/null +++ b/assets/licenses_night.html @@ -0,0 +1,247 @@ + + + + + + + + +

Notices for: guava, libphonenumber, and libprotobuf-java-nano

+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+ +

Notices for JSR305

+
+Copyright (c) 2007-2009, JSR305 expert group
+All rights reserved.
+
+http://www.opensource.org/licenses/bsd-license.php
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name of the JSR305 expert group nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+ + + diff --git a/res/color/contact_list_name_text_color.xml b/res/color/contact_list_name_text_color.xml deleted file mode 100644 index 2327e2ae1b..0000000000 --- a/res/color/contact_list_name_text_color.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/res/drawable/fab_bg.xml b/res/drawable/fab_bg.xml index 9dfd9699b6..4ce5b643fa 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 85a7e61bd7..f56005ee1c 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 47b2f9b3c4..370b95a01b 100644 --- a/res/drawable/ic_work_profile.xml +++ b/res/drawable/ic_work_profile.xml @@ -6,5 +6,5 @@ > + android:fillColor="@color/accent"/> diff --git a/res/drawable/item_background_material_dark.xml b/res/drawable/item_background_material_dark.xml index 87b1e17471..8437f61c1d 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 df2f6e7a63..b0b9beaa5d 100644 --- a/res/drawable/quantum_ic_account_circle_vd_theme_24.xml +++ b/res/drawable/quantum_ic_account_circle_vd_theme_24.xml @@ -1,5 +1,4 @@ - - + android:width="24dp" + android:height="24dp" + android:tint="@color/accent" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,5c1.66,0 3,1.34 3,3s-1.34,3 -3,3 -3,-1.34 -3,-3 1.34,-3 3,-3zM12,19.2c-2.5,0 -4.71,-1.28 -6,-3.22 0.03,-1.99 4,-3.08 6,-3.08 1.99,0 5.97,1.09 6,3.08 -1.29,1.94 -3.5,3.22 -6,3.22z" /> diff --git a/res/drawable/quantum_ic_add_vd_theme_24.xml b/res/drawable/quantum_ic_add_vd_theme_24.xml index 627fc48c4e..39b1191b18 100644 --- a/res/drawable/quantum_ic_add_vd_theme_24.xml +++ b/res/drawable/quantum_ic_add_vd_theme_24.xml @@ -1,5 +1,4 @@ - - + android:width="24dp" + android:height="24dp" + android:tint="@color/accent" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" /> 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 174cf12fba..7858fa0bc9 100644 --- a/res/drawable/quantum_ic_arrow_back_vd_theme_24.xml +++ b/res/drawable/quantum_ic_arrow_back_vd_theme_24.xml @@ -1,5 +1,4 @@ - - + android:width="24dp" + android:height="24dp" + android:tint="@color/accent" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z" /> 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 87c39de0b6..b33a356e98 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 @@ -1,5 +1,4 @@ - - + android:width="24dp" + android:height="24dp" + android:tint="@color/accent" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M7,10l5,5 5,-5z" /> diff --git a/res/drawable/quantum_ic_assistant_vd_theme_24.xml b/res/drawable/quantum_ic_assistant_vd_theme_24.xml index 2d5135bda9..c50882a3f1 100644 --- a/res/drawable/quantum_ic_assistant_vd_theme_24.xml +++ b/res/drawable/quantum_ic_assistant_vd_theme_24.xml @@ -1,5 +1,4 @@ - - + android:width="24dp" + android:height="24dp" + android:tint="@color/accent" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M19,2L5,2c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h4l3,3 3,-3h4c1.1,0 2,-0.9 2,-2L21,4c0,-1.1 -0.9,-2 -2,-2zM13.88,12.88L12,17l-1.88,-4.12L6,11l4.12,-1.88L12,5l1.88,4.12L18,11l-4.12,1.88z" /> diff --git a/res/drawable/quantum_ic_business_vd_theme_24.xml b/res/drawable/quantum_ic_business_vd_theme_24.xml index 684265b4f4..a5b220b61a 100644 --- a/res/drawable/quantum_ic_business_vd_theme_24.xml +++ b/res/drawable/quantum_ic_business_vd_theme_24.xml @@ -1,5 +1,4 @@ - - + android:width="24dp" + android:height="24dp" + android:tint="@color/accent" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M12,7L12,3L2,3v18h20L22,7L12,7zM6,19L4,19v-2h2v2zM6,15L4,15v-2h2v2zM6,11L4,11L4,9h2v2zM6,7L4,7L4,5h2v2zM10,19L8,19v-2h2v2zM10,15L8,15v-2h2v2zM10,11L8,11L8,9h2v2zM10,7L8,7L8,5h2v2zM20,19h-8v-2h2v-2h-2v-2h2v-2h-2L12,9h8v10zM18,11h-2v2h2v-2zM18,15h-2v2h2v-2z" /> \ 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 3793f74b73..f106af4151 100644 --- a/res/drawable/quantum_ic_call_received_vd_theme_24.xml +++ b/res/drawable/quantum_ic_call_received_vd_theme_24.xml @@ -1,5 +1,4 @@ - - + android:width="24dp" + android:height="24dp" + android:tint="@color/accent" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M20,5.41L18.59,4 7,15.59V9H5v10h10v-2H8.41z" /> \ 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 07ed76be11..08b1846a96 100644 --- a/res/drawable/quantum_ic_camera_alt_vd_theme_24.xml +++ b/res/drawable/quantum_ic_camera_alt_vd_theme_24.xml @@ -1,5 +1,4 @@ - - + android:width="24dp" + android:height="24dp" + android:tint="@color/accent" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M12,12m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0" /> + android:fillColor="@color/accent" + android:pathData="M9,2L7.17,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2h-3.17L15,2L9,2zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5z" /> diff --git a/res/drawable/quantum_ic_cancel_vd_theme_24.xml b/res/drawable/quantum_ic_cancel_vd_theme_24.xml index 409ba75eb2..438cd0977a 100644 --- a/res/drawable/quantum_ic_cancel_vd_theme_24.xml +++ b/res/drawable/quantum_ic_cancel_vd_theme_24.xml @@ -1,5 +1,4 @@ - - + android:width="24dp" + android:height="24dp" + android:tint="@color/accent" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M12,2C6.47,2 2,6.47 2,12s4.47,10 10,10 10,-4.47 10,-10S17.53,2 12,2zM17,15.59L15.59,17 12,13.41 8.41,17 7,15.59 10.59,12 7,8.41 8.41,7 12,10.59 15.59,7 17,8.41 13.41,12 17,15.59z" /> 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 73baff2682..0cb80d1e8f 100644 --- a/res/drawable/quantum_ic_circles_ext_vd_theme_24.xml +++ b/res/drawable/quantum_ic_circles_ext_vd_theme_24.xml @@ -1,5 +1,4 @@ - - + android:width="24dp" + android:height="24dp" + android:tint="@color/accent" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M12,10c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,4c1.1,0 2,0.9 2,2s-0.9,2 -2,2 -2,-0.9 -2,-2 0.9,-2 2,-2zM6,13c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM6,19c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM12,11.1c-1.05,0 -1.9,0.85 -1.9,1.9s0.85,1.9 1.9,1.9c1.05,0 1.9,-0.85 1.9,-1.9s-0.85,-1.9 -1.9,-1.9zM18,13c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM18,19c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z" /> diff --git a/res/drawable/quantum_ic_close_vd_theme_24.xml b/res/drawable/quantum_ic_close_vd_theme_24.xml index 3809f5c35c..93c0c415c0 100644 --- a/res/drawable/quantum_ic_close_vd_theme_24.xml +++ b/res/drawable/quantum_ic_close_vd_theme_24.xml @@ -1,5 +1,4 @@ - - + android:width="24dp" + android:height="24dp" + android:tint="@color/accent" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" /> 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 b43eb4aada..2461cf25bb 100644 --- a/res/drawable/quantum_ic_content_copy_vd_theme_24.xml +++ b/res/drawable/quantum_ic_content_copy_vd_theme_24.xml @@ -1,5 +1,4 @@ - - + android:width="24dp" + android:height="24dp" + android:tint="@color/accent" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM19,5L8,5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h11c1.1,0 2,-0.9 2,-2L21,7c0,-1.1 -0.9,-2 -2,-2zM19,21L8,21L8,7h11v14z" /> diff --git a/res/drawable/quantum_ic_create_vd_theme_24.xml b/res/drawable/quantum_ic_create_vd_theme_24.xml index 8f161bc438..5e1cde9adf 100644 --- a/res/drawable/quantum_ic_create_vd_theme_24.xml +++ b/res/drawable/quantum_ic_create_vd_theme_24.xml @@ -1,5 +1,4 @@ - - + android:width="24dp" + android:height="24dp" + android:tint="@color/accent" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z" /> diff --git a/res/drawable/quantum_ic_delete_vd_theme_24.xml b/res/drawable/quantum_ic_delete_vd_theme_24.xml index 698a0bcfed..43543b82a2 100644 --- a/res/drawable/quantum_ic_delete_vd_theme_24.xml +++ b/res/drawable/quantum_ic_delete_vd_theme_24.xml @@ -1,5 +1,4 @@ - - + android:width="24dp" + android:height="24dp" + android:tint="@color/accent" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z" /> 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 6ef33dbd0d..da329fbd04 100644 --- a/res/drawable/quantum_ic_dialer_sip_vd_theme_24.xml +++ b/res/drawable/quantum_ic_dialer_sip_vd_theme_24.xml @@ -1,5 +1,4 @@ - - + android:width="24dp" + android:height="24dp" + android:tint="@color/accent" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M17,3h-1v5h1L17,3zM15,5h-2L13,4h2L15,3h-3v3h2v1h-2v1h3L15,5zM18,3v5h1L19,6h2L21,3h-3zM20,5h-1L19,4h1v1zM20,15.5c-1.25,0 -2.45,-0.2 -3.57,-0.57 -0.35,-0.11 -0.74,-0.03 -1.01,0.24l-2.2,2.2c-2.83,-1.44 -5.15,-3.75 -6.59,-6.59l2.2,-2.21c0.27,-0.26 0.35,-0.65 0.24,-1C8.7,6.45 8.5,5.25 8.5,4c0,-0.55 -0.45,-1 -1,-1L4,3c-0.55,0 -1,0.45 -1,1 0,9.39 7.61,17 17,17 0.55,0 1,-0.45 1,-1v-3.5c0,-0.55 -0.45,-1 -1,-1z" /> diff --git a/res/drawable/quantum_ic_directions_vd_theme_24.xml b/res/drawable/quantum_ic_directions_vd_theme_24.xml index 7da99e052f..77b54651eb 100644 --- a/res/drawable/quantum_ic_directions_vd_theme_24.xml +++ b/res/drawable/quantum_ic_directions_vd_theme_24.xml @@ -1,5 +1,4 @@ - - + android:width="24dp" + android:height="24dp" + android:tint="@color/accent" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M21.71,11.29l-9,-9c-0.39,-0.39 -1.02,-0.39 -1.41,0l-9,9c-0.39,0.39 -0.39,1.02 0,1.41l9,9c0.39,0.39 1.02,0.39 1.41,0l9,-9c0.39,-0.38 0.39,-1.01 0,-1.41zM14,14.5V12h-4v3H8v-4c0,-0.55 0.45,-1 1,-1h5V7.5l3.5,3.5 -3.5,3.5z" /> \ 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 0c810e80e4..b4d0ec0d6e 100644 --- a/res/drawable/quantum_ic_done_vd_theme_24.xml +++ b/res/drawable/quantum_ic_done_vd_theme_24.xml @@ -1,5 +1,4 @@ - - + android:width="24dp" + android:height="24dp" + android:tint="@color/accent" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z" /> diff --git a/res/drawable/quantum_ic_drawer_emergency_info_24.xml b/res/drawable/quantum_ic_drawer_emergency_info_24.xml index 6b6a14336b..ebb3c6bc2d 100644 --- a/res/drawable/quantum_ic_drawer_emergency_info_24.xml +++ b/res/drawable/quantum_ic_drawer_emergency_info_24.xml @@ -1,10 +1,10 @@ + android:width="24dp" + android:height="24dp" + android:tint="@color/accent" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M9.6,2v5.6l-5,-3L2,9l5,3l-5,3l2.3,4l5.3,-2.7v5.6h4.6v-5.6l5.3,2.7l2.3,-4l-5.6,-2.7L21.9,9l-2.3,-4l-5.3,3V2H9.6z" /> diff --git a/res/drawable/quantum_ic_drawer_my_info_32.xml b/res/drawable/quantum_ic_drawer_my_info_32.xml index 4e310cb4a1..96bce774b9 100644 --- a/res/drawable/quantum_ic_drawer_my_info_32.xml +++ b/res/drawable/quantum_ic_drawer_my_info_32.xml @@ -1,19 +1,19 @@ + android:width="32dp" + android:height="32dp" + android:viewportWidth="32.0" + android:viewportHeight="32.0"> + android:fillColor="@color/accent" + android:pathData="M15.8,1C7.5,1 0.9,7.7 1,16c0.1,8.3 6.9,15 15.2,15S31.1,24.3 31,16C30.9,7.7 24.1,1 15.8,1z" /> + android:fillColor="@color/accent" + android:pathData="M16,12.3m-3.8,0a3.8,3.8 0,1 1,7.6 0a3.8,3.8 0,1 1,-7.6 0" + android:strokeAlpha="0.2" /> + android:fillColor="@color/accent" + android:pathData="M23.5,23.5h-15v-1.9c0,-2.5 5,-3.8 7.5,-3.8s7.5,1.3 7.5,3.8V23.5z" + android:strokeAlpha="0.2" /> diff --git a/res/drawable/quantum_ic_email_vd_theme_24.xml b/res/drawable/quantum_ic_email_vd_theme_24.xml index 724f45a770..4f9d12314f 100644 --- a/res/drawable/quantum_ic_email_vd_theme_24.xml +++ b/res/drawable/quantum_ic_email_vd_theme_24.xml @@ -1,5 +1,4 @@ - - + android:width="24dp" + android:height="24dp" + android:tint="@color/accent" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,8l-8,5 -8,-5L4,6l8,5 8,-5v2z" /> diff --git a/res/drawable/quantum_ic_error_vd_theme_24.xml b/res/drawable/quantum_ic_error_vd_theme_24.xml index b9dbeb41db..6ba38ba351 100644 --- a/res/drawable/quantum_ic_error_vd_theme_24.xml +++ b/res/drawable/quantum_ic_error_vd_theme_24.xml @@ -1,5 +1,4 @@ - - + android:width="24dp" + android:height="24dp" + android:tint="@color/accent" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-2h2v2zM13,13h-2L11,7h2v6z" /> diff --git a/res/drawable/quantum_ic_event_vd_theme_24.xml b/res/drawable/quantum_ic_event_vd_theme_24.xml index e0107b1231..d29091acd6 100644 --- a/res/drawable/quantum_ic_event_vd_theme_24.xml +++ b/res/drawable/quantum_ic_event_vd_theme_24.xml @@ -1,5 +1,4 @@ - - + android:width="24dp" + android:height="24dp" + android:tint="@color/accent" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M17,12h-5v5h5v-5zM16,1v2L8,3L8,1L6,1v2L5,3c-1.11,0 -1.99,0.9 -1.99,2L3,19c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2h-1L18,1h-2zM19,19L5,19L5,8h14v11z" /> 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 2f60a68c04..e1f4b1a994 100644 --- a/res/drawable/quantum_ic_expand_less_vd_theme_24.xml +++ b/res/drawable/quantum_ic_expand_less_vd_theme_24.xml @@ -1,5 +1,4 @@ - - + android:width="24dp" + android:height="24dp" + android:tint="@color/accent" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M12,8l-6,6 1.41,1.41L12,10.83l4.59,4.58L18,14z" /> 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 9fbfe48ec3..028834f2be 100644 --- a/res/drawable/quantum_ic_expand_more_vd_theme_24.xml +++ b/res/drawable/quantum_ic_expand_more_vd_theme_24.xml @@ -1,5 +1,4 @@ - - + android:width="24dp" + android:height="24dp" + android:tint="@color/accent" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M16.59,8.59L12,13.17 7.41,8.59 6,10l6,6 6,-6z" /> diff --git a/res/drawable/quantum_ic_hangout_vd_theme_24.xml b/res/drawable/quantum_ic_hangout_vd_theme_24.xml index ab07ba8fd0..1a75360b4c 100644 --- a/res/drawable/quantum_ic_hangout_vd_theme_24.xml +++ b/res/drawable/quantum_ic_hangout_vd_theme_24.xml @@ -1,5 +1,4 @@ - - + android:width="24dp" + android:height="24dp" + android:tint="@color/accent" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M11.5,2C6.81,2 3,5.81 3,10.5S6.81,19 11.5,19h0.5v3.5c4.86,-2.34 8,-7.5 8,-12C20,5.81 16.19,2 11.5,2zM11,11l-1,2L8.5,13l1,-2L8,11L8,8h3v3zM15,11l-1,2h-1.5l1,-2L12,11L12,8h3v3z" /> 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 1ce818a97d..0c277f3216 100644 --- a/res/drawable/quantum_ic_hangout_video_vd_theme_24.xml +++ b/res/drawable/quantum_ic_hangout_video_vd_theme_24.xml @@ -1,5 +1,4 @@ - - + android:width="24dp" + android:height="24dp" + android:tint="@color/accent" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M20,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM18,16l-4,-3.2L14,16L6,16L6,8h8v3.2L18,8v8z" /> diff --git a/res/drawable/quantum_ic_help_vd_theme_24.xml b/res/drawable/quantum_ic_help_vd_theme_24.xml index 385d7204c9..dbd2179b0f 100644 --- a/res/drawable/quantum_ic_help_vd_theme_24.xml +++ b/res/drawable/quantum_ic_help_vd_theme_24.xml @@ -1,5 +1,4 @@ - - + android:width="24dp" + android:height="24dp" + android:tint="@color/accent" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,19h-2v-2h2v2zM15.07,11.25l-0.9,0.92C13.45,12.9 13,13.5 13,15h-2v-0.5c0,-1.1 0.45,-2.1 1.17,-2.83l1.24,-1.26c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2L8,9c0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,0.88 -0.36,1.68 -0.93,2.25z" /> diff --git a/res/drawable/quantum_ic_history_vd_theme_24.xml b/res/drawable/quantum_ic_history_vd_theme_24.xml index 51621fd908..8c31075191 100644 --- a/res/drawable/quantum_ic_history_vd_theme_24.xml +++ b/res/drawable/quantum_ic_history_vd_theme_24.xml @@ -1,5 +1,4 @@ - - + android:width="24dp" + android:height="24dp" + android:tint="@color/accent" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8z" /> 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 247cb1bead..914d8fbe53 100644 --- a/res/drawable/quantum_ic_insert_comment_vd_theme_24.xml +++ b/res/drawable/quantum_ic_insert_comment_vd_theme_24.xml @@ -1,5 +1,4 @@ - - + android:width="24dp" + android:height="24dp" + android:tint="@color/accent" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M20,2L4,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h14l4,4L22,4c0,-1.1 -0.9,-2 -2,-2zM18,14L6,14v-2h12v2zM18,11L6,11L6,9h12v2zM18,8L6,8L6,6h12v2z" /> diff --git a/res/drawable/quantum_ic_label_vd_theme_24.xml b/res/drawable/quantum_ic_label_vd_theme_24.xml index 5630805057..8a84490d0f 100644 --- a/res/drawable/quantum_ic_label_vd_theme_24.xml +++ b/res/drawable/quantum_ic_label_vd_theme_24.xml @@ -1,5 +1,4 @@ - - + android:width="24dp" + android:height="24dp" + android:tint="@color/accent" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M17.63,5.84C17.27,5.33 16.67,5 16,5L5,5.01C3.9,5.01 3,5.9 3,7v10c0,1.1 0.9,1.99 2,1.99L16,19c0.67,0 1.27,-0.33 1.63,-0.84L22,12l-4.37,-6.16z" /> diff --git a/res/drawable/quantum_ic_link_vd_theme_24.xml b/res/drawable/quantum_ic_link_vd_theme_24.xml index 67a167ebab..19590bb0d6 100644 --- a/res/drawable/quantum_ic_link_vd_theme_24.xml +++ b/res/drawable/quantum_ic_link_vd_theme_24.xml @@ -1,5 +1,4 @@ - - + android:width="24dp" + android:height="24dp" + android:tint="@color/accent" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M3.9,12c0,-1.71 1.39,-3.1 3.1,-3.1h4L11,7L7,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5h4v-1.9L7,15.1c-1.71,0 -3.1,-1.39 -3.1,-3.1zM8,13h8v-2L8,11v2zM17,7h-4v1.9h4c1.71,0 3.1,1.39 3.1,3.1s-1.39,3.1 -3.1,3.1h-4L13,17h4c2.76,0 5,-2.24 5,-5s-2.24,-5 -5,-5z" /> diff --git a/res/drawable/quantum_ic_menu_vd_theme_24.xml b/res/drawable/quantum_ic_menu_vd_theme_24.xml index 5b5d7b76eb..0802072b0c 100644 --- a/res/drawable/quantum_ic_menu_vd_theme_24.xml +++ b/res/drawable/quantum_ic_menu_vd_theme_24.xml @@ -1,5 +1,4 @@ - - + android:width="24dp" + android:height="24dp" + android:tint="@color/accent" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M3,18h18v-2L3,16v2zM3,13h18v-2L3,11v2zM3,6v2h18L21,6L3,6z" /> diff --git a/res/drawable/quantum_ic_message_vd_theme_24.xml b/res/drawable/quantum_ic_message_vd_theme_24.xml index a06a1da6ef..0abda0ed1a 100644 --- a/res/drawable/quantum_ic_message_vd_theme_24.xml +++ b/res/drawable/quantum_ic_message_vd_theme_24.xml @@ -1,5 +1,4 @@ - - + android:width="24dp" + android:height="24dp" + android:tint="@color/accent" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M20,2L4,2c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM18,14L6,14v-2h12v2zM18,11L6,11L6,9h12v2zM18,8L6,8L6,6h12v2z" /> diff --git a/res/drawable/quantum_ic_mic_vd_theme_24.xml b/res/drawable/quantum_ic_mic_vd_theme_24.xml index ea4bef41bd..0e537f528c 100644 --- a/res/drawable/quantum_ic_mic_vd_theme_24.xml +++ b/res/drawable/quantum_ic_mic_vd_theme_24.xml @@ -1,5 +1,4 @@ - - + android:width="24dp" + android:height="24dp" + android:tint="@color/accent" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M12,14c1.66,0 2.99,-1.34 2.99,-3L15,5c0,-1.66 -1.34,-3 -3,-3S9,3.34 9,5v6c0,1.66 1.34,3 3,3zM17.3,11c0,3 -2.54,5.1 -5.3,5.1S6.7,14 6.7,11L5,11c0,3.41 2.72,6.23 6,6.72L11,21h2v-3.28c3.28,-0.48 6,-3.3 6,-6.72h-1.7z" /> 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 442451fe1c..b17040c9a4 100644 --- a/res/drawable/quantum_ic_more_vert_vd_theme_24.xml +++ b/res/drawable/quantum_ic_more_vert_vd_theme_24.xml @@ -1,5 +1,4 @@ - - + android:width="24dp" + android:height="24dp" + android:tint="@color/accent" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z" /> 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 d7e0fb430c..020e1fd539 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 @@ -1,5 +1,4 @@ - - + android:width="24dp" + android:height="24dp" + android:tint="@color/accent" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M20,15.5c-1.25,0 -2.45,-0.2 -3.57,-0.57 -0.35,-0.11 -0.74,-0.03 -1.02,0.24l-2.2,2.2c-2.83,-1.44 -5.15,-3.75 -6.59,-6.58l2.2,-2.21c0.28,-0.27 0.36,-0.66 0.25,-1.01C8.7,6.45 8.5,5.25 8.5,4c0,-0.55 -0.45,-1 -1,-1H4c-0.55,0 -1,0.45 -1,1 0,9.39 7.61,17 17,17 0.55,0 1,-0.45 1,-1v-3.5c0,-0.55 -0.45,-1 -1,-1zM12,3v10l3,-3h6V3h-9z" /> 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 48a017f334..0d52c564ac 100644 --- a/res/drawable/quantum_ic_person_add_vd_theme_24.xml +++ b/res/drawable/quantum_ic_person_add_vd_theme_24.xml @@ -1,5 +1,4 @@ - - + android:width="24dp" + android:height="24dp" + android:tint="@color/accent" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M15,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM6,10L6,7L4,7v3L1,10v2h3v3h2v-3h3v-2L6,10zM15,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z" /> diff --git a/res/drawable/quantum_ic_person_vd_theme_24.xml b/res/drawable/quantum_ic_person_vd_theme_24.xml index a5d9c8c063..995317df99 100644 --- a/res/drawable/quantum_ic_person_vd_theme_24.xml +++ b/res/drawable/quantum_ic_person_vd_theme_24.xml @@ -1,5 +1,4 @@ - - + android:width="24dp" + android:height="24dp" + android:tint="@color/accent" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z" /> diff --git a/res/drawable/quantum_ic_phone_vd_theme_24.xml b/res/drawable/quantum_ic_phone_vd_theme_24.xml index 8d37e2bfed..e975f9bf2a 100644 --- a/res/drawable/quantum_ic_phone_vd_theme_24.xml +++ b/res/drawable/quantum_ic_phone_vd_theme_24.xml @@ -1,5 +1,4 @@ - - + android:width="24dp" + android:height="24dp" + android:tint="@color/accent" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M6.62,10.79c1.44,2.83 3.76,5.14 6.59,6.59l2.2,-2.2c0.27,-0.27 0.67,-0.36 1.02,-0.24 1.12,0.37 2.33,0.57 3.57,0.57 0.55,0 1,0.45 1,1V20c0,0.55 -0.45,1 -1,1 -9.39,0 -17,-7.61 -17,-17 0,-0.55 0.45,-1 1,-1h3.5c0.55,0 1,0.45 1,1 0,1.25 0.2,2.45 0.57,3.57 0.11,0.35 0.03,0.74 -0.25,1.02l-2.2,2.2z" /> diff --git a/res/drawable/quantum_ic_place_vd_theme_24.xml b/res/drawable/quantum_ic_place_vd_theme_24.xml index 4276861aa7..3a76b33ba3 100644 --- a/res/drawable/quantum_ic_place_vd_theme_24.xml +++ b/res/drawable/quantum_ic_place_vd_theme_24.xml @@ -1,5 +1,4 @@ - - + android:width="24dp" + android:height="24dp" + android:tint="@color/accent" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.87 -3.13,-7 -7,-7zM12,11.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z" /> diff --git a/res/drawable/quantum_ic_public_vd_theme_24.xml b/res/drawable/quantum_ic_public_vd_theme_24.xml index 6dffe5ce23..ee5199578c 100644 --- a/res/drawable/quantum_ic_public_vd_theme_24.xml +++ b/res/drawable/quantum_ic_public_vd_theme_24.xml @@ -1,5 +1,4 @@ - - + android:width="24dp" + android:height="24dp" + android:tint="@color/accent" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM11,19.93c-3.95,-0.49 -7,-3.85 -7,-7.93 0,-0.62 0.08,-1.21 0.21,-1.79L9,15v1c0,1.1 0.9,2 2,2v1.93zM17.9,17.39c-0.26,-0.81 -1,-1.39 -1.9,-1.39h-1v-3c0,-0.55 -0.45,-1 -1,-1L8,12v-2h2c0.55,0 1,-0.45 1,-1L11,7h2c1.1,0 2,-0.9 2,-2v-0.41c2.93,1.19 5,4.06 5,7.41 0,2.08 -0.8,3.97 -2.1,5.39z" /> diff --git a/res/drawable/quantum_ic_search_vd_theme_24.xml b/res/drawable/quantum_ic_search_vd_theme_24.xml index 03dcbaa98b..025acb6f9f 100644 --- a/res/drawable/quantum_ic_search_vd_theme_24.xml +++ b/res/drawable/quantum_ic_search_vd_theme_24.xml @@ -1,5 +1,4 @@ - - + android:width="24dp" + android:height="24dp" + android:tint="@color/accent" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z" /> diff --git a/res/drawable/quantum_ic_settings_vd_theme_24.xml b/res/drawable/quantum_ic_settings_vd_theme_24.xml index 1867c79553..2a94eec6d9 100644 --- a/res/drawable/quantum_ic_settings_vd_theme_24.xml +++ b/res/drawable/quantum_ic_settings_vd_theme_24.xml @@ -1,5 +1,4 @@ - - + android:width="24dp" + android:height="24dp" + android:tint="@color/accent" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z" /> diff --git a/res/drawable/quantum_ic_share_vd_theme_24.xml b/res/drawable/quantum_ic_share_vd_theme_24.xml index f024a22efd..e63c2f9a6d 100644 --- a/res/drawable/quantum_ic_share_vd_theme_24.xml +++ b/res/drawable/quantum_ic_share_vd_theme_24.xml @@ -1,5 +1,4 @@ - - + android:width="24dp" + android:height="24dp" + android:tint="@color/accent" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z" /> 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 2bc9387f6a..da49aa4402 100644 --- a/res/drawable/quantum_ic_sim_card_vd_theme_24.xml +++ b/res/drawable/quantum_ic_sim_card_vd_theme_24.xml @@ -1,5 +1,4 @@ - - + android:width="24dp" + android:height="24dp" + android:tint="@color/accent" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M19.99,4c0,-1.1 -0.89,-2 -1.99,-2h-8L4,8v12c0,1.1 0.9,2 2,2h12.01c1.1,0 1.99,-0.9 1.99,-2l-0.01,-16zM9,19L7,19v-2h2v2zM17,19h-2v-2h2v2zM9,15L7,15v-4h2v4zM13,19h-2v-4h2v4zM13,13h-2v-2h2v2zM17,15h-2v-4h2v4z" /> diff --git a/res/drawable/quantum_ic_smartphone_vd_theme_24.xml b/res/drawable/quantum_ic_smartphone_vd_theme_24.xml index 9f987e75cb..0c824a6cbe 100644 --- a/res/drawable/quantum_ic_smartphone_vd_theme_24.xml +++ b/res/drawable/quantum_ic_smartphone_vd_theme_24.xml @@ -1,5 +1,4 @@ - - + android:width="24dp" + android:height="24dp" + android:tint="@color/accent" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M17,1.01L7,1c-1.1,0 -2,0.9 -2,2v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,19H7V5h10v14z" /> 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 e266072cde..2a6605c1ed 100644 --- a/res/drawable/quantum_ic_star_border_vd_theme_24.xml +++ b/res/drawable/quantum_ic_star_border_vd_theme_24.xml @@ -1,5 +1,4 @@ - - + android:width="24dp" + android:height="24dp" + android:tint="@color/accent" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z" /> diff --git a/res/drawable/quantum_ic_star_vd_theme_24.xml b/res/drawable/quantum_ic_star_vd_theme_24.xml index f5a93c6f03..5334917900 100644 --- a/res/drawable/quantum_ic_star_vd_theme_24.xml +++ b/res/drawable/quantum_ic_star_vd_theme_24.xml @@ -1,5 +1,4 @@ - - + android:width="24dp" + android:height="24dp" + android:tint="@color/accent" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z" /> diff --git a/res/drawable/quantum_ic_videocam_vd_theme_24.xml b/res/drawable/quantum_ic_videocam_vd_theme_24.xml index 87408576b6..3a73ef3a7d 100644 --- a/res/drawable/quantum_ic_videocam_vd_theme_24.xml +++ b/res/drawable/quantum_ic_videocam_vd_theme_24.xml @@ -1,5 +1,4 @@ - - + android:width="24dp" + android:height="24dp" + android:tint="@color/accent" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M17,10.5V7c0,-0.55 -0.45,-1 -1,-1H4c-0.55,0 -1,0.45 -1,1v10c0,0.55 0.45,1 1,1h12c0.55,0 1,-0.45 1,-1v-3.5l4,4v-11l-4,4z" /> diff --git a/res/drawable/quantum_launchscreen_contacts.xml b/res/drawable/quantum_launchscreen_contacts.xml index 276b2da337..2785e6536e 100755 --- a/res/drawable/quantum_launchscreen_contacts.xml +++ b/res/drawable/quantum_launchscreen_contacts.xml @@ -16,7 +16,7 @@ - + diff --git a/res/layout-v23/edit_spinner.xml b/res/layout-v23/edit_spinner.xml index 37015f7166..63dcc01399 100644 --- a/res/layout-v23/edit_spinner.xml +++ b/res/layout-v23/edit_spinner.xml @@ -25,4 +25,5 @@ android:layout_height="@dimen/editor_min_line_item_height" android:paddingBottom="0dp" android:paddingTop="0dp" + android:popupBackground="@color/color_default_background" android:paddingEnd="@dimen/editor_spinner_right_padding_workaround"/> \ No newline at end of file diff --git a/res/layout/contact_editor_fields.xml b/res/layout/contact_editor_fields.xml index b9bda16980..6a1024219e 100644 --- a/res/layout/contact_editor_fields.xml +++ b/res/layout/contact_editor_fields.xml @@ -35,7 +35,7 @@ padding (start margin + icon width + end margin) for this to line up with the start of the edit fields. --> diff --git a/res/layout/date_picker.xml b/res/layout/date_picker.xml index 9bfb8de996..3ff874f0c8 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 635f90e504..3dae2a8099 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 61513ebe91..977345f86a 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/edit_delete_button.xml b/res/layout/edit_delete_button.xml index 2eea95057b..7776956874 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/edit_simple_spinner_item.xml b/res/layout/edit_simple_spinner_item.xml index 35b5ab495f..43f5321857 100644 --- a/res/layout/edit_simple_spinner_item.xml +++ b/res/layout/edit_simple_spinner_item.xml @@ -22,7 +22,7 @@ android:id="@android:id/text1" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?android:attr/editTextBackground" + android:background="@color/color_default_background" android:gravity="center_vertical" android:paddingStart="0dp" android:paddingEnd="0dp" diff --git a/res/layout/edit_spinner.xml b/res/layout/edit_spinner.xml index b1c879cdd9..8893ea24fd 100644 --- a/res/layout/edit_spinner.xml +++ b/res/layout/edit_spinner.xml @@ -20,9 +20,9 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/spinner" android:layout_gravity="bottom|start" - style="@android:style/Widget.Material.Spinner.Underlined" android:layout_width="wrap_content" android:layout_height="@dimen/editor_min_line_item_height" android:paddingBottom="0dp" android:paddingTop="0dp" + android:popupBackground="@color/color_default_background" android:paddingRight="@dimen/editor_spinner_right_padding"/> \ No newline at end of file diff --git a/res/layout/editor_account_header.xml b/res/layout/editor_account_header.xml index 9a4ed803b4..5697ac05cb 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 09e2c6694c..24fbfdffdd 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/group_membership_list_item.xml b/res/layout/group_membership_list_item.xml index 19e8d80bdb..9d327d3c97 100644 --- a/res/layout/group_membership_list_item.xml +++ b/res/layout/group_membership_list_item.xml @@ -25,4 +25,6 @@ android:paddingRight="6dip" android:paddingStart="6dip" android:paddingEnd="6dip" + android:background="@color/color_default_background" + android:textColor="@color/color_default_primary_text" /> diff --git a/res/layout/name_edit_expansion_view.xml b/res/layout/name_edit_expansion_view.xml index 066850f9aa..01064495b1 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 64bac9987f..0c862b4c25 100644 --- a/res/layout/quickcontact_collapsed_suggestion_card.xml +++ b/res/layout/quickcontact_collapsed_suggestion_card.xml @@ -1,5 +1,4 @@ - - + android:layout_height="@dimen/quickcontact_collapse_view_height" + android:visibility="gone"> + android:orientation="horizontal"> + android:layout_width="@dimen/quickcontact_collapse_icon_size" + android:layout_height="@dimen/quickcontact_collapse_icon_size" + android:layout_gravity="center_vertical" + android:layout_margin="@dimen/quickcontact_collapse_image_padding" + android:src="@drawable/quantum_ic_assistant_vd_theme_24" + android:tint="@color/accent" /> + android:id="@+id/collapsed_suggestion_card_title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="8dp" + android:layout_weight="1" + android:ellipsize="end" + android:paddingTop="@dimen/quickcontact_collapse_text_padding" + android:singleLine="true" + android:textAlignment="viewStart" + android:textColor="@color/quickcontact_entry_header_text_color" + android:textSize="@dimen/expanding_entry_card_title_text_size" /> - > + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentEnd="true" + android:layout_gravity="center_vertical|end" + android:paddingStart="@dimen/editor_round_button_padding_left" + android:paddingTop="@dimen/editor_round_button_padding_top" + android:paddingEnd="@dimen/editor_round_button_padding_right" + android:paddingBottom="@dimen/editor_round_button_padding_bottom" + android:src="@drawable/quantum_ic_expand_more_vd_theme_24" + android:tint="@color/accent" /> + + > \ No newline at end of file diff --git a/res/layout/quickcontact_content.xml b/res/layout/quickcontact_content.xml index b6cff4b14c..a536d2413f 100644 --- a/res/layout/quickcontact_content.xml +++ b/res/layout/quickcontact_content.xml @@ -20,7 +20,7 @@ android:layout_height="match_parent" android:fillViewport="true" android:id="@+id/content_scroller" - android:background="@color/card_margin_color"> + android:background="@color/color_default_background"> diff --git a/res/layout/search_bar_expanded.xml b/res/layout/search_bar_expanded.xml index bb2f579c67..e38d2b4eef 100644 --- a/res/layout/search_bar_expanded.xml +++ b/res/layout/search_bar_expanded.xml @@ -54,7 +54,7 @@ android:layout_width="@dimen/search_box_close_icon_size" android:padding="@dimen/search_box_close_icon_padding" android:src="@drawable/quantum_ic_close_vd_theme_24" - android:tint="@color/color_default_blue1" + android:tint="@color/accent" android:clickable="true" android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/description_clear_search" /> diff --git a/res/layout/select_dialog_item.xml b/res/layout/select_dialog_item.xml index 05f2ae5a2a..a25750bf93 100644 --- a/res/layout/select_dialog_item.xml +++ b/res/layout/select_dialog_item.xml @@ -38,6 +38,7 @@ android:ellipsize="marquee" android:gravity="start|center_vertical" android:textAlignment="viewStart" + android:textColor="@color/color_default_primary_text" android:textAppearance="?android:textAppearanceListItem" android:textSize="16sp"/> @@ -49,6 +50,6 @@ android:gravity="center_vertical|start" android:textAlignment="viewStart" android:textAppearance="?android:textAppearanceListItemSecondary" - android:textColor="?android:textColorSecondary" + android:textColor="@color/color_default_secondary_text" /> \ No newline at end of file diff --git a/res/layout/selection_bar.xml b/res/layout/selection_bar.xml index 272a2fcf9d..02121ccef9 100644 --- a/res/layout/selection_bar.xml +++ b/res/layout/selection_bar.xml @@ -25,7 +25,7 @@ android:layout_width="@dimen/selection_bar_close_icon_size" android:layout_height="@dimen/selection_bar_close_icon_size" android:layout_gravity="center_vertical|start" - android:tint="@color/quantum_black_secondary_text" + android:tint="@color/accent" android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/action_menu_back_from_edit_select" android:src="@drawable/quantum_ic_close_vd_theme_24"/> @@ -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 4647049f72..4553805416 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/menu/edit_contact.xml b/res/menu/edit_contact.xml index b30934e67c..94a3824d5c 100644 --- a/res/menu/edit_contact.xml +++ b/res/menu/edit_contact.xml @@ -17,8 +17,8 @@ - + xmlns:app="http://schemas.android.com/tools" + xmlns:contacts="http://schemas.android.com/apk/res-auto"> + android:visible="false" /> + app:iconTint="@color/accent" + contacts:showAsAction="ifRoom" /> + app:iconTint="@color/accent" + contacts:showAsAction="ifRoom" /> + app:iconTint="@color/accent" + contacts:showAsAction="ifRoom" /> diff --git a/res/values-night-v27/styles.xml b/res/values-night-v27/styles.xml new file mode 100644 index 0000000000..dc1c0d7c0e --- /dev/null +++ b/res/values-night-v27/styles.xml @@ -0,0 +1,22 @@ + + + + + + + + + + \ No newline at end of file diff --git a/res/values-night/styles.xml b/res/values-night/styles.xml new file mode 100644 index 0000000000..e9adaebdff --- /dev/null +++ b/res/values-night/styles.xml @@ -0,0 +1,4 @@ + + + - - - - + \ No newline at end of file diff --git a/res/values/colors.xml b/res/values/colors.xml index 11a0991866..fddefbb966 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -14,45 +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 - - #0f000000 + @color/primary_color_dark + @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_foreground - @lineageos.platform:color/color_default_foreground + @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 - #546E7A - #607D8B @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 @@ -64,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 @@ -82,22 +81,22 @@ @color/background_primary - #7f7f7f + @color/accent - #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 @@ -109,27 +108,27 @@ #a0ffffff - #363636 + @color/color_default_primary_text - @color/dialtacts_secondary_text_color + @color/color_default_secondary_text - #A1A1A1 + @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 @@ -192,81 +191,81 @@ #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 @lineageos.platform:color/color_default_background + #d1041c - #000000 + @color/accent - #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 - #000000 diff --git a/res/values/styles.xml b/res/values/styles.xml index 762daad0c5..bcf26aff85 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -1,5 +1,4 @@ - - - + - - - + + + + + - - @@ -263,10 +287,9 @@ - - @@ -290,27 +312,45 @@ @color/accent - + - + + - + - + @@ -471,16 +524,17 @@ background and text color. See also android:style/Widget.Holo.TextView.ListSepar + + + + 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 0000000000..e9642a6062 --- /dev/null +++ b/res/drawable/quantum_ic_create_white_vd_theme_24.xml @@ -0,0 +1,25 @@ + + + + + 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 0000000000..2c2c6e46a4 --- /dev/null +++ b/res/drawable/quantum_ic_person_add_white_vd_theme_24.xml @@ -0,0 +1,25 @@ + + + + + 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 0000000000..387287c970 --- /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_white_vd_theme_24.xml b/res/drawable/quantum_ic_star_white_vd_theme_24.xml new file mode 100644 index 0000000000..697dd11cca --- /dev/null +++ b/res/drawable/quantum_ic_star_white_vd_theme_24.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/res/values/styles.xml b/res/values/styles.xml index bcf26aff85..f8b3986224 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -38,6 +38,11 @@ + + + + diff --git a/src/com/android/contacts/detail/ContactDisplayUtils.java b/src/com/android/contacts/detail/ContactDisplayUtils.java index ef9124aed2..edf01d4ce8 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/drawer/DrawerAdapter.java b/src/com/android/contacts/drawer/DrawerAdapter.java index d22dc57cba..2b545846c0 100644 --- a/src/com/android/contacts/drawer/DrawerAdapter.java +++ b/src/com/android/contacts/drawer/DrawerAdapter.java @@ -392,7 +392,7 @@ 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); + iconView.setColorFilter(mActivity.getResources().getColor(R.color.accent), android.graphics.PorterDuff.Mode.MULTIPLY); result.setId(item.id); updateSelectedStatus(textView, iconView, false); return result; diff --git a/src/com/android/contacts/editor/PhotoSourceDialogFragment.java b/src/com/android/contacts/editor/PhotoSourceDialogFragment.java index 9b9b4d1ad5..52c45ec745 100644 --- a/src/com/android/contacts/editor/PhotoSourceDialogFragment.java +++ b/src/com/android/contacts/editor/PhotoSourceDialogFragment.java @@ -93,10 +93,10 @@ public class PhotoSourceDialogFragment extends DialogFragment { }; // Build the AlertDialog - final TextView title = (TextView) View.inflate(getActivity(), R.layout.dialog_title, null); - title.setText(R.string.menu_change_photo); + /*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(), R.style.ContactsAlertDialogTheme); - builder.setCustomTitle(title); + builder.setTitle(R.string.menu_change_photo); builder.setItems(items, clickListener); builder.setNegativeButton(android.R.string.cancel, /* listener =*/ null); return builder.create(); diff --git a/src/com/android/contacts/model/account/AccountType.java b/src/com/android/contacts/model/account/AccountType.java index c3e0eb5c97..dd351f2ef2 100644 --- a/src/com/android/contacts/model/account/AccountType.java +++ b/src/com/android/contacts/model/account/AccountType.java @@ -16,10 +16,12 @@ package com.android.contacts.model.account; +import android.support.v4.content.ContextCompat; import android.accounts.AuthenticatorDescription; import android.content.ContentValues; import android.content.Context; import android.content.pm.PackageManager; +import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.provider.ContactsContract.CommonDataKinds.Phone; import android.provider.ContactsContract.CommonDataKinds.StructuredPostal; @@ -274,7 +276,10 @@ public abstract class AccountType { } public Drawable getDisplayIcon(Context context) { - return getDisplayIcon(context, titleRes, iconRes, syncAdapterPackageName); + Drawable icon = getDisplayIcon(context, titleRes, iconRes, syncAdapterPackageName); + icon.mutate().setColorFilter(ContextCompat.getColor(context, R.color.accent), + PorterDuff.Mode.MULTIPLY); + return icon; } public static Drawable getDisplayIcon(Context context, int titleRes, int iconRes, diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java index 1342f152d8..3e648eddd4 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 android.support.v4.content.ContextCompat; import android.Manifest; import android.accounts.Account; import android.animation.ArgbEvaluator; @@ -1424,6 +1425,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.MULTIPLY); final Entry phonePromptEntry = new Entry(CARD_ENTRY_ID_EDIT_CONTACT, phoneIcon, getString(R.string.quickcontact_add_phone_number), /* subHeader = */ null, /* subHeaderIcon = */ null, /* text = */ null, @@ -1446,6 +1449,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.MULTIPLY); final Entry emailPromptEntry = new Entry(CARD_ENTRY_ID_EDIT_CONTACT, emailIcon, getString(R.string.quickcontact_add_email), /* subHeader = */ null, /* subHeaderIcon = */ null, @@ -2821,10 +2826,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(getMenuTitle(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(getMenuTitle(R.string.menu_editContact)); } else { editMenuItem.setVisible(false); -- GitLab From 673492c5b65e52079896a66c24df823f41e36504 Mon Sep 17 00:00:00 2001 From: Fahim Date: Fri, 18 Jun 2021 17:29:47 +0600 Subject: [PATCH 3/5] update according to review --- res/layout/drawer_item.xml | 2 +- .../quickcontact/QuickContactActivity.java | 29 +++++++++++++------ 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/res/layout/drawer_item.xml b/res/layout/drawer_item.xml index 1bb6c7faee..ca9acfa8ca 100644 --- a/res/layout/drawer_item.xml +++ b/res/layout/drawer_item.xml @@ -20,7 +20,7 @@ style="@style/DrawerItemStyle"> diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java index 3e648eddd4..a471f354ec 100644 --- a/src/com/android/contacts/quickcontact/QuickContactActivity.java +++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java @@ -1426,7 +1426,7 @@ public class QuickContactActivity extends ContactsActivity { final Drawable phoneIcon = ResourcesCompat.getDrawable(getResources(), lineageos.platform.R.drawable.ic_phone, null).mutate(); phoneIcon.setColorFilter(ContextCompat.getColor(this, R.color.accent), - PorterDuff.Mode.MULTIPLY); + 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, @@ -1449,8 +1449,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.MULTIPLY); + 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, @@ -1470,8 +1470,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) { @@ -1480,7 +1482,7 @@ public class QuickContactActivity extends ContactsActivity { } mNoContactDetailsCard.setVisibility(View.VISIBLE); mNoContactDetailsCard.setEntryHeaderColor(subHeaderTextColor); - mNoContactDetailsCard.setColorAndFilter(subHeaderTextColor, greyColorFilter); + mNoContactDetailsCard.setColorAndFilter(subHeaderTextColor, accentColorFilter); } /** @@ -2290,13 +2292,15 @@ public class QuickContactActivity extends ContactsActivity { private void setThemeColor(MaterialPalette palette) { // If the color is invalid, use the predefined default + final int accentColor = getResources().getColor( + R.color.accent); + mColorFilter = + new PorterDuffColorFilter(accentColor, PorterDuff.Mode.SRC_ATOP); mColorFilterColor = palette.mPrimaryColor; mScroller.setHeaderTintColor(mColorFilterColor); mStatusBarColor = palette.mSecondaryColor; updateStatusBarColor(); - mColorFilter = - new PorterDuffColorFilter(mColorFilterColor, PorterDuff.Mode.SRC_ATOP); mContactCard.setColorAndFilter(mColorFilterColor, mColorFilter); mRecentCard.setColorAndFilter(mColorFilterColor, mColorFilter); mAboutCard.setColorAndFilter(mColorFilterColor, mColorFilter); @@ -2598,7 +2602,7 @@ public class QuickContactActivity extends ContactsActivity { permissionExplanationEntries.add(new ArrayList()); permissionExplanationEntries.get(0).add(permissionExplanationEntry); - final int subHeaderTextColor = getResources().getColor(android.R.color.white); + final int subHeaderTextColor = getResources().getColor(R.color.secondary_text_color); final PorterDuffColorFilter whiteColorFilter = new PorterDuffColorFilter(subHeaderTextColor, PorterDuff.Mode.SRC_ATOP); @@ -2879,6 +2883,13 @@ public class QuickContactActivity extends ContactsActivity { helpMenu.setTitle(getMenuTitle(R.string.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; -- GitLab From b2d0a7e772d84d35f4ab8afe4bfde2f49668752d Mon Sep 17 00:00:00 2001 From: Fahim Date: Fri, 18 Jun 2021 20:14:31 +0600 Subject: [PATCH 4/5] fix colors --- ...quantum_ic_more_vert_white_vd_theme_24.xml | 25 +++++++++++++++++++ res/values/styles.xml | 6 +++++ .../contacts/drawer/DrawerAdapter.java | 2 +- .../editor/AccountHeaderPresenter.java | 8 +++++- .../quickcontact/QuickContactActivity.java | 6 ++--- 5 files changed, 41 insertions(+), 6 deletions(-) create mode 100644 res/drawable/quantum_ic_more_vert_white_vd_theme_24.xml 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 0000000000..abff19f474 --- /dev/null +++ b/res/drawable/quantum_ic_more_vert_white_vd_theme_24.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/res/values/styles.xml b/res/values/styles.xml index f8b3986224..de524f5829 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -41,6 +41,7 @@ + +