diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-03-27 07:02:50 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-03-27 07:02:50 +0000 |
commit | 9c6dcccc8c5a4a3eb1b9cc847c22f717b5637a89 (patch) | |
tree | 4b1a1be6276a96458659a34c8cf05f5289b92bbb /assets/quantum | |
parent | 476debe7b0e61ce1b6d53f2852cfd9190d976aee (diff) | |
parent | 1a8ee5e9b5395e485bcadb38cb716e4731591b44 (diff) |
Merge changes I581d3c9e,Idc52f4e9,Ia8abb468
* changes:
Remove TODOs left for M in the new call log as the min SDK has been bumped to N.
Change the maximum number of notifications per tag from 10 to 8.
Replace png icon with vector drawable for voice call screen.
Diffstat (limited to 'assets/quantum')
26 files changed, 25 insertions, 0 deletions
diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_call_merge_white_36.png b/assets/quantum/res/drawable-hdpi/quantum_ic_call_merge_white_36.png Binary files differdeleted file mode 100644 index b7aba8072..000000000 --- a/assets/quantum/res/drawable-hdpi/quantum_ic_call_merge_white_36.png +++ /dev/null diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_dialpad_white_36.png b/assets/quantum/res/drawable-hdpi/quantum_ic_dialpad_white_36.png Binary files differdeleted file mode 100644 index 82710e72a..000000000 --- a/assets/quantum/res/drawable-hdpi/quantum_ic_dialpad_white_36.png +++ /dev/null diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_group_white_36.png b/assets/quantum/res/drawable-hdpi/quantum_ic_group_white_36.png Binary files differdeleted file mode 100644 index f98a074ac..000000000 --- a/assets/quantum/res/drawable-hdpi/quantum_ic_group_white_36.png +++ /dev/null diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_pause_white_36.png b/assets/quantum/res/drawable-hdpi/quantum_ic_pause_white_36.png Binary files differdeleted file mode 100644 index 1d024393a..000000000 --- a/assets/quantum/res/drawable-hdpi/quantum_ic_pause_white_36.png +++ /dev/null diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_videocam_white_36.png b/assets/quantum/res/drawable-hdpi/quantum_ic_videocam_white_36.png Binary files differdeleted file mode 100644 index 49562a640..000000000 --- a/assets/quantum/res/drawable-hdpi/quantum_ic_videocam_white_36.png +++ /dev/null diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_call_merge_white_36.png b/assets/quantum/res/drawable-mdpi/quantum_ic_call_merge_white_36.png Binary files differdeleted file mode 100644 index a2eb54bab..000000000 --- a/assets/quantum/res/drawable-mdpi/quantum_ic_call_merge_white_36.png +++ /dev/null diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_dialpad_white_36.png b/assets/quantum/res/drawable-mdpi/quantum_ic_dialpad_white_36.png Binary files differdeleted file mode 100644 index 9037f94e8..000000000 --- a/assets/quantum/res/drawable-mdpi/quantum_ic_dialpad_white_36.png +++ /dev/null diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_group_white_36.png b/assets/quantum/res/drawable-mdpi/quantum_ic_group_white_36.png Binary files differdeleted file mode 100644 index 25e443424..000000000 --- a/assets/quantum/res/drawable-mdpi/quantum_ic_group_white_36.png +++ /dev/null diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_pause_white_36.png b/assets/quantum/res/drawable-mdpi/quantum_ic_pause_white_36.png Binary files differdeleted file mode 100644 index 4d2ea05c4..000000000 --- a/assets/quantum/res/drawable-mdpi/quantum_ic_pause_white_36.png +++ /dev/null diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_videocam_white_36.png b/assets/quantum/res/drawable-mdpi/quantum_ic_videocam_white_36.png Binary files differdeleted file mode 100644 index d83e0d50c..000000000 --- a/assets/quantum/res/drawable-mdpi/quantum_ic_videocam_white_36.png +++ /dev/null diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_call_merge_white_36.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_call_merge_white_36.png Binary files differdeleted file mode 100644 index 01daecf65..000000000 --- a/assets/quantum/res/drawable-xhdpi/quantum_ic_call_merge_white_36.png +++ /dev/null diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_dialpad_white_36.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_dialpad_white_36.png Binary files differdeleted file mode 100644 index 175000510..000000000 --- a/assets/quantum/res/drawable-xhdpi/quantum_ic_dialpad_white_36.png +++ /dev/null diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_group_white_36.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_group_white_36.png Binary files differdeleted file mode 100644 index 7f0b7e903..000000000 --- a/assets/quantum/res/drawable-xhdpi/quantum_ic_group_white_36.png +++ /dev/null diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_pause_white_36.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_pause_white_36.png Binary files differdeleted file mode 100644 index 7192ad487..000000000 --- a/assets/quantum/res/drawable-xhdpi/quantum_ic_pause_white_36.png +++ /dev/null diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_videocam_white_36.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_videocam_white_36.png Binary files differdeleted file mode 100644 index 44c28e2f2..000000000 --- a/assets/quantum/res/drawable-xhdpi/quantum_ic_videocam_white_36.png +++ /dev/null diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_call_merge_white_36.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_call_merge_white_36.png Binary files differdeleted file mode 100644 index cefef6551..000000000 --- a/assets/quantum/res/drawable-xxhdpi/quantum_ic_call_merge_white_36.png +++ /dev/null diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_dialpad_white_36.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_dialpad_white_36.png Binary files differdeleted file mode 100644 index 54ebbafae..000000000 --- a/assets/quantum/res/drawable-xxhdpi/quantum_ic_dialpad_white_36.png +++ /dev/null diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_group_white_36.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_group_white_36.png Binary files differdeleted file mode 100644 index 952e15fa6..000000000 --- a/assets/quantum/res/drawable-xxhdpi/quantum_ic_group_white_36.png +++ /dev/null diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_pause_white_36.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_pause_white_36.png Binary files differdeleted file mode 100644 index a03bad27e..000000000 --- a/assets/quantum/res/drawable-xxhdpi/quantum_ic_pause_white_36.png +++ /dev/null diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_videocam_white_36.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_videocam_white_36.png Binary files differdeleted file mode 100644 index 839af26f8..000000000 --- a/assets/quantum/res/drawable-xxhdpi/quantum_ic_videocam_white_36.png +++ /dev/null diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_call_merge_white_36.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_call_merge_white_36.png Binary files differdeleted file mode 100644 index 9419ffbbc..000000000 --- a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_call_merge_white_36.png +++ /dev/null diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_dialpad_white_36.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_dialpad_white_36.png Binary files differdeleted file mode 100644 index a53aeb1d3..000000000 --- a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_dialpad_white_36.png +++ /dev/null diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_group_white_36.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_group_white_36.png Binary files differdeleted file mode 100644 index dacf29932..000000000 --- a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_group_white_36.png +++ /dev/null diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_pause_white_36.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_pause_white_36.png Binary files differdeleted file mode 100644 index 3ea7e03e5..000000000 --- a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_pause_white_36.png +++ /dev/null diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_videocam_white_36.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_videocam_white_36.png Binary files differdeleted file mode 100644 index eff5923da..000000000 --- a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_videocam_white_36.png +++ /dev/null diff --git a/assets/quantum/res/drawable/quantum_ic_call_merge_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_call_merge_vd_theme_24.xml new file mode 100644 index 000000000..660faf4d6 --- /dev/null +++ b/assets/quantum/res/drawable/quantum_ic_call_merge_vd_theme_24.xml @@ -0,0 +1,25 @@ +<!-- + ~ Copyright (C) 2018 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License + --> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0" + android:tint="?attr/colorControlNormal"> + <path + android:fillColor="@android:color/white" + android:pathData="M17,20.41L18.41,19 15,15.59 13.59,17 17,20.41zM7.5,8H11v5.59L5.59,19 7,20.41l6,-6V8h3.5L12,3.5 7.5,8z"/> +</vector> |