commit e23f6e299466dfcb268984ec64633f8c28e7aedc
author Linux Build Service Account <lnxbuild@localhost> Wed Aug 31 11:47:15 2016 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Aug 31 11:47:15 2016 -0700
tree b32c2945124064e491bafc7f7e080aa77f8a152b
parent ccd21274676b1af8ab5f6a48680779feb92aeb24
parent e0e918e606e584c7992a62754c523963a2468a9c

Merge "Pop-up a video call welcome dialog upon the dialer" into atel.lnx.2.0-dev

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);
     }