From 481994f4962ec937ba8775578c2bb9d76141fd7f Mon Sep 17 00:00:00 2001 From: Yorke Lee Date: Tue, 23 Jul 2013 16:53:36 -0700 Subject: Redlines for call history screen, as well as most recent call log * Add and change background and layout for CallLogListItem * Create wrapper view for most recent call log item * Change actionbar background in Call History activity * Hide phone number in call log items * Add tab indicator drawables Change-Id: Ic86c3fac857971aba58ba3ac1d79ddebaf663da6 --- AndroidManifest.xml | 2 +- res/drawable-hdpi/dialer_recent_card_bg.9.png | Bin 0 -> 191 bytes res/drawable-mdpi/dialer_recent_card_bg.9.png | Bin 0 -> 178 bytes res/drawable-xhdpi/dialer_recent_card_bg.9.png | Bin 0 -> 212 bytes res/drawable/action_bar_tab.xml | 26 ++++++++++++ res/drawable/bottom_border_background.xml | 2 +- res/drawable/call_history_actionbar_background.xml | 27 +++++++++++++ res/drawable/tab_selected.xml | 31 ++++++++++++++ res/drawable/tab_selected_focused.xml | 45 +++++++++++++++++++++ res/drawable/tab_selected_pressed.xml | 36 +++++++++++++++++ res/drawable/tab_unselected_focused.xml | 35 ++++++++++++++++ res/drawable/tab_unselected_pressed.xml | 26 ++++++++++++ res/layout/new_call_log_list_item.xml | 14 +------ res/values/colors.xml | 7 +++- res/values/dimens.xml | 3 +- res/values/styles.xml | 11 +++-- src/com/android/dialer/PhoneCallDetailsHelper.java | 14 +++++-- .../dialer/list/NewPhoneFavoriteMergedAdapter.java | 34 +++++++++++++++- 18 files changed, 287 insertions(+), 26 deletions(-) create mode 100644 res/drawable-hdpi/dialer_recent_card_bg.9.png create mode 100644 res/drawable-mdpi/dialer_recent_card_bg.9.png create mode 100644 res/drawable-xhdpi/dialer_recent_card_bg.9.png create mode 100644 res/drawable/action_bar_tab.xml create mode 100644 res/drawable/call_history_actionbar_background.xml create mode 100644 res/drawable/tab_selected.xml create mode 100644 res/drawable/tab_selected_focused.xml create mode 100644 res/drawable/tab_selected_pressed.xml create mode 100644 res/drawable/tab_unselected_focused.xml create mode 100644 res/drawable/tab_unselected_pressed.xml diff --git a/AndroidManifest.xml b/AndroidManifest.xml index e66733c62..c576cd736 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -175,7 +175,7 @@ - --> + --> + + + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/bottom_border_background.xml b/res/drawable/bottom_border_background.xml index 9a35e8a4d..7dad5a446 100644 --- a/res/drawable/bottom_border_background.xml +++ b/res/drawable/bottom_border_background.xml @@ -23,7 +23,7 @@ - + \ No newline at end of file diff --git a/res/drawable/call_history_actionbar_background.xml b/res/drawable/call_history_actionbar_background.xml new file mode 100644 index 000000000..f781f27b0 --- /dev/null +++ b/res/drawable/call_history_actionbar_background.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/tab_selected.xml b/res/drawable/tab_selected.xml new file mode 100644 index 000000000..25d76fc27 --- /dev/null +++ b/res/drawable/tab_selected.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/tab_selected_focused.xml b/res/drawable/tab_selected_focused.xml new file mode 100644 index 000000000..8efd7b30e --- /dev/null +++ b/res/drawable/tab_selected_focused.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/tab_selected_pressed.xml b/res/drawable/tab_selected_pressed.xml new file mode 100644 index 000000000..a38344e04 --- /dev/null +++ b/res/drawable/tab_selected_pressed.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/tab_unselected_focused.xml b/res/drawable/tab_unselected_focused.xml new file mode 100644 index 000000000..2aceb63ef --- /dev/null +++ b/res/drawable/tab_unselected_focused.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/tab_unselected_pressed.xml b/res/drawable/tab_unselected_pressed.xml new file mode 100644 index 000000000..2362b6581 --- /dev/null +++ b/res/drawable/tab_unselected_pressed.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/res/layout/new_call_log_list_item.xml b/res/layout/new_call_log_list_item.xml index c674f2e8c..5a6c446a2 100644 --- a/res/layout/new_call_log_list_item.xml +++ b/res/layout/new_call_log_list_item.xml @@ -20,6 +20,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" + android:background="@drawable/bottom_border_background" > - #f5f5f5 + #cecece + + + #f5f5f5 #ee020709 @@ -55,7 +58,7 @@ --> #888888 - + #e6e6e6 diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 0c5d22e10..0ab27c311 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -57,10 +57,11 @@ 2dp 27dp - + 3dp 8dp 8dp 8dp 8dp + 8dp diff --git a/res/values/styles.xml b/res/values/styles.xml index 59322949a..0cdf223e3 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -71,8 +71,9 @@ @color/dialtacts_secondary_text_color true @style/DialtactsActionBarStyleNew + @style/DialtactsActionBarTabStyle @null - @color/background_dial_holo_light + @color/background_dialer_light @style/DialtactsSearchboxStyle @style/ListViewStyle @@ -168,8 +169,8 @@ + + diff --git a/src/com/android/dialer/PhoneCallDetailsHelper.java b/src/com/android/dialer/PhoneCallDetailsHelper.java index 37394c30f..0da0d0c39 100644 --- a/src/com/android/dialer/PhoneCallDetailsHelper.java +++ b/src/com/android/dialer/PhoneCallDetailsHelper.java @@ -115,19 +115,25 @@ public class PhoneCallDetailsHelper { } else { numberText = details.geocode; } - labelText = null; + labelText = numberText; // We have a real phone number as "nameView" so make it always LTR views.nameView.setTextDirection(View.TEXT_DIRECTION_LTR); } else { nameText = details.name; numberText = displayNumber; - labelText = numberFormattedLabel; + labelText = TextUtils.isEmpty(numberFormattedLabel) ? numberText : + numberFormattedLabel; // We have a real phone number as "numberView" so make it always LTR - views.numberView.setTextDirection(View.TEXT_DIRECTION_LTR); + if (views.numberView != null) { + views.numberView.setTextDirection(View.TEXT_DIRECTION_LTR); + } } views.nameView.setText(nameText); - views.numberView.setText(numberText); + if (views.numberView != null) { + views.numberView.setText(numberText); + } + views.labelView.setText(labelText); views.labelView.setVisibility(TextUtils.isEmpty(labelText) ? View.GONE : View.VISIBLE); } diff --git a/src/com/android/dialer/list/NewPhoneFavoriteMergedAdapter.java b/src/com/android/dialer/list/NewPhoneFavoriteMergedAdapter.java index fff5c9f7c..742892b61 100644 --- a/src/com/android/dialer/list/NewPhoneFavoriteMergedAdapter.java +++ b/src/com/android/dialer/list/NewPhoneFavoriteMergedAdapter.java @@ -23,6 +23,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.BaseAdapter; import android.widget.FrameLayout; +import android.widget.LinearLayout; import android.widget.SectionIndexer; import com.android.contacts.common.list.ContactEntryListAdapter; @@ -60,6 +61,9 @@ public class NewPhoneFavoriteMergedAdapter extends BaseAdapter implements Sectio private final int mItemPaddingLeft; private final int mItemPaddingRight; + private final int mCallLogPadding; + + private final Context mContext; private final DataSetObserver mObserver; @@ -70,8 +74,10 @@ public class NewPhoneFavoriteMergedAdapter extends BaseAdapter implements Sectio NewCallLogAdapter callLogAdapter, View loadingView) { final Resources resources = context.getResources(); + mContext = context; mItemPaddingLeft = resources.getDimensionPixelSize(R.dimen.detail_item_side_margin); mItemPaddingRight = resources.getDimensionPixelSize(R.dimen.list_visible_scrollbar_padding); + mCallLogPadding = resources.getDimensionPixelSize(R.dimen.recent_call_log_item_padding); mContactTileAdapter = contactTileAdapter; mContactEntryListAdapter = contactEntryListAdapter; mCallLogAdapter = callLogAdapter; @@ -237,8 +243,32 @@ public class NewPhoneFavoriteMergedAdapter extends BaseAdapter implements Sectio // TODO krelease: Handle the new callLogAdapterCount and position offsets properly if (callLogAdapterCount > 0) { if (position == 0) { - final View view = mCallLogAdapter.getView(position, convertView, parent); - return view; + final FrameLayout wrapper; + if (convertView == null) { + wrapper = new FrameLayout(mContext); + } else { + wrapper = (FrameLayout) convertView; + } + + // Special case wrapper view for the most recent call log item. This allows + // us to create a card-like effect for the more recent call log item in + // the PhoneFavoriteMergedAdapter, but keep the original look of the item in + // the CallLogAdapter. + final View view = mCallLogAdapter.getView(position, convertView == null ? + null : wrapper.getChildAt(0), parent); + wrapper.removeAllViews(); + view.setBackgroundResource(R.drawable.dialer_recent_card_bg); + + final FrameLayout.LayoutParams params = new FrameLayout.LayoutParams( + FrameLayout.LayoutParams.WRAP_CONTENT, + FrameLayout.LayoutParams.WRAP_CONTENT); + + params.setMarginsRelative(mCallLogPadding, mCallLogPadding, mCallLogPadding, + mCallLogPadding); + view.setLayoutParams(params); + wrapper.addView(view); + + return wrapper; } position -= callLogAdapterCount; } -- cgit v1.2.3