Merge "Hide "Remove contacts" menu item for empty groups" into ub-contactsdialer-f-dev
diff --git a/res/values-sw600dp-land/colors.xml b/res/values-sw600dp-land/colors.xml
deleted file mode 100644
index c5f846e..0000000
--- a/res/values-sw600dp-land/colors.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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>
- <!-- This needs to match the color of the background card, when the center card is visible. -->
- <color name="list_item_pinned_header_color">@color/contact_all_list_background_color</color>
-</resources>
diff --git a/res/values-sw720dp-land/dimens.xml b/res/values-sw720dp-land/dimens.xml
index 3e3e25f..b89c2c1 100644
--- a/res/values-sw720dp-land/dimens.xml
+++ b/res/values-sw720dp-land/dimens.xml
@@ -18,7 +18,5 @@
<dimen name="group_editor_side_padding">64dip</dimen>
<dimen name="contact_detail_list_top_padding">32dip</dimen>
<dimen name="detail_contact_photo_size">256dip</dimen>
- <!-- Right margin of the floating action button -->
- <dimen name="floating_action_button_margin_right">32dp</dimen>
<dimen name="people_activity_landscape_tabs_text_size">16dp</dimen>
</resources>
diff --git a/res/values-sw720dp/colors.xml b/res/values-sw720dp/colors.xml
deleted file mode 100644
index c5f846e..0000000
--- a/res/values-sw720dp/colors.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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>
- <!-- This needs to match the color of the background card, when the center card is visible. -->
- <color name="list_item_pinned_header_color">@color/contact_all_list_background_color</color>
-</resources>
diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml
index e886bc3..264baa4 100644
--- a/res/values-sw720dp/dimens.xml
+++ b/res/values-sw720dp/dimens.xml
@@ -25,8 +25,6 @@
<dimen name="quickcontact_title_initial_margin">32dp</dimen>
<!-- When QC is uncollapsed, the title has this much margin on its bottom -->
<dimen name="quickcontact_title_initial_bottom_margin">0dp</dimen>
- <!-- Right margin of the floating action button -->
- <dimen name="floating_action_button_margin_right">100dp</dimen>
<dimen name="expanding_entry_card_marginStartEnd">10dp</dimen>