diff options
| author | Andrew Lee <anwlee@google.com> | 2014-05-29 21:54:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-29 21:54:37 +0000 |
| commit | 42b977b89772b74cfabd182ee22be0f0d76b960e (patch) | |
| tree | e5a89288e43349f2f683db7246cd1135015d32be /src/com/android | |
| parent | c987e00fa84f8997c07e8cb2d413897ae1d41b14 (diff) | |
| parent | 955393ba53d56b011055dde3af83ec3e26b27b4a (diff) | |
Merge "Adjust recent cards redline." into lmp-preview-dev
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/dialer/list/ShortcutCardsAdapter.java | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/src/com/android/dialer/list/ShortcutCardsAdapter.java b/src/com/android/dialer/list/ShortcutCardsAdapter.java index 4df44f0e2..a39bed54a 100644 --- a/src/com/android/dialer/list/ShortcutCardsAdapter.java +++ b/src/com/android/dialer/list/ShortcutCardsAdapter.java @@ -27,6 +27,7 @@ import android.view.ViewConfiguration; import android.view.ViewGroup; import android.widget.BaseAdapter; import android.widget.FrameLayout; +import android.widget.LinearLayout; import com.android.dialer.R; import com.android.dialer.calllog.CallLogAdapter; @@ -54,7 +55,10 @@ public class ShortcutCardsAdapter extends BaseAdapter { private final ListsFragment mFragment; - private final int mCallLogPadding; + private final int mCallLogMargin; + private final int mCallLogMarginBottom; + private final int mCallLogPaddingStart; + private final int mCallLogPaddingBottom; private final int mCardMaxHorizontalClip; private final Context mContext; @@ -104,7 +108,14 @@ public class ShortcutCardsAdapter extends BaseAdapter { mFragment = fragment; mCardMaxHorizontalClip = resources.getDimensionPixelSize( R.dimen.recent_call_log_item_horizontal_clip_limit); - mCallLogPadding = resources.getDimensionPixelSize(R.dimen.recent_call_log_item_padding); + mCallLogMargin = resources.getDimensionPixelSize(R.dimen.recent_call_log_item_margin); + mCallLogMarginBottom = + resources.getDimensionPixelSize(R.dimen.recent_call_log_item_margin_bottom); + mCallLogPaddingStart = + resources.getDimensionPixelSize(R.dimen.recent_call_log_item_padding_start); + mCallLogPaddingBottom = + resources.getDimensionPixelSize(R.dimen.recent_call_log_item_padding_bottom); + mCallLogAdapter = callLogAdapter; mObserver = new CustomDataSetObserver(); mCallLogAdapter.registerDataSetObserver(mObserver); @@ -211,8 +222,15 @@ public class ShortcutCardsAdapter extends BaseAdapter { final FrameLayout.LayoutParams params = new FrameLayout.LayoutParams( FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT); - params.setMargins(mCallLogPadding, mCallLogPadding, mCallLogPadding, mCallLogPadding); + params.setMargins(mCallLogMargin, mCallLogMargin, mCallLogMargin, mCallLogMarginBottom); view.setLayoutParams(params); + + LinearLayout actionView = + (LinearLayout)view.findViewById(R.id.primary_action_view); + actionView.setPaddingRelative( + mCallLogPaddingStart, actionView.getPaddingTop(), + actionView.getPaddingEnd(), mCallLogPaddingBottom); + view.setTranslationZ(getResources().getDimensionPixelSize( R.dimen.recent_call_log_item_translation_z)); |