Merge "Cleanup of call log entry horizontal padding and RTL support. DO NOT MERGE" into lmp-preview-dev
diff --git a/res/layout/speeddial_fragment.xml b/res/layout/speeddial_fragment.xml
index e8587fa..f025e61 100644
--- a/res/layout/speeddial_fragment.xml
+++ b/res/layout/speeddial_fragment.xml
@@ -40,7 +40,7 @@
android:clipToPadding="false"
android:fadingEdge="none"
android:divider="@null"
- android:paddingBottom="@dimen/floating_action_button_height"
+ android:paddingBottom="@dimen/floating_action_button_list_bottom_padding"
android:nestedScrollingEnabled="true" />
</FrameLayout>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index d2ef1cb..21a35b5 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -42,9 +42,9 @@
<dimen name="call_button_height">74dp</dimen>
<!-- Right margin of the floating action button -->
- <dimen name="floating_action_button_margin_right">10dp</dimen>
+ <dimen name="floating_action_button_margin_right">16dp</dimen>
<!-- Bottom margin of the floating action button -->
- <dimen name="floating_action_button_margin_bottom">10dp</dimen>
+ <dimen name="floating_action_button_margin_bottom">16dp</dimen>
<!-- Dimensions for speed dial tiles -->
<dimen name="contact_tile_divider_width">1dp</dimen>
@@ -63,6 +63,8 @@
<!-- Dimensions for most recent call shortcut cards -->
<dimen name="recent_call_log_item_translation_z">5dp</dimen>
<dimen name="recent_call_log_item_padding">8dp</dimen>
+ <!-- The maximum amount to clip on the left and right of the recent call shortcut card -->
+ <dimen name="recent_call_log_item_horizontal_clip_limit">20dp</dimen>
<!-- Size of the star icon on the favorites tile. -->
<dimen name="favorites_star_icon_size">12dp</dimen>
diff --git a/src/com/android/dialer/calllog/CallLogFragment.java b/src/com/android/dialer/calllog/CallLogFragment.java
index 240de85..6cf6e45 100644
--- a/src/com/android/dialer/calllog/CallLogFragment.java
+++ b/src/com/android/dialer/calllog/CallLogFragment.java
@@ -47,6 +47,7 @@
import com.android.contacts.common.CallUtil;
import com.android.contacts.common.GeoUtil;
import com.android.contacts.common.util.PhoneNumberHelper;
+import com.android.contacts.common.util.ViewUtil;
import com.android.dialer.R;
import com.android.dialer.list.ListsFragment.HostInterface;
import com.android.dialer.util.EmptyLoader;
@@ -563,6 +564,8 @@
final ListView listView = getListView();
listView.removeFooterView(mFooterView);
listView.addFooterView(mFooterView);
+
+ ViewUtil.addBottomPaddingToListViewForFab(listView, getResources());
}
@Override
diff --git a/src/com/android/dialer/list/AllContactsFragment.java b/src/com/android/dialer/list/AllContactsFragment.java
index d05f66d..816869f 100644
--- a/src/com/android/dialer/list/AllContactsFragment.java
+++ b/src/com/android/dialer/list/AllContactsFragment.java
@@ -23,13 +23,14 @@
import android.view.View;
import android.view.ViewGroup;
import android.widget.AdapterView;
+import android.widget.ListView;
import android.widget.QuickContactBadge;
import com.android.contacts.common.list.ContactEntryListAdapter;
import com.android.contacts.common.list.ContactEntryListFragment;
import com.android.contacts.common.list.ContactListFilter;
-import com.android.contacts.common.list.ContactListItemView;
import com.android.contacts.common.list.DefaultContactListAdapter;
+import com.android.contacts.common.util.ViewUtil;
import com.android.dialer.R;
/**
@@ -46,6 +47,12 @@
}
@Override
+ public void onViewCreated(View view, android.os.Bundle savedInstanceState) {
+ super.onViewCreated(view, savedInstanceState);
+ ViewUtil.addBottomPaddingToListViewForFab(getListView(), getResources());
+ }
+
+ @Override
protected ContactEntryListAdapter createListAdapter() {
final DefaultContactListAdapter adapter = new DefaultContactListAdapter(getActivity()) {
@Override
diff --git a/src/com/android/dialer/list/ListsFragment.java b/src/com/android/dialer/list/ListsFragment.java
index ac3818c..78570e1 100644
--- a/src/com/android/dialer/list/ListsFragment.java
+++ b/src/com/android/dialer/list/ListsFragment.java
@@ -126,12 +126,12 @@
private PanelSlideListener mPanelSlideListener = new PanelSlideListener() {
@Override
public void onPanelSlide(View panel, float slideOffset) {
- // For every 2 percent that the panel is slid upwards, clip 3 percent from each edge
+ // For every 1 percent that the panel is slid upwards, clip 2 percent from each edge
// of the shortcut card, to achieve the animated effect of the shortcut card
// rapidly shrinking and disappearing from view when the panel is slid upwards.
// slideOffset is 1 when the shortcut card is fully exposed, and 0 when completely
// hidden.
- float ratioCardHidden = (1 - slideOffset) * 1.5f;
+ float ratioCardHidden = (1 - slideOffset) * 2f;
if (mShortcutCardsListView.getCount() > 0) {
SwipeableShortcutCard v =
(SwipeableShortcutCard) mShortcutCardsListView.getChildAt(0);
diff --git a/src/com/android/dialer/list/SearchFragment.java b/src/com/android/dialer/list/SearchFragment.java
index ab76fdc..f863d90 100644
--- a/src/com/android/dialer/list/SearchFragment.java
+++ b/src/com/android/dialer/list/SearchFragment.java
@@ -17,6 +17,7 @@
import android.app.Activity;
import android.content.Intent;
+import android.os.Bundle;
import android.text.TextUtils;
import android.view.View;
import android.widget.AbsListView;
@@ -27,6 +28,7 @@
import com.android.contacts.common.list.ContactListItemView;
import com.android.contacts.common.list.OnPhoneNumberPickerActionListener;
import com.android.contacts.common.list.PhoneNumberPickerFragment;
+import com.android.contacts.common.util.ViewUtil;
import com.android.dialer.DialtactsActivity;
import com.android.dialer.R;
import com.android.dialer.list.OnListFragmentScrolledListener;
@@ -96,6 +98,12 @@
}
@Override
+ public void onViewCreated(View view, Bundle savedInstanceState) {
+ super.onViewCreated(view, savedInstanceState);
+ ViewUtil.addBottomPaddingToListViewForFab(getListView(), getResources());
+ }
+
+ @Override
protected void setSearchMode(boolean flag) {
super.setSearchMode(flag);
// This hides the "All contacts with phone numbers" header in the search fragment
diff --git a/src/com/android/dialer/list/ShortcutCardsAdapter.java b/src/com/android/dialer/list/ShortcutCardsAdapter.java
index b4266d3..4df44f0 100644
--- a/src/com/android/dialer/list/ShortcutCardsAdapter.java
+++ b/src/com/android/dialer/list/ShortcutCardsAdapter.java
@@ -55,6 +55,7 @@
private final ListsFragment mFragment;
private final int mCallLogPadding;
+ private final int mCardMaxHorizontalClip;
private final Context mContext;
@@ -101,6 +102,8 @@
final Resources resources = context.getResources();
mContext = context;
mFragment = fragment;
+ mCardMaxHorizontalClip = resources.getDimensionPixelSize(
+ R.dimen.recent_call_log_item_horizontal_clip_limit);
mCallLogPadding = resources.getDimensionPixelSize(R.dimen.recent_call_log_item_padding);
mCallLogAdapter = callLogAdapter;
mObserver = new CustomDataSetObserver();
@@ -301,8 +304,8 @@
if (ratioHidden > 0.5f) {
mClipRect.set(0, 0 , 0, 0);
} else {
- int newLeft = (int) (ratioHidden * width);
- int newRight = (width - newLeft);
+ int newLeft = (int) (ratioHidden * mCardMaxHorizontalClip);
+ int newRight = width - newLeft;
int newTop = (int) (ratioHidden * height);
int newBottom = (height - newTop);
mClipRect.set(newLeft, newTop, newRight, newBottom);
@@ -313,7 +316,7 @@
final ViewGroup viewGroup = (ViewGroup) viewToClip;
final int count = viewGroup.getChildCount();
for (int i = 0; i < count; i++) {
- viewGroup.getChildAt(i).setAlpha(Math.max(0, 1 - 4 * ratioHidden));
+ viewGroup.getChildAt(i).setAlpha(Math.max(0, 1 - 3 * ratioHidden));
}
}
}