Create new layout file for list fragments.
ag/9687857 will break volvo's customization. This change fixes that.
Also remove the icons from the empty state to be consistent with
favorite page empty state design.
Bug: 143531485
Test: manually
Change-Id: I0286acd4bf1bc4d8780ebb4f12d167fb00e54527
diff --git a/res/layout/list_fragment.xml b/res/layout/list_fragment.xml
index 1ac1ca0..21ac3ee 100644
--- a/res/layout/list_fragment.xml
+++ b/res/layout/list_fragment.xml
@@ -14,14 +14,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<com.android.car.dialer.widget.LoadingFrameLayout
+
+<com.android.car.apps.common.widget.PagedRecyclerView
xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/loading_frame_layout"
+ android:id="@+id/list_view"
android:layout_width="match_parent"
- android:layout_height="match_parent">
- <com.android.car.apps.common.widget.PagedRecyclerView
- android:id="@+id/list_view"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:clipToPadding="false"/>
-</com.android.car.dialer.widget.LoadingFrameLayout>
+ android:layout_height="match_parent"
+ android:clipToPadding="false"/>
diff --git a/res/layout/loading_list_fragment.xml b/res/layout/loading_list_fragment.xml
new file mode 100644
index 0000000..4bd9c8d
--- /dev/null
+++ b/res/layout/loading_list_fragment.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2019 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.
+ -->
+<com.android.car.dialer.widget.LoadingFrameLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/loading_frame_layout"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+ <include layout="@layout/list_fragment"/>
+</com.android.car.dialer.widget.LoadingFrameLayout>
diff --git a/src/com/android/car/dialer/ui/calllog/CallHistoryFragment.java b/src/com/android/car/dialer/ui/calllog/CallHistoryFragment.java
index b2a4527..f5a3c33 100644
--- a/src/com/android/car/dialer/ui/calllog/CallHistoryFragment.java
+++ b/src/com/android/car/dialer/ui/calllog/CallHistoryFragment.java
@@ -23,6 +23,7 @@
import androidx.fragment.app.Fragment;
import androidx.lifecycle.ViewModelProviders;
+import com.android.car.dialer.Constants;
import com.android.car.dialer.R;
import com.android.car.dialer.ui.common.DialerListBaseFragment;
import com.android.car.dialer.ui.contact.ContactDetailsFragment;
@@ -57,7 +58,7 @@
if (uiCallLogs.isLoading()) {
showLoading();
} else if (uiCallLogs.getData().isEmpty()) {
- showEmpty(R.drawable.ic_history, R.string.call_logs_empty);
+ showEmpty(Constants.INVALID_RES_ID, R.string.call_logs_empty);
} else {
mCallLogAdapter.setUiCallLogs(uiCallLogs.getData());
showContent();
diff --git a/src/com/android/car/dialer/ui/common/DialerListBaseFragment.java b/src/com/android/car/dialer/ui/common/DialerListBaseFragment.java
index 4bf0b92..dbc87c4 100644
--- a/src/com/android/car/dialer/ui/common/DialerListBaseFragment.java
+++ b/src/com/android/car/dialer/ui/common/DialerListBaseFragment.java
@@ -58,7 +58,7 @@
*/
@LayoutRes
protected int getLayoutResource() {
- return R.layout.list_fragment;
+ return R.layout.loading_list_fragment;
}
/**
diff --git a/src/com/android/car/dialer/ui/contact/ContactListFragment.java b/src/com/android/car/dialer/ui/contact/ContactListFragment.java
index 47e73dd..3c146f3 100644
--- a/src/com/android/car/dialer/ui/contact/ContactListFragment.java
+++ b/src/com/android/car/dialer/ui/contact/ContactListFragment.java
@@ -24,6 +24,7 @@
import androidx.fragment.app.Fragment;
import androidx.lifecycle.ViewModelProviders;
+import com.android.car.dialer.Constants;
import com.android.car.dialer.R;
import com.android.car.dialer.ui.common.DialerListBaseFragment;
import com.android.car.telephony.common.Contact;
@@ -56,7 +57,7 @@
if (contacts.isLoading()) {
showLoading();
} else if (contacts.getData() == null) {
- showEmpty(R.drawable.ic_contact, R.string.contact_list_empty);
+ showEmpty(Constants.INVALID_RES_ID, R.string.contact_list_empty);
} else {
mContactListAdapter.setContactList(contacts.getData());
showContent();
diff --git a/src/com/android/car/dialer/ui/favorite/FavoriteFragment.java b/src/com/android/car/dialer/ui/favorite/FavoriteFragment.java
index c4bd94f..ad5a604 100644
--- a/src/com/android/car/dialer/ui/favorite/FavoriteFragment.java
+++ b/src/com/android/car/dialer/ui/favorite/FavoriteFragment.java
@@ -27,16 +27,21 @@
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
+import com.android.car.dialer.Constants;
import com.android.car.dialer.R;
import com.android.car.dialer.telecom.UiCallManager;
import com.android.car.dialer.ui.common.DialerListBaseFragment;
import com.android.car.dialer.ui.common.DialerUtils;
import com.android.car.telephony.common.Contact;
-/** Contains a list of favorite contacts. */
+/**
+ * Contains a list of favorite contacts.
+ */
public class FavoriteFragment extends DialerListBaseFragment {
- /** Constructs a new {@link FavoriteFragment} */
+ /**
+ * Constructs a new {@link FavoriteFragment}
+ */
public static FavoriteFragment newInstance() {
return new FavoriteFragment();
}
@@ -56,9 +61,8 @@
if (contacts.isLoading()) {
showLoading();
} else if (contacts.getData() == null) {
- showEmpty(R.drawable.ic_favorite, R.string.favorites_empty,
- R.string.add_favorite_button,
- v -> onAddFavoriteClicked(), true);
+ showEmpty(Constants.INVALID_RES_ID, R.string.favorites_empty,
+ R.string.add_favorite_button, v -> onAddFavoriteClicked(), true);
} else {
adapter.setFavoriteContacts(contacts.getData());
showContent();
