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

Commit 487fae9c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Contacts: fix the config mechanism for presence" into android_ui.lnx.2.1-dev

parents b343d8d6 d8771887

src/com/android/contacts/detail/ContactDisplayUtils.java

+0 −4
Original line number Diff line number Diff line
@@ -462,8 +462,6 @@ public class ContactDisplayUtils { 
                return vt;

            } catch (Exception e) {

                Log.d(TAG, "getVTCapOfContact ERROR " + e);

            } finally {

                return false;

            }

        }

        return false;
@@ -480,8 +478,6 @@ public class ContactDisplayUtils { 
                return vt;

            } catch (Exception e) {

                Log.d(TAG, "getVTCapability ERROR " + e);

            } finally {

                return false;

            }

        }

        return false;

src/com/android/contacts/quickcontact/ExpandingEntryCardView.java

+3 −2
Original line number Diff line number Diff line
@@ -357,8 +357,9 @@ public class ExpandingEntryCardView extends CardView { 
        mTitleTextView = (TextView) expandingEntryCardView.findViewById(R.id.title);

        mContainer = (LinearLayout) expandingEntryCardView.findViewById(R.id.container);



        mEnablePresence = System.getProperty("persist.presence.enable", "false").equals("true");



        mEnablePresence = mContext.getResources().getBoolean(Resources.getSystem().

            getIdentifier("config_presence_enabled", "bool", "android"));

        Log.d(TAG, "ExpandingEntryCardView mEnablePresence = " + mEnablePresence);

        if (mEnablePresence) {

            mVideoCalling = (Switch) expandingEntryCardView

                    .findViewById(R.id.switch_video_call);

src/com/android/contacts/quickcontact/QuickContactActivity.java

+3 −1
Original line number Diff line number Diff line
@@ -1026,7 +1026,9 @@ public class QuickContactActivity extends ContactsActivity 
        mContactCard.setExpandButtonText(

        getResources().getString(R.string.expanding_entry_card_view_see_all));

        mContactCard.setOnCreateContextMenuListener(mEntryContextMenuListener);

        mEnablePresence = System.getProperty("persist.presence.enable", "false").equals("true");

        mEnablePresence = mContext.getResources().getBoolean(Resources.getSystem().

                getIdentifier("config_presence_enabled", "bool", "android"));

        Log.e(TAG, "onCreate mEnablePresence = " + mEnablePresence);

        if (mEnablePresence) {

            mContactCard.disPlayVideoCallSwitch(mEnablePresence);

            if (!ContactDisplayUtils.mIsBound) {