summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2018-05-17 22:17:38 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2018-05-17 22:17:38 +0000
commitaa3e60782f574f4402acf63b94424a118b7cae70 (patch)
tree9945ad3c8e2ac61422cda9090b7317cd75958ad6
parent854bf9d9685e5f9a94eb72a37ff20fa2ecb35428 (diff)
parent9a53317ca2612c65433b1a92c385da0b7063f3e0 (diff)
Merge "Internal change."
-rw-r--r--java/com/android/dialer/app/res/drawable-xxxhdpi/nui_launcher_icon.pngbin5549 -> 0 bytes
-rw-r--r--java/com/android/dialer/main/impl/res/drawable-xxxhdpi/nui_launcher_icon.pngbin5549 -> 0 bytes
-rw-r--r--java/com/android/dialer/shortcuts/PinnedShortcuts.java2
3 files changed, 1 insertions, 1 deletions
diff --git a/java/com/android/dialer/app/res/drawable-xxxhdpi/nui_launcher_icon.png b/java/com/android/dialer/app/res/drawable-xxxhdpi/nui_launcher_icon.png
deleted file mode 100644
index b0bb8f59f..000000000
--- a/java/com/android/dialer/app/res/drawable-xxxhdpi/nui_launcher_icon.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/main/impl/res/drawable-xxxhdpi/nui_launcher_icon.png b/java/com/android/dialer/main/impl/res/drawable-xxxhdpi/nui_launcher_icon.png
deleted file mode 100644
index b0bb8f59f..000000000
--- a/java/com/android/dialer/main/impl/res/drawable-xxxhdpi/nui_launcher_icon.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/shortcuts/PinnedShortcuts.java b/java/com/android/dialer/shortcuts/PinnedShortcuts.java
index 6e23a5c21..d5265c203 100644
--- a/java/com/android/dialer/shortcuts/PinnedShortcuts.java
+++ b/java/com/android/dialer/shortcuts/PinnedShortcuts.java
@@ -106,7 +106,7 @@ final class PinnedShortcuts {
// setRank is nonsensical for pinned shortcuts and therefore could not be calculated.
continue;
}
- // Exclude shortcuts like the "Phone NUI" shortcut.
+ // Exclude shortcuts not for contacts.
String action = null;
if (shortcutInfo.getIntent() != null) {
action = shortcutInfo.getIntent().getAction();