summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2018-03-27 07:02:50 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2018-03-27 07:02:50 +0000
commit9c6dcccc8c5a4a3eb1b9cc847c22f717b5637a89 (patch)
tree4b1a1be6276a96458659a34c8cf05f5289b92bbb
parent476debe7b0e61ce1b6d53f2852cfd9190d976aee (diff)
parent1a8ee5e9b5395e485bcadb38cb716e4731591b44 (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.
-rw-r--r--assets/quantum/res/drawable-hdpi/quantum_ic_call_merge_white_36.pngbin258 -> 0 bytes
-rw-r--r--assets/quantum/res/drawable-hdpi/quantum_ic_dialpad_white_36.pngbin549 -> 0 bytes
-rw-r--r--assets/quantum/res/drawable-hdpi/quantum_ic_group_white_36.pngbin341 -> 0 bytes
-rw-r--r--assets/quantum/res/drawable-hdpi/quantum_ic_pause_white_36.pngbin124 -> 0 bytes
-rw-r--r--assets/quantum/res/drawable-hdpi/quantum_ic_videocam_white_36.pngbin222 -> 0 bytes
-rw-r--r--assets/quantum/res/drawable-mdpi/quantum_ic_call_merge_white_36.pngbin208 -> 0 bytes
-rw-r--r--assets/quantum/res/drawable-mdpi/quantum_ic_dialpad_white_36.pngbin264 -> 0 bytes
-rw-r--r--assets/quantum/res/drawable-mdpi/quantum_ic_group_white_36.pngbin236 -> 0 bytes
-rw-r--r--assets/quantum/res/drawable-mdpi/quantum_ic_pause_white_36.pngbin105 -> 0 bytes
-rw-r--r--assets/quantum/res/drawable-mdpi/quantum_ic_videocam_white_36.pngbin173 -> 0 bytes
-rw-r--r--assets/quantum/res/drawable-xhdpi/quantum_ic_call_merge_white_36.pngbin287 -> 0 bytes
-rw-r--r--assets/quantum/res/drawable-xhdpi/quantum_ic_dialpad_white_36.pngbin362 -> 0 bytes
-rw-r--r--assets/quantum/res/drawable-xhdpi/quantum_ic_group_white_36.pngbin417 -> 0 bytes
-rw-r--r--assets/quantum/res/drawable-xhdpi/quantum_ic_pause_white_36.pngbin92 -> 0 bytes
-rw-r--r--assets/quantum/res/drawable-xhdpi/quantum_ic_videocam_white_36.pngbin234 -> 0 bytes
-rw-r--r--assets/quantum/res/drawable-xxhdpi/quantum_ic_call_merge_white_36.pngbin388 -> 0 bytes
-rw-r--r--assets/quantum/res/drawable-xxhdpi/quantum_ic_dialpad_white_36.pngbin452 -> 0 bytes
-rw-r--r--assets/quantum/res/drawable-xxhdpi/quantum_ic_group_white_36.pngbin581 -> 0 bytes
-rw-r--r--assets/quantum/res/drawable-xxhdpi/quantum_ic_pause_white_36.pngbin158 -> 0 bytes
-rw-r--r--assets/quantum/res/drawable-xxhdpi/quantum_ic_videocam_white_36.pngbin350 -> 0 bytes
-rw-r--r--assets/quantum/res/drawable-xxxhdpi/quantum_ic_call_merge_white_36.pngbin435 -> 0 bytes
-rw-r--r--assets/quantum/res/drawable-xxxhdpi/quantum_ic_dialpad_white_36.pngbin754 -> 0 bytes
-rw-r--r--assets/quantum/res/drawable-xxxhdpi/quantum_ic_group_white_36.pngbin809 -> 0 bytes
-rw-r--r--assets/quantum/res/drawable-xxxhdpi/quantum_ic_pause_white_36.pngbin110 -> 0 bytes
-rw-r--r--assets/quantum/res/drawable-xxxhdpi/quantum_ic_videocam_white_36.pngbin437 -> 0 bytes
-rw-r--r--assets/quantum/res/drawable/quantum_ic_call_merge_vd_theme_24.xml25
-rw-r--r--java/com/android/dialer/calllog/datasources/systemcalllog/SystemCallLogDataSource.java5
-rw-r--r--java/com/android/dialer/notification/NotificationThrottler.java2
-rw-r--r--java/com/android/incallui/incall/impl/ButtonController.java18
-rw-r--r--java/com/android/incallui/incall/impl/CheckableLabeledButton.java5
-rw-r--r--java/com/android/incallui/incall/impl/res/values/dimens.xml1
31 files changed, 41 insertions, 15 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
deleted file mode 100644
index b7aba8072..000000000
--- a/assets/quantum/res/drawable-hdpi/quantum_ic_call_merge_white_36.png
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index 82710e72a..000000000
--- a/assets/quantum/res/drawable-hdpi/quantum_ic_dialpad_white_36.png
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index f98a074ac..000000000
--- a/assets/quantum/res/drawable-hdpi/quantum_ic_group_white_36.png
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index 1d024393a..000000000
--- a/assets/quantum/res/drawable-hdpi/quantum_ic_pause_white_36.png
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index 49562a640..000000000
--- a/assets/quantum/res/drawable-hdpi/quantum_ic_videocam_white_36.png
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index a2eb54bab..000000000
--- a/assets/quantum/res/drawable-mdpi/quantum_ic_call_merge_white_36.png
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index 9037f94e8..000000000
--- a/assets/quantum/res/drawable-mdpi/quantum_ic_dialpad_white_36.png
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index 25e443424..000000000
--- a/assets/quantum/res/drawable-mdpi/quantum_ic_group_white_36.png
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index 4d2ea05c4..000000000
--- a/assets/quantum/res/drawable-mdpi/quantum_ic_pause_white_36.png
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index d83e0d50c..000000000
--- a/assets/quantum/res/drawable-mdpi/quantum_ic_videocam_white_36.png
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index 01daecf65..000000000
--- a/assets/quantum/res/drawable-xhdpi/quantum_ic_call_merge_white_36.png
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index 175000510..000000000
--- a/assets/quantum/res/drawable-xhdpi/quantum_ic_dialpad_white_36.png
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index 7f0b7e903..000000000
--- a/assets/quantum/res/drawable-xhdpi/quantum_ic_group_white_36.png
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index 7192ad487..000000000
--- a/assets/quantum/res/drawable-xhdpi/quantum_ic_pause_white_36.png
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index 44c28e2f2..000000000
--- a/assets/quantum/res/drawable-xhdpi/quantum_ic_videocam_white_36.png
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index cefef6551..000000000
--- a/assets/quantum/res/drawable-xxhdpi/quantum_ic_call_merge_white_36.png
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index 54ebbafae..000000000
--- a/assets/quantum/res/drawable-xxhdpi/quantum_ic_dialpad_white_36.png
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index 952e15fa6..000000000
--- a/assets/quantum/res/drawable-xxhdpi/quantum_ic_group_white_36.png
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index a03bad27e..000000000
--- a/assets/quantum/res/drawable-xxhdpi/quantum_ic_pause_white_36.png
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index 839af26f8..000000000
--- a/assets/quantum/res/drawable-xxhdpi/quantum_ic_videocam_white_36.png
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index 9419ffbbc..000000000
--- a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_call_merge_white_36.png
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index a53aeb1d3..000000000
--- a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_dialpad_white_36.png
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index dacf29932..000000000
--- a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_group_white_36.png
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index 3ea7e03e5..000000000
--- a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_pause_white_36.png
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index eff5923da..000000000
--- a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_videocam_white_36.png
+++ /dev/null
Binary files differ
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>
diff --git a/java/com/android/dialer/calllog/datasources/systemcalllog/SystemCallLogDataSource.java b/java/com/android/dialer/calllog/datasources/systemcalllog/SystemCallLogDataSource.java
index dce51b750..9332acdb1 100644
--- a/java/com/android/dialer/calllog/datasources/systemcalllog/SystemCallLogDataSource.java
+++ b/java/com/android/dialer/calllog/datasources/systemcalllog/SystemCallLogDataSource.java
@@ -271,7 +271,6 @@ public class SystemCallLogDataSource implements CallLogDataSource {
.query(
Calls.CONTENT_URI_WITH_VOICEMAIL,
getProjection(),
- // TODO(a bug): LAST_MODIFIED not available on M
Calls.LAST_MODIFIED + " > ? AND " + Voicemails.DELETED + " = 0",
new String[] {String.valueOf(previousTimestampProcessed)},
Calls.LAST_MODIFIED + " DESC LIMIT 1000")) {
@@ -399,7 +398,7 @@ public class SystemCallLogDataSource implements CallLogDataSource {
new String[] {
Calls._ID,
Calls.DATE,
- Calls.LAST_MODIFIED, // TODO(a bug): Not available in M
+ Calls.LAST_MODIFIED,
Calls.NUMBER,
Calls.NUMBER_PRESENTATION,
Calls.TYPE,
@@ -414,7 +413,7 @@ public class SystemCallLogDataSource implements CallLogDataSource {
Calls.PHONE_ACCOUNT_COMPONENT_NAME,
Calls.PHONE_ACCOUNT_ID,
Calls.FEATURES,
- Calls.POST_DIAL_DIGITS // TODO(a bug): Not available in M
+ Calls.POST_DIAL_DIGITS
};
@RequiresApi(VERSION_CODES.O)
diff --git a/java/com/android/dialer/notification/NotificationThrottler.java b/java/com/android/dialer/notification/NotificationThrottler.java
index 9db744df6..329a084e8 100644
--- a/java/com/android/dialer/notification/NotificationThrottler.java
+++ b/java/com/android/dialer/notification/NotificationThrottler.java
@@ -41,7 +41,7 @@ import java.util.List;
* unbundled notifications, the system displays all notifications until a global maximum of 50 is
* reached.
*/
- private static final int MAX_NOTIFICATIONS_PER_TAG = 10;
+ private static final int MAX_NOTIFICATIONS_PER_TAG = 8;
private static final int HIGH_GLOBAL_NOTIFICATION_COUNT = 45;
diff --git a/java/com/android/incallui/incall/impl/ButtonController.java b/java/com/android/incallui/incall/impl/ButtonController.java
index 5e37a492b..dd11fff33 100644
--- a/java/com/android/incallui/incall/impl/ButtonController.java
+++ b/java/com/android/incallui/incall/impl/ButtonController.java
@@ -293,7 +293,7 @@ interface ButtonController {
R.string.incall_content_description_muted,
R.string.incall_content_description_unmuted,
R.string.incall_label_mute,
- R.drawable.quantum_ic_mic_off_white_36);
+ R.drawable.quantum_ic_mic_off_vd_theme_24);
}
@Override
@@ -312,7 +312,7 @@ interface ButtonController {
private CheckableLabeledButton button;
@StringRes private int label = R.string.incall_label_speaker;
- @DrawableRes private int icon = R.drawable.quantum_ic_volume_up_white_36;
+ @DrawableRes private int icon = R.drawable.quantum_ic_volume_up_vd_theme_24;
private boolean checkable;
private CharSequence contentDescription;
private CharSequence checkedContentDescription;
@@ -421,7 +421,7 @@ interface ButtonController {
0,
0,
R.string.incall_label_dialpad,
- R.drawable.quantum_ic_dialpad_white_36);
+ R.drawable.quantum_ic_dialpad_vd_theme_24);
}
@Override
@@ -439,7 +439,7 @@ interface ButtonController {
R.string.incall_content_description_unhold,
R.string.incall_content_description_hold,
R.string.incall_label_hold,
- R.drawable.quantum_ic_pause_white_36);
+ R.drawable.quantum_ic_pause_vd_theme_24);
}
@Override
@@ -474,7 +474,7 @@ interface ButtonController {
InCallButtonIds.BUTTON_SWAP,
R.string.incall_content_description_swap_calls,
R.string.incall_label_swap,
- R.drawable.quantum_ic_swap_calls_white_36);
+ R.drawable.quantum_ic_swap_calls_vd_theme_24);
Assert.isNotNull(delegate);
}
@@ -492,7 +492,7 @@ interface ButtonController {
InCallButtonIds.BUTTON_MERGE,
R.string.incall_content_description_merge_calls,
R.string.incall_label_merge,
- R.drawable.quantum_ic_call_merge_white_36);
+ R.drawable.quantum_ic_call_merge_vd_theme_24);
Assert.isNotNull(delegate);
}
@@ -510,7 +510,7 @@ interface ButtonController {
InCallButtonIds.BUTTON_UPGRADE_TO_VIDEO,
0,
R.string.incall_label_videocall,
- R.drawable.quantum_ic_videocam_white_36);
+ R.drawable.quantum_ic_videocam_vd_theme_24);
Assert.isNotNull(delegate);
}
@@ -530,7 +530,7 @@ interface ButtonController {
InCallButtonIds.BUTTON_MANAGE_VOICE_CONFERENCE,
R.string.a11y_description_incall_label_manage_content,
R.string.incall_label_manage,
- R.drawable.quantum_ic_group_white_36);
+ R.drawable.quantum_ic_group_vd_theme_24);
Assert.isNotNull(inCallScreenDelegate);
this.inCallScreenDelegate = inCallScreenDelegate;
}
@@ -551,7 +551,7 @@ interface ButtonController {
InCallButtonIds.BUTTON_SWITCH_TO_SECONDARY,
R.string.incall_content_description_swap_calls,
R.string.incall_label_swap,
- R.drawable.quantum_ic_swap_calls_white_36);
+ R.drawable.quantum_ic_swap_calls_vd_theme_24);
Assert.isNotNull(inCallScreenDelegate);
this.inCallScreenDelegate = inCallScreenDelegate;
}
diff --git a/java/com/android/incallui/incall/impl/CheckableLabeledButton.java b/java/com/android/incallui/incall/impl/CheckableLabeledButton.java
index ca018acc2..03e6e3700 100644
--- a/java/com/android/incallui/incall/impl/CheckableLabeledButton.java
+++ b/java/com/android/incallui/incall/impl/CheckableLabeledButton.java
@@ -34,7 +34,6 @@ import android.view.Gravity;
import android.view.SoundEffectConstants;
import android.widget.Checkable;
import android.widget.ImageView;
-import android.widget.ImageView.ScaleType;
import android.widget.LinearLayout;
import android.widget.TextView;
@@ -82,13 +81,15 @@ public class CheckableLabeledButton extends LinearLayout implements Checkable {
setPadding(paddingSize, paddingSize, paddingSize, paddingSize);
int iconSize = getResources().getDimensionPixelSize(R.dimen.incall_labeled_button_size);
+ int imageSize = getResources().getDimensionPixelSize(R.dimen.incall_labeled_button_icon_size);
+ int iconPadding = (iconSize - imageSize) / 2;
iconView = new ImageView(context, null, android.R.style.Widget_Material_Button_Colored);
LayoutParams iconParams = generateDefaultLayoutParams();
iconParams.width = iconSize;
iconParams.height = iconSize;
iconView.setLayoutParams(iconParams);
- iconView.setScaleType(ScaleType.CENTER_INSIDE);
+ iconView.setPadding(iconPadding, iconPadding, iconPadding, iconPadding);
iconView.setImageDrawable(icon);
iconView.setImageTintMode(Mode.SRC_IN);
iconView.setImageTintList(getResources().getColorStateList(R.color.incall_button_icon, null));
diff --git a/java/com/android/incallui/incall/impl/res/values/dimens.xml b/java/com/android/incallui/incall/impl/res/values/dimens.xml
index 076a7d7dd..439dc1d33 100644
--- a/java/com/android/incallui/incall/impl/res/values/dimens.xml
+++ b/java/com/android/incallui/incall/impl/res/values/dimens.xml
@@ -23,6 +23,7 @@
<dimen name="incall_button_vertical_padding">8dp</dimen>
<dimen name="incall_avatar_size">0dp</dimen>
<dimen name="incall_labeled_button_size">48dp</dimen>
+ <dimen name="incall_labeled_button_icon_size">36dp</dimen>
<dimen name="tools_button_height">76dp</dimen>
<dimen name="incall_window_margin_horizontal">24dp</dimen>