diff options
author | Yorke Lee <yorkelee@google.com> | 2015-07-15 22:40:04 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-15 22:40:04 +0000 |
commit | 3abaae1a037f1764b4329dd6381b4c9e6ffa952a (patch) | |
tree | 4687a00a9b56a8c8e85c5291eaf11c32befd9baa /res | |
parent | 55fcb21595a4702029eb5695862ca2726f248649 (diff) | |
parent | 38019af70eb1ca084d36291390bbc54dc81027de (diff) | |
download | packages_apps_Dialer-3abaae1a037f1764b4329dd6381b4c9e6ffa952a.tar.gz packages_apps_Dialer-3abaae1a037f1764b4329dd6381b4c9e6ffa952a.tar.bz2 packages_apps_Dialer-3abaae1a037f1764b4329dd6381b4c9e6ffa952a.zip |
am 38019af7: Update Dialer UI to prompt for permissions
* commit '38019af70eb1ca084d36291390bbc54dc81027de':
Update Dialer UI to prompt for permissions
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/call_log_fragment.xml | 3 | ||||
-rw-r--r-- | res/layout/empty_content_view.xml (renamed from res/layout/empty_list_view.xml) | 28 | ||||
-rw-r--r-- | res/layout/show_all_contacts_fragment.xml | 3 | ||||
-rw-r--r-- | res/layout/speed_dial_fragment.xml | 3 | ||||
-rw-r--r-- | res/values/styles.xml | 10 |
5 files changed, 28 insertions, 19 deletions
diff --git a/res/layout/call_log_fragment.xml b/res/layout/call_log_fragment.xml index 68e306074..3a7013d57 100644 --- a/res/layout/call_log_fragment.xml +++ b/res/layout/call_log_fragment.xml @@ -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> diff --git a/res/layout/empty_list_view.xml b/res/layout/empty_content_view.xml index 7f961a350..18633d0f9 100644 --- a/res/layout/empty_list_view.xml +++ b/res/layout/empty_content_view.xml @@ -1,5 +1,5 @@ <?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> diff --git a/res/layout/show_all_contacts_fragment.xml b/res/layout/show_all_contacts_fragment.xml index 00358dc47..3b501fb88 100644 --- a/res/layout/show_all_contacts_fragment.xml +++ b/res/layout/show_all_contacts_fragment.xml @@ -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> diff --git a/res/layout/speed_dial_fragment.xml b/res/layout/speed_dial_fragment.xml index 18820497e..55dd158d2 100644 --- a/res/layout/speed_dial_fragment.xml +++ b/res/layout/speed_dial_fragment.xml @@ -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> diff --git a/res/values/styles.xml b/res/values/styles.xml index 957fabf86..e3a2f9974 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -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> |