commit e0e918e606e584c7992a62754c523963a2468a9c
author Fang Yunong <yunong@codeaurora.org> Mon Aug 29 20:49:52 2016 +0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Aug 29 19:37:58 2016 -0700
tree cb11d810a3050ab8325d119f9cd1a44f029348f4
parent 854224e9d1aaee8bb9a8c065c860012e997d7be0

Pop-up a video call welcome dialog upon the dialer

Change-Id: I87a247b496bf9580d7a8d9a2485bc72b4b404a23
CRs-Fixed: 1039298

src/com/android/dialer/DialtactsActivity.java

diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index 7f65b22..8bcabd8 100755
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -518,7 +518,9 @@
 
         if (getResources().getBoolean(
                 R.bool.config_regional_video_call_welcome_dialog)) {
-            showVideoCallWelcomeDialog();
+            if(CallUtil.isVideoEnabled(this)) {
+                showVideoCallWelcomeDialog();
+            }
         }
     }
     @Override

src/com/android/dialer/util/DialerUtils.java

diff --git a/src/com/android/dialer/util/DialerUtils.java b/src/com/android/dialer/util/DialerUtils.java
index de9c3d9..08827df 100644
--- a/src/com/android/dialer/util/DialerUtils.java
+++ b/src/com/android/dialer/util/DialerUtils.java
@@ -203,7 +203,7 @@
     public static boolean canShowWelcomeScreen(Context context) {
         final SharedPreferences prefs = context.getSharedPreferences(
                 PREFS_MESSAGE, Context.MODE_PRIVATE);
-        return prefs.getBoolean(KEY_STATE, false);
+        return prefs.getBoolean(KEY_STATE, true);
     }