Merge "Remove the shortcut/recents card."

3 files changed, 4 insertions, 38 deletions

diff --git a/res/layout/lists_fragment.xml b/res/layout/lists_fragment.xml
index a11c89fef..26f62c7d8 100644
--- a/res/layout/lists_fragment.xml
+++ b/res/layout/lists_fragment.xml
@@ -21,11 +21,11 @@
     android:layout_height="match_parent"
     android:animateLayoutChanges="true" >
 
-    <com.android.dialer.list.SwipeableShortcutCard
-        android:id="@+id/shortcut_card"
+    <!-- TODO: Apply background color to ActionBar instead of a FrameLayout. For now, this is the
+         easiest way to preserve correct pane scrolling and searchbar collapse/expand behaviors. -->
+    <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="@dimen/action_bar_height_large"
+        android:layout_height="@dimen/action_bar_height_large"
         android:background="@color/actionbar_background_color" />
 
     <FrameLayout
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index b8b93cb0a..e4097e3eb 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -64,18 +64,6 @@
     <dimen name="favorites_row_end_padding">0dp</dimen>
     <dimen name="favorites_row_undo_text_side_padding">32dp</dimen>
 
-    <!-- Dimensions for most recent call shortcut cards -->
-    <dimen name="recent_call_log_item_translation_z">3dp</dimen>
-    <dimen name="recent_call_log_item_margin_horizontal">8dp</dimen>
-    <dimen name="recent_call_log_item_margin_top">4dp</dimen>
-    <dimen name="recent_call_log_item_margin_bottom">6dp</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>
-    <dimen name="recent_call_log_item_padding_start">8dp</dimen>
-    <dimen name="recent_call_log_item_padding_top">12dp</dimen>
-    <dimen name="recent_call_log_item_padding_bottom">11dp</dimen>
-
     <dimen name="call_log_item_extra_padding_vertical">4dp</dimen>
 
 
diff --git a/res/values/ids.xml b/res/values/ids.xml
deleted file mode 100644
index 2b095043a..000000000
--- a/res/values/ids.xml
+++ /dev/null
@@ -1,22 +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
-  -->
-<resources>
-    <item type="id"
-        name="is_swipeable_tag" />
-    <item type="id"
-        name="contact_entry_index_tag" />
-</resources>
\ No newline at end of file