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

Commit 79341754 authored by Qi Wang's avatar Qi Wang Committed by Android (Google) Code Review
Browse files

Merge "Add talkback for long press and remove contact from starred list." into nyc-dev

parents f2c14d72 3dd981af

res/layout/lists_fragment.xml

+4 −4
Original line number Diff line number Diff line
@@ -58,7 +58,9 @@ 
        android:layout_width="match_parent"

        android:layout_height="@dimen/tab_height"

        android:layout_marginTop="@dimen/action_bar_height_large"

        android:layout_alignParentTop="true" >

        android:layout_alignParentTop="true"

        android:contentDescription="@string/remove_contact"

        android:visibility="gone" >



        <LinearLayout

            android:id="@+id/remove_view_content"
@@ -66,8 +68,7 @@ 
            android:layout_width="match_parent"

            android:background="@color/actionbar_background_color"

            android:gravity="center"

            android:orientation="horizontal"

            android:visibility="gone" >

            android:orientation="horizontal">



            <ImageView

                android:layout_width="wrap_content"
@@ -76,7 +77,6 @@ 
                android:layout_marginBottom="8dp"

                android:id="@+id/remove_view_icon"

                android:src="@drawable/ic_remove"

                android:contentDescription="@string/remove_contact"

                android:tint="@color/remove_text_color" />



            <TextView

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

+1 −3
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ public class ListsFragment extends Fragment 
    private ViewPagerTabs mViewPagerTabs;

    private ViewPagerAdapter mViewPagerAdapter;

    private RemoveView mRemoveView;

    private View mRemoveViewContent;



    private SpeedDialFragment mSpeedDialFragment;

    private CallLogFragment mHistoryFragment;
@@ -252,7 +251,6 @@ public class ListsFragment extends Fragment 
        addOnPageChangeListener(mViewPagerTabs);



        mRemoveView = (RemoveView) parentView.findViewById(R.id.remove_view);

        mRemoveViewContent = parentView.findViewById(R.id.remove_view_content);



        Trace.endSection();

        Trace.endSection();
@@ -424,7 +422,7 @@ public class ListsFragment extends Fragment 




    public void showRemoveView(boolean show) {

        mRemoveViewContent.setVisibility(show ? View.VISIBLE : View.GONE);

        mRemoveView.setVisibility(show ? View.VISIBLE : View.GONE);

        mRemoveView.setAlpha(show ? 0 : 1);

        mRemoveView.animate().alpha(show ? 1 : 0).start();

    }

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

+5 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ import android.graphics.drawable.Drawable; 
import android.util.AttributeSet;

import android.util.Log;

import android.view.DragEvent;

import android.view.accessibility.AccessibilityEvent;

import android.widget.FrameLayout;

import android.widget.ImageView;

import android.widget.LinearLayout;
@@ -53,6 +54,9 @@ public class RemoveView extends FrameLayout { 
        final int action = event.getAction();

        switch (action) {

            case DragEvent.ACTION_DRAG_ENTERED:

                // TODO: This is temporary solution and should be removed once accessibility for

                // drag and drop is supported by framework(b/26871588).

                sendAccessibilityEvent(AccessibilityEvent.TYPE_ANNOUNCEMENT);

                setAppearanceHighlighted();

                break;

            case DragEvent.ACTION_DRAG_EXITED:
@@ -65,6 +69,7 @@ public class RemoveView extends FrameLayout { 
                }

                break;

            case DragEvent.ACTION_DROP:

                sendAccessibilityEvent(AccessibilityEvent.TYPE_ANNOUNCEMENT);

                if (mDragDropController != null) {

                    mDragDropController.handleDragFinished((int) event.getX(), (int) event.getY(),

                            true);