Update Dialer source from latest green build.

* Refactor voicemail component
* Add new enriched calling components

Test: treehugger, manual aosp testing

Change-Id: I521a0f86327d4b42e14d93927c7d613044ed5942

4 files changed, 42 insertions, 0 deletions

diff --git a/java/com/android/dialer/util/AndroidManifest.xml b/java/com/android/dialer/util/AndroidManifest.xml
index 499df9b4e..ba22c1781 100644
--- a/java/com/android/dialer/util/AndroidManifest.xml
+++ b/java/com/android/dialer/util/AndroidManifest.xml
@@ -1,3 +1,19 @@
+<!--
+  ~ Copyright (C) 2017 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
+  -->
+
 <manifest
   package="com.android.dialer.util">
 </manifest>
diff --git a/java/com/android/dialer/util/PermissionsUtil.java b/java/com/android/dialer/util/PermissionsUtil.java
index 70b96dfe1..5741e734a 100644
--- a/java/com/android/dialer/util/PermissionsUtil.java
+++ b/java/com/android/dialer/util/PermissionsUtil.java
@@ -47,6 +47,10 @@ public class PermissionsUtil {
     return hasPermission(context, permission.CAMERA);
   }
 
+  public static boolean hasMicrophonePermissions(Context context) {
+    return hasPermission(context, permission.RECORD_AUDIO);
+  }
+
   public static boolean hasPermission(Context context, String permission) {
     return ContextCompat.checkSelfPermission(context, permission)
         == PackageManager.PERMISSION_GRANTED;
diff --git a/java/com/android/dialer/util/SettingsUtil.java b/java/com/android/dialer/util/SettingsUtil.java
index c61c09b6c..5043c3d56 100644
--- a/java/com/android/dialer/util/SettingsUtil.java
+++ b/java/com/android/dialer/util/SettingsUtil.java
@@ -69,6 +69,15 @@ public class SettingsUtil {
         }
       }
     }
+    getRingtoneName(context, handler, ringtoneUri, msg, defaultRingtone);
+  }
+
+  public static void getRingtoneName(Context context, Handler handler, Uri ringtoneUri, int msg) {
+    getRingtoneName(context, handler, ringtoneUri, msg, false);
+  }
+
+  public static void getRingtoneName(
+      Context context, Handler handler, Uri ringtoneUri, int msg, boolean defaultRingtone) {
     CharSequence summary = context.getString(R.string.ringtone_unknown);
     // Is it a silent ringtone?
     if (ringtoneUri == null) {
diff --git a/java/com/android/dialer/util/ViewUtil.java b/java/com/android/dialer/util/ViewUtil.java
index de08e41a7..81a32f985 100644
--- a/java/com/android/dialer/util/ViewUtil.java
+++ b/java/com/android/dialer/util/ViewUtil.java
@@ -27,6 +27,7 @@ import android.text.TextUtils;
 import android.util.TypedValue;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewTreeObserver.OnGlobalLayoutListener;
 import android.view.ViewTreeObserver.OnPreDrawListener;
 import android.widget.TextView;
 import java.util.Locale;
@@ -113,6 +114,18 @@ public class ViewUtil {
             });
   }
 
+  public static void doOnGlobalLayout(@NonNull final View view, final ViewRunnable runnable) {
+    view.getViewTreeObserver()
+        .addOnGlobalLayoutListener(
+            new OnGlobalLayoutListener() {
+              @Override
+              public void onGlobalLayout() {
+                view.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+                runnable.run(view);
+              }
+            });
+  }
+
   /**
    * Returns {@code true} if animations should be disabled.
    *