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

Commit 3cf92c74 authored by Yorke Lee's avatar Yorke Lee Committed by Android (Google) Code Review
Browse files

Merge "Update Dialer permissions UI per mocks" into mnc-dev

parents 5559d416 63825c8c

res/layout/show_all_contacts_fragment.xml→res/layout/all_contacts_fragment.xml

+7 −6
Original line number Diff line number Diff line
@@ -42,12 +42,13 @@ 
            android:fastScrollEnabled="true"

            android:fadingEdge="none"

            android:nestedScrollingEnabled="true" />

    </FrameLayout>



        <com.android.dialer.widget.EmptyContentView

            android:id="@+id/empty_list_view"

            android:layout_width="match_parent"

        android:layout_height="match_parent"

            android:layout_height="wrap_content"

            android:layout_gravity="center"

            android:visibility="gone"/>



    </FrameLayout>

</LinearLayout>

res/layout/call_log_fragment.xml

+2 −1
Original line number Diff line number Diff line
@@ -30,7 +30,8 @@ 
    <com.android.dialer.widget.EmptyContentView

        android:id="@+id/empty_list_view"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:visibility="gone" />



</FrameLayout>

res/layout/empty_content_view.xml

+7 −2
Original line number Diff line number Diff line
@@ -25,12 +25,13 @@ 
        android:id="@+id/emptyListViewMessage"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:minHeight="84dp"

        android:gravity="center_horizontal|top"

        android:textSize="@dimen/empty_list_message_text_size"

        android:textColor="@color/empty_list_text_color"

        android:paddingRight="16dp"

        android:paddingLeft="16dp" />

        android:paddingLeft="16dp"

        android:paddingTop="8dp"

        android:paddingBottom="8dp" />



    <TextView

        android:id="@+id/emptyListViewAction"
@@ -47,4 +48,8 @@ 
        android:clickable="true"

        style="@style/TextActionStyle" />



    <Space

        android:layout_width="match_parent"

        android:layout_height="40dp" />



</merge>

res/layout/speed_dial_fragment.xml

+2 −1
Original line number Diff line number Diff line
@@ -44,7 +44,8 @@ 
    <com.android.dialer.widget.EmptyContentView

        android:id="@+id/empty_list_view"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:visibility="gone"/>



</FrameLayout>

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

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ public class AllContactsFragment extends ContactEntryListFragment<ContactEntryLi 


    @Override

    protected View inflateView(LayoutInflater inflater, ViewGroup container) {

        return inflater.inflate(R.layout.show_all_contacts_fragment, null);

        return inflater.inflate(R.layout.all_contacts_fragment, null);

    }



    @Override