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

Commit 3abaae1a authored by Yorke Lee's avatar Yorke Lee Committed by Android Git Automerger
Browse files

am 38019af7: Update Dialer UI to prompt for permissions 

* commit '38019af7':
  Update Dialer UI to prompt for permissions
parents 55fcb215 38019af7

res/layout/call_log_fragment.xml

+1 −2
Original line number Diff line number Diff line
@@ -27,11 +27,10 @@ 
        android:paddingStart="@dimen/call_log_horizontal_margin"

        android:paddingEnd="@dimen/call_log_horizontal_margin" />



    <include

    <com.android.dialer.widget.EmptyContentView

        android:id="@+id/empty_list_view"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        layout="@layout/empty_list_view"

        android:visibility="gone" />



</FrameLayout>

res/layout/empty_list_view.xml→res/layout/empty_content_view.xml

+18 −10
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2012 The Android Open Source Project

<!-- Copyright (C) 2015 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.
@@ -13,15 +13,8 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<LinearLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical"

    android:paddingTop="@dimen/empty_list_message_top_padding"

    android:paddingBottom="@dimen/actionbar_and_tab_height"

    android:minHeight="?android:attr/listPreferredItemHeight">



<merge xmlns:android="http://schemas.android.com/apk/res/android">

    <ImageView

        android:id="@+id/emptyListViewImage"

        android:layout_height="wrap_content"
@@ -39,4 +32,19 @@ 
        android:paddingRight="16dp"

        android:paddingLeft="16dp" />



</LinearLayout>
 
    <TextView

        android:id="@+id/emptyListViewAction"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:gravity="center_horizontal"

        android:layout_gravity="center_horizontal"

        android:paddingRight="16dp"

        android:paddingLeft="16dp"

        android:paddingTop="8dp"

        android:paddingBottom="8dp"

        android:text="@string/permission_single_turn_on"

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

        android:clickable="true"

        style="@style/TextActionStyle" />



</merge>

res/layout/show_all_contacts_fragment.xml

+1 −2
Original line number Diff line number Diff line
@@ -44,11 +44,10 @@ 
            android:nestedScrollingEnabled="true" />

    </FrameLayout>



    <include

    <com.android.dialer.widget.EmptyContentView

        android:id="@+id/empty_list_view"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        layout="@layout/empty_list_view"

        android:visibility="gone"/>



</LinearLayout>

res/layout/speed_dial_fragment.xml

+1 −2
Original line number Diff line number Diff line
@@ -41,11 +41,10 @@ 
            android:nestedScrollingEnabled="true" />

    </FrameLayout>



    <include

    <com.android.dialer.widget.EmptyContentView

        android:id="@+id/empty_list_view"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        layout="@layout/empty_list_view"

        android:visibility="gone"/>



</FrameLayout>

res/values/styles.xml

+7 −3
Original line number Diff line number Diff line
@@ -218,20 +218,24 @@ 
        <item name="cardBackgroundColor">@color/background_dialer_call_log_list_item</item>

    </style>



    <style name="PromoCardActionStyle">

    <style name="TextActionStyle">

        <item name="android:layout_width">wrap_content</item>

        <item name="android:layout_height">@dimen/call_log_action_height</item>

        <item name="android:gravity">end|center_vertical</item>

        <item name="android:paddingStart">@dimen/call_log_action_horizontal_padding</item>

        <item name="android:paddingEnd">@dimen/call_log_action_horizontal_padding</item>

        <item name="android:textColor">@color/promo_card_text</item>

        <item name="android:textSize">@dimen/call_log_list_item_actions_text_size</item>

        <item name="android:textColor">@color/dialtacts_theme_color</item>

        <item name="android:fontFamily">"sans-serif-medium"</item>

        <item name="android:focusable">true</item>

        <item name="android:singleLine">true</item>

        <item name="android:textAllCaps">true</item>

    </style>



    <style name="PromoCardActionStyle" parent="TextActionStyle">

        <item name="android:textColor">@color/promo_card_text</item>

        <item name="android:textSize">@dimen/call_log_list_item_actions_text_size</item>

    </style>



    <style name="VoicemailPlaybackLayoutTextStyle">

        <item name="android:textSize">14sp</item>

    </style>