summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSrinivas Visvanathan <sriniv@google.com>2017-02-22 14:27:26 -0800
committerSrinivas Visvanathan <sriniv@google.com>2017-02-22 15:13:23 -0800
commitf5483be6462054b62a700f35d4bbc7a69aa444f1 (patch)
treeb37b997abb4d7602b1ba17850bf55184e76166ca
parentd4ebdddb173935b705d77f3624de2d815efbfba4 (diff)
downloadDialer-f5483be6462054b62a700f35d4bbc7a69aa444f1.tar.gz
Updating Dialer to use latest CarDrawerAdapter
- Updating DialerRootAdapter and CallLogAdapter. Bug: 32019250 Test: Manually Change-Id: I31e7e357ed79b3bf1342c9d349990e04606ad278
-rw-r--r--src/com/android/car/dialer/TelecomActivity.java19
1 files changed, 9 insertions, 10 deletions
diff --git a/src/com/android/car/dialer/TelecomActivity.java b/src/com/android/car/dialer/TelecomActivity.java
index a7953f6d..c5052b68 100644
--- a/src/com/android/car/dialer/TelecomActivity.java
+++ b/src/com/android/car/dialer/TelecomActivity.java
@@ -26,8 +26,6 @@ import android.util.Log;
import com.android.car.app.CarDrawerActivity;
import com.android.car.app.CarDrawerAdapter;
-import com.android.car.app.CarDrawerEmptyAdapter;
-import com.android.car.app.CarDrawerListAdapter;
import com.android.car.app.DrawerItemViewHolder;
import com.android.car.dialer.bluetooth.UiBluetoothMonitor;
import com.android.car.dialer.telecom.PhoneLoader;
@@ -425,12 +423,14 @@ public class TelecomActivity extends CarDrawerActivity implements
return new DialerRootAdapter();
}
- class CallLogAdapter extends CarDrawerListAdapter {
+ class CallLogAdapter extends CarDrawerAdapter {
private final int mTitleResId;
private List<CallLogListingTask.CallLogItem> mItems;
public CallLogAdapter(int titleResId, List<CallLogListingTask.CallLogItem> items) {
- super(true /* useNormalLayout */);
+ super(TelecomActivity.this,
+ true /* showDisabledListOnEmpty */,
+ false /* useSmallLayout */);
mTitleResId = titleResId;
mItems = items;
}
@@ -459,14 +459,16 @@ public class TelecomActivity extends CarDrawerActivity implements
}
}
- private class DialerRootAdapter extends CarDrawerListAdapter {
+ private class DialerRootAdapter extends CarDrawerAdapter {
private static final int ITEM_DIAL = 0;
private static final int ITEM_CALLLOG_ALL = 1;
private static final int ITEM_CALLLOG_MISSED = 2;
private static final int ITEM_MAX = 3;
DialerRootAdapter() {
- super(false /* useNormalLayout */);
+ super(TelecomActivity.this,
+ false /* showDisabledListOnEmpty */,
+ true /* useSmallLayout */);
}
@Override
@@ -543,10 +545,7 @@ public class TelecomActivity extends CarDrawerActivity implements
CallLogListingTask task = new CallLogListingTask(TelecomActivity.this, data,
(items) -> {
showLoadingProgressBar(false);
- CarDrawerAdapter adapter = items.size() > 0
- ? new CallLogAdapter(titleResId, items)
- : new CarDrawerEmptyAdapter(TelecomActivity.this, titleResId);
- switchToAdapter(adapter);
+ switchToAdapter(new CallLogAdapter(titleResId, items));
});
task.execute();
});