From 5fcf8a92effbfa5864e15595137176cca88066ed Mon Sep 17 00:00:00 2001
From: Yorke Lee <yorkelee@google.com>
Date: Wed, 21 May 2014 14:12:29 -0700
Subject: Add padding to bottom of speed dial fragment

Add padding to bottom of speed dial grid view so that content is not
obscured by floating action button

Also rename the layout to the more sane sounding speeddial_fragment.xml

Change-Id: I5e745f6a0a3657bae7f84a3728a1c75986d32ebf
---
 res/layout/phone_favorites_fragment.xml            | 56 ---------------------
 res/layout/speeddial_fragment.xml                  | 57 ++++++++++++++++++++++
 src/com/android/dialer/list/SpeedDialFragment.java |  2 +-
 3 files changed, 58 insertions(+), 57 deletions(-)
 delete mode 100644 res/layout/phone_favorites_fragment.xml
 create mode 100644 res/layout/speeddial_fragment.xml

diff --git a/res/layout/phone_favorites_fragment.xml b/res/layout/phone_favorites_fragment.xml
deleted file mode 100644
index 0b657df05..000000000
--- a/res/layout/phone_favorites_fragment.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Use LinearLayout + FrameLayout, just to rely on android:divider and android:showDividers -->
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:divider="?android:attr/dividerHorizontal"
-    android:showDividers="end"
-    android:clipChildren="false">
-
-    <FrameLayout
-        android:id="@+id/contact_tile_frame"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentLeft="true"
-        android:paddingStart="@dimen/favorites_row_start_padding"
-        android:paddingEnd="@dimen/favorites_row_end_padding" >
-        <com.android.dialer.list.PhoneFavoriteListView
-            android:id="@+id/contact_tile_list"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:paddingTop="@dimen/favorites_row_top_padding"
-            android:numColumns="@integer/contact_tile_column_count_in_favorites"
-            android:clipToPadding="false"
-            android:fadingEdge="none"
-            android:divider="@null"
-            android:nestedScrollingEnabled="true" />
-    </FrameLayout>
-
-    <include
-        android:id="@+id/phone_no_favorites_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@id/contact_tile_frame"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentBottom="true"
-        layout="@layout/phone_no_favorites"
-        android:visibility="gone"/>
-</RelativeLayout>
diff --git a/res/layout/speeddial_fragment.xml b/res/layout/speeddial_fragment.xml
new file mode 100644
index 000000000..e8587faeb
--- /dev/null
+++ b/res/layout/speeddial_fragment.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Use LinearLayout + FrameLayout, just to rely on android:divider and android:showDividers -->
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:divider="?android:attr/dividerHorizontal"
+    android:showDividers="end"
+    android:clipChildren="false">
+
+    <FrameLayout
+        android:id="@+id/contact_tile_frame"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentLeft="true"
+        android:paddingStart="@dimen/favorites_row_start_padding"
+        android:paddingEnd="@dimen/favorites_row_end_padding" >
+        <com.android.dialer.list.PhoneFavoriteListView
+            android:id="@+id/contact_tile_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:paddingTop="@dimen/favorites_row_top_padding"
+            android:numColumns="@integer/contact_tile_column_count_in_favorites"
+            android:clipToPadding="false"
+            android:fadingEdge="none"
+            android:divider="@null"
+            android:paddingBottom="@dimen/floating_action_button_height"
+            android:nestedScrollingEnabled="true" />
+    </FrameLayout>
+
+    <include
+        android:id="@+id/phone_no_favorites_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/contact_tile_frame"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentBottom="true"
+        layout="@layout/phone_no_favorites"
+        android:visibility="gone"/>
+</RelativeLayout>
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);
-- 
cgit v1.2.3