Merge "Apply padding to fragment view rather than ListView"
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index 1b4002c..2e0225a 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -596,7 +596,7 @@
fragment = mRegularSearchFragment;
}
if (fragment != null && fragment.isVisible()) {
- fragment.getListView().animate().translationY(-mActionBarHeight)
+ fragment.getView().animate().translationY(-mActionBarHeight)
.setInterpolator(hideActionBarInterpolator).setDuration(ANIMATION_DURATION);
}
@@ -622,7 +622,7 @@
fragment = mRegularSearchFragment;
}
if (fragment != null && fragment.isVisible()) {
- fragment.getListView().animate().translationY(0)
+ fragment.getView().animate().translationY(0)
.setInterpolator(showActionBarInterpolator).setDuration(ANIMATION_DURATION);
}
diff --git a/src/com/android/dialer/list/SearchFragment.java b/src/com/android/dialer/list/SearchFragment.java
index c4fac69..f1cd5aa 100644
--- a/src/com/android/dialer/list/SearchFragment.java
+++ b/src/com/android/dialer/list/SearchFragment.java
@@ -18,6 +18,7 @@
import android.app.Activity;
import android.content.Intent;
import android.text.TextUtils;
+import android.view.View;
import android.widget.AbsListView;
import android.widget.AbsListView.OnScrollListener;
import android.widget.ListView;
@@ -67,13 +68,15 @@
}
mActionBarHeight = ((DialtactsActivity) getActivity()).getActionBarHeight();
- final ListView listView = getListView();
- listView.setPaddingRelative(
- listView.getPaddingStart(),
+
+ final View parentView = getView();
+ parentView.setPaddingRelative(
+ parentView.getPaddingStart(),
mActionBarHeight,
- listView.getPaddingEnd(),
- listView.getPaddingBottom());
- listView.setClipToPadding(false);
+ parentView.getPaddingEnd(),
+ parentView.getPaddingBottom());
+
+ final ListView listView = getListView();
listView.setOnScrollListener(new OnScrollListener() {
@Override
@@ -88,7 +91,7 @@
});
if (!getActivity().getActionBar().isShowing()) {
- listView.setTranslationY(-mActionBarHeight);
+ parentView.setTranslationY(-mActionBarHeight);
}
}