commit ec1611293bb85105e3b79d26a5caa780da1f2fc4
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Apr 08 05:52:43 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Apr 08 05:52:44 2017 +0000
tree c0192704ddee44a998088b86ee613f113de76f5f
parent 5f07eb5b8e016e6fdcc6f34d0577415fbfc1d8a9
parent 1c2185ae08b04fd0d9016827d9dee5f8f8b0d62b

Merge "Import translations. DO NOT MERGE" into ub-contactsdialer-i-dev

src/com/android/contacts/Experiments.java

diff --git a/src/com/android/contacts/Experiments.java b/src/com/android/contacts/Experiments.java
index b53ced3..df676b0 100644
--- a/src/com/android/contacts/Experiments.java
+++ b/src/com/android/contacts/Experiments.java
@@ -39,6 +39,12 @@
             "Shortcuts__dynamic_min_content_change_update_delay_millis";
 
     /**
+     * Flags for enabling video call from quick contact.
+     */
+    public static final String QUICK_CONTACT_VIDEO_CALL =
+            "QuickContact__duo_integration";
+
+    /**
      * Flags for maximum time to show spinner for a contacts sync.
      */
     public static final String PULL_TO_REFRESH_CANCEL_REFRESH_MILLIS =

src/com/android/contacts/logging/ScreenEvent.java

diff --git a/src/com/android/contacts/logging/ScreenEvent.java b/src/com/android/contacts/logging/ScreenEvent.java
index 2df2760..bdea66d 100644
--- a/src/com/android/contacts/logging/ScreenEvent.java
+++ b/src/com/android/contacts/logging/ScreenEvent.java
@@ -31,10 +31,8 @@
         public static final int ALL_CONTACTS = 4;
         public static final int QUICK_CONTACT = 5;
         public static final int EDITOR = 6;
-        public static final int FIND_DUPLICATES = 7;
         public static final int LIST_ACCOUNT = 8;
         public static final int LIST_GROUP = 9;
         public static final int ME_CONTACT = 10;
-        public static final int ASSISTANT = 11;
     }
 }