commit 5e8065efa13b0cdfba0478a207f2559bce11cf92
author Naveen Kumar <kumarn@codeaurora.org> Wed Dec 07 20:02:11 2016 +0530
committer Naveen Kumar <kumarn@codeaurora.org> Thu Dec 08 00:17:18 2016 +0530
tree c4e0b0f4e0f46da8ce673e2963c824c7d73b7338
parent 76e3ee4c4f6afb13261ed3f1e8a0d6b252765dbe
parent 115b9c3755b01e4f80d9d10542c0b88f8f661bfa

Merge N-MR1 to remote branch.

Change-Id: I90e3dbd86f89126e919b260e96412b5fd051c97b

src/com/android/dialer/settings/VideoCallingSettingsFragment.java

diff --git a/src/com/android/dialer/settings/VideoCallingSettingsFragment.java b/src/com/android/dialer/settings/VideoCallingSettingsFragment.java
index 7a25901..b2ba3b6 100644
--- a/src/com/android/dialer/settings/VideoCallingSettingsFragment.java
+++ b/src/com/android/dialer/settings/VideoCallingSettingsFragment.java
@@ -45,7 +45,7 @@
 import com.android.dialer.R;
 
 public class VideoCallingSettingsFragment extends PreferenceFragment implements
-        Preference.OnPreferenceChangeListener {
+        Preference.OnPreferenceClickListener {
 
     private final static String KEY_VIDEO_CALL = "video_calling_preference";
     private SwitchPreference mVideoCallingPreference;
@@ -59,20 +59,20 @@
 
         mContext = getActivity();
         mVideoCallingPreference = (SwitchPreference)findPreference(KEY_VIDEO_CALL);
-        mVideoCallingPreference.setOnPreferenceChangeListener(this);
+        mVideoCallingPreference.setOnPreferenceClickListener(this);
     }
 
     @Override
     public void onResume() {
         super.onResume();
         int enable = Settings.System.getInt(mContext.getContentResolver(),
-                CallUtil.DIALOG_VIDEO_CALLING,CallUtil.DISABLE_VIDEO_CALLING);
+                CallUtil.CONFIG_VIDEO_CALLING, CallUtil.DISABLE_VIDEO_CALLING);
         if(mVideoCallingPreference != null)
             mVideoCallingPreference.setChecked(enable == CallUtil.ENABLE_VIDEO_CALLING);
     }
 
     @Override
-    public boolean onPreferenceChange(Preference preference, Object objValue) {
+    public boolean onPreferenceClick(Preference preference) {
         if (preference == mVideoCallingPreference) {
             boolean isCheck = mVideoCallingPreference.isChecked();
             CallUtil.createVideoCallingDialog(isCheck , mContext);