Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16f93d7c authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 41c4831e on remote branch

Change-Id: Id0533bbb2d755ef38d6e6aee01decfe4e0f67e8e
parents 5bede158 41c4831e
Loading
Loading
Loading
Loading
+1 −4
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ public class ExpandingEntryCardView extends CardView {
        if (mEnablePresence) {
            mVideoCalling = (Switch) expandingEntryCardView
                    .findViewById(R.id.switch_video_call);
            mVideoCalling.setVisibility(View.VISIBLE);
            mVideoCalling.setVisibility(View.GONE);
            mDefaultEnable = Settings.System.getInt(mContext.getContentResolver(),
                    CallUtil.CONFIG_VIDEO_CALLING,CallUtil.DISABLE_VIDEO_CALLING);
            mEnable = mDefaultEnable;
@@ -408,9 +408,6 @@ public class ExpandingEntryCardView extends CardView {
        mNumEntries = 0;
        mAllEntriesInflated = false;
        mShowFirstEntryTypeTwice = showFirstEntryTypeTwice;
        if (isSupportVideoCall) {
            mVideoCalling.setVisibility(View.VISIBLE);
        }
        for (List<Entry> entryList : mEntries) {
            mNumEntries += entryList.size();
            mEntryViews.add(new ArrayList<View>());