summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2014-05-21 21:15:49 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-21 21:15:49 +0000
commit8c6e7a865d35ac9c6921c759cecf19362fe1ce05 (patch)
tree9a0872a4c144bd8ea78bdedfcda464583df7198c
parent0239ce103b22d3eda54ee1252320a17f1fb0697d (diff)
parent5fcf8a92effbfa5864e15595137176cca88066ed (diff)
Merge "Add padding to bottom of speed dial fragment"
-rw-r--r--res/layout/speeddial_fragment.xml (renamed from res/layout/phone_favorites_fragment.xml)1
-rw-r--r--src/com/android/dialer/list/SpeedDialFragment.java2
2 files changed, 2 insertions, 1 deletions
diff --git a/res/layout/phone_favorites_fragment.xml b/res/layout/speeddial_fragment.xml
index 0b657df05..e8587faeb 100644
--- a/res/layout/phone_favorites_fragment.xml
+++ b/res/layout/speeddial_fragment.xml
@@ -40,6 +40,7 @@
android:clipToPadding="false"
android:fadingEdge="none"
android:divider="@null"
+ android:paddingBottom="@dimen/floating_action_button_height"
android:nestedScrollingEnabled="true" />
</FrameLayout>
diff --git a/src/com/android/dialer/list/SpeedDialFragment.java b/src/com/android/dialer/list/SpeedDialFragment.java
index 478327cc4..6e86a3e36 100644
--- a/src/com/android/dialer/list/SpeedDialFragment.java
+++ b/src/com/android/dialer/list/SpeedDialFragment.java
@@ -195,7 +195,7 @@ public class SpeedDialFragment extends Fragment implements OnItemClickListener,
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
- mParentView = inflater.inflate(R.layout.phone_favorites_fragment, container, false);
+ mParentView = inflater.inflate(R.layout.speeddial_fragment, container, false);
mListView = (PhoneFavoriteListView) mParentView.findViewById(R.id.contact_tile_list);
mListView.setOnItemClickListener(this);