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

Commit 6161aee5 authored by Gary Mai's avatar Gary Mai
Browse files

DO NOT MERGE Revert video calling CLs 

Reverting recent all changes relating to video calling in one CL.
This was done in i-release already, just making i-dev match the
prebuilt that was dropped in oc-dev.

*** Original CLs ***
"Use generic video icon for tachyon calls" ag/2124911
"Add alternative video call to QC action" ag/2108263
"Add experiments for video call in AOSP." ag/2065958

Test: Build app

Change-Id: I1f1eff7b1cd3a7051ae3304aef5eeab63e79e007
parent 978bd6f4

res/layout/expanding_entry_card_item.xml

+4 −4
Original line number Diff line number Diff line
@@ -88,8 +88,8 @@ 


     <ImageView

         android:id="@+id/third_icon"

         android:layout_width="@dimen/default_clickable_icon_size"

         android:layout_height="@dimen/default_clickable_icon_size"

         android:layout_width="wrap_content"

         android:layout_height="wrap_content"

         android:layout_alignParentTop="true"

         android:layout_toStartOf="@+id/icon_alternate"

         android:layout_alignWithParentIfMissing="true"
@@ -102,8 +102,8 @@ 


     <ImageView

         android:id="@+id/icon_alternate"

         android:layout_width="@dimen/default_clickable_icon_size"

         android:layout_height="@dimen/default_clickable_icon_size"

         android:layout_width="wrap_content"

         android:layout_height="wrap_content"

         android:layout_alignParentEnd="true"

         android:layout_alignParentTop="true"

         android:visibility="gone"

res/values/dimens.xml

+0 −2
Original line number Diff line number Diff line
@@ -14,8 +14,6 @@ 
     limitations under the License.

-->

<resources>

    <!-- Size of clickable icons that are GAR-4 -->

    <dimen name="default_clickable_icon_size">48dp</dimen>

    <!-- Copied from java/com/google/android/assets/launchscreens/res/values-port-v21/dimens.xml -->

    <!-- Values adjusted for nav bar size due to windowDrawsSystemBarBackgrounds -->

    <dimen name="launchscreens_product_logo_bottom">64dp</dimen>

src/com/android/contacts/Experiments.java

+0 −6
Original line number Diff line number Diff line
@@ -38,12 +38,6 @@ public final class Experiments { 
    public static final String DYNAMIC_MIN_CONTENT_CHANGE_UPDATE_DELAY_MILLIS =

            "Shortcuts__dynamic_min_content_change_update_delay_millis";



    /**

     * Flags for enabling video call from quick contact.

     */

    public static final String QUICK_CONTACT_VIDEO_CALL =

            "QuickContact__video_call_integration";



    /**

     * Flags for maximum time to show spinner for a contacts sync.

     */

src/com/android/contacts/model/dataitem/PhoneDataItem.java

+0 −21
Original line number Diff line number Diff line
@@ -31,11 +31,6 @@ public class PhoneDataItem extends DataItem { 


    public static final String KEY_FORMATTED_PHONE_NUMBER = "formattedPhoneNumber";



    private boolean mTachyonReachable;

    // Stores the custom reachable data item to provide extra data to the Entry created from this

    // PhoneDataItem.

    private DataItem mReachableDataItem;



    /* package */ PhoneDataItem(ContentValues values) {

        super(values);

    }
@@ -59,22 +54,6 @@ public class PhoneDataItem extends DataItem { 
        return getContentValues().getAsString(Phone.LABEL);

    }



    public void setTachyonReachable(boolean tachyonReachable) {

        mTachyonReachable = tachyonReachable;

    }



    public boolean isTachyonReachable() {

        return mTachyonReachable;

    }



    public DataItem getReachableDataItem() {

        return mReachableDataItem;

    }



    public void setReachableDataItem(DataItem reachableDataItem) {

        mReachableDataItem = reachableDataItem;

    }



    public void computeFormattedPhoneNumber(String defaultCountryIso) {

        final String phoneNumber = getNumber();

        if (phoneNumber != null) {

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

+2 −8
Original line number Diff line number Diff line
@@ -117,7 +117,6 @@ public class ExpandingEntryCardView extends CardView { 
        private final int mIconResourceId;

        private final int mThirdAction;

        private final Bundle mThirdExtras;

        private final boolean mShouldApplyThirdIconColor;



        public Entry(int id, Drawable mainIcon, String header, String subHeader,

                Drawable subHeaderIcon, String text, Drawable textIcon,
@@ -126,7 +125,7 @@ public class ExpandingEntryCardView extends CardView { 
                Spannable alternateContentDescription, boolean shouldApplyColor, boolean isEditable,

                EntryContextMenuInfo entryContextMenuInfo, Drawable thirdIcon, Intent thirdIntent,

                String thirdContentDescription, int thirdAction, Bundle thirdExtras,

                boolean shouldApplyThirdIconColor, int iconResourceId) {

                int iconResourceId) {

            mId = id;

            mIcon = mainIcon;

            mHeader = header;
@@ -147,7 +146,6 @@ public class ExpandingEntryCardView extends CardView { 
            mThirdContentDescription = thirdContentDescription;

            mThirdAction = thirdAction;

            mThirdExtras = thirdExtras;

            mShouldApplyThirdIconColor = shouldApplyThirdIconColor;

            mIconResourceId = iconResourceId;

        }
@@ -234,10 +232,6 @@ public class ExpandingEntryCardView extends CardView { 
        public Bundle getThirdExtras() {

            return mThirdExtras;

        }



        boolean shouldApplyThirdIconColor() {

            return mShouldApplyThirdIconColor;

        }

    }



    public interface ExpandingEntryCardViewListener {
@@ -613,7 +607,7 @@ public class ExpandingEntryCardView extends CardView { 
                            alternateIcon.setColorFilter(mThemeColorFilter);

                        }

                        Drawable thirdIcon = entry.getThirdIcon();

                        if (thirdIcon != null && entry.shouldApplyThirdIconColor()) {

                        if (thirdIcon != null) {

                            thirdIcon.mutate();

                            thirdIcon.setColorFilter(mThemeColorFilter);

                        }