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

Commit efd6e85e authored by Jay Shrauner's avatar Jay Shrauner Committed by Android Git Automerger
Browse files

am 70baa2fb: am 6b458508: am 0648ab9d: Merge "Always show overflow icon for... 

am 70baa2fb: am 6b458508: am 0648ab9d: Merge "Always show overflow icon for quick contacts affordance" into klp-dev

* commit '70baa2fb':
  Always show overflow icon for quick contacts affordance
parents f10f09d2 70baa2fb

res/layout/phone_favorite_regular_row_view.xml

+0 −12
Original line number Diff line number Diff line
@@ -65,18 +65,6 @@ 
                android:singleLine="true"

                android:textColor="@color/dialtacts_secondary_text_color" />

        </LinearLayout>

        <ImageView

            android:id="@+id/contact_favorite_star"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_alignRight="@id/contact_tile_quick"

            android:layout_alignEnd="@id/contact_tile_quick"

            android:layout_alignBottom="@id/contact_tile_quick"

            android:layout_marginRight="7dip"

            android:layout_marginEnd="7dip"

            android:layout_marginBottom="7dip"

            android:src="@drawable/star_thumbnail"

            android:visibility="gone" />



    </RelativeLayout>

res/layout/phone_favorite_tile_view.xml

+0 −20
Original line number Diff line number Diff line
@@ -85,26 +85,6 @@ 
            android:nextFocusRight="@+id/contact_tile_secondary_button"

            android:background="?android:attr/selectableItemBackground" />



        <ImageView

            android:id="@+id/contact_favorite_star"

            android:background="?android:attr/selectableItemBackground"

            android:layout_height="@dimen/contact_tile_info_button_height_and_width"

            android:layout_width="@dimen/contact_tile_info_button_height_and_width"

            android:paddingLeft="2dp"

            android:paddingRight="2dp"

            android:paddingStart="2dp"

            android:paddingEnd="2dp"

            android:paddingTop="2dp"

            android:paddingBottom="2dp"

            android:layout_alignParentTop="true"

            android:layout_alignParentRight="true"

            android:layout_alignParentEnd="true"

            android:src="@drawable/star_thumbnail"

            android:scaleType="center"

            android:contentDescription="@string/description_view_contact_detail"

            android:visibility="gone" />





        <ImageButton

            android:id="@id/contact_tile_secondary_button"

            android:src="@drawable/overflow_thumbnail"

src/com/android/dialer/list/PhoneFavoriteSquareTileView.java

+6 −18
Original line number Diff line number Diff line
@@ -62,17 +62,6 @@ public class PhoneFavoriteSquareTileView extends PhoneFavoriteTileView { 
    public void loadFromContact(ContactEntry entry) {

        super.loadFromContact(entry);

        if (entry != null) {

            final boolean contactIsFavorite = entry.isFavorite;

            mSecondaryButton.setVisibility(contactIsFavorite ? GONE : VISIBLE);



            if (contactIsFavorite) {

                mStarView.setOnClickListener(new OnClickListener() {

                    @Override

                    public void onClick(View v) {

                        launchQuickContact();

                    }

                });

            } else {

            mSecondaryButton.setOnClickListener(new OnClickListener() {

                @Override

                public void onClick(View v) {
@@ -82,4 +71,3 @@ public class PhoneFavoriteSquareTileView extends PhoneFavoriteTileView { 
        }

    }

}
 
}

src/com/android/dialer/list/PhoneFavoriteTileView.java

+0 −4
Original line number Diff line number Diff line
@@ -60,8 +60,6 @@ public abstract class PhoneFavoriteTileView extends ContactTileView { 
    private View mUndoRemovalButton;

    /** The view that holds the list view row. */

    protected ContactTileRow mParentRow;

    /** The view that indicates whether the contact is a favorate. */

    protected ImageView mStarView;



    /** Users' most frequent phone number. */

    private String mPhoneNumberString;
@@ -89,7 +87,6 @@ public abstract class PhoneFavoriteTileView extends ContactTileView { 
        mRemovalDialogue = findViewById(com.android.dialer.R.id.favorite_remove_dialogue);

        mUndoRemovalButton = findViewById(com.android.dialer.R.id

                .favorite_remove_undo_button);

        mStarView = (ImageView) findViewById(com.android.dialer.R.id.contact_favorite_star);



        mUndoRemovalButton.setOnClickListener(new OnClickListener() {

            @Override
@@ -127,7 +124,6 @@ public abstract class PhoneFavoriteTileView extends ContactTileView { 
            // Grab the phone-number to call directly... see {@link onClick()}

            mPhoneNumberString = entry.phoneNumber;



            mStarView.setVisibility(entry.isFavorite ? VISIBLE : GONE);

            // If this is a blank entry, don't show anything.

            // TODO krelease:Just hide the view for now. For this to truly look like an empty row

            // the entire ContactTileRow needs to be hidden.