summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSrinivas Visvanathan <sriniv@google.com>2017-02-27 14:55:28 -0800
committerSrinivas Visvanathan <sriniv@google.com>2017-02-28 14:10:39 -0800
commit3fd4b6c86bcd3792c54372a8bbb1277ac73d2005 (patch)
tree033a51400d0962d592cc8052e910310264d910b6
parentf5483be6462054b62a700f35d4bbc7a69aa444f1 (diff)
downloadDialer-3fd4b6c86bcd3792c54372a8bbb1277ac73d2005.tar.gz
Updating Dialer per CarDrawerAdapter changes
- Title is now provided via setting instead of overriden method. Bug: 32019250 Test: Manually Change-Id: Ied050c8c2c0600e92643fd52fcc1287c38d5e787
-rw-r--r--src/com/android/car/dialer/TelecomActivity.java14
1 files changed, 2 insertions, 12 deletions
diff --git a/src/com/android/car/dialer/TelecomActivity.java b/src/com/android/car/dialer/TelecomActivity.java
index c5052b68..ec30cefe 100644
--- a/src/com/android/car/dialer/TelecomActivity.java
+++ b/src/com/android/car/dialer/TelecomActivity.java
@@ -424,14 +424,13 @@ public class TelecomActivity extends CarDrawerActivity implements
}
class CallLogAdapter extends CarDrawerAdapter {
- private final int mTitleResId;
private List<CallLogListingTask.CallLogItem> mItems;
public CallLogAdapter(int titleResId, List<CallLogListingTask.CallLogItem> items) {
super(TelecomActivity.this,
true /* showDisabledListOnEmpty */,
false /* useSmallLayout */);
- mTitleResId = titleResId;
+ setTitle(getString(titleResId));
mItems = items;
}
@@ -441,11 +440,6 @@ public class TelecomActivity extends CarDrawerActivity implements
}
@Override
- protected int getTitleResId() {
- return mTitleResId;
- }
-
- @Override
public void populateViewHolder(DrawerItemViewHolder holder, int position) {
holder.getTitle().setText(mItems.get(position).mTitle);
holder.getText().setText(mItems.get(position).mText);
@@ -469,6 +463,7 @@ public class TelecomActivity extends CarDrawerActivity implements
super(TelecomActivity.this,
false /* showDisabledListOnEmpty */,
true /* useSmallLayout */);
+ setTitle(getString(R.string.phone_app_name));
}
@Override
@@ -477,11 +472,6 @@ public class TelecomActivity extends CarDrawerActivity implements
}
@Override
- protected int getTitleResId() {
- return R.string.phone_app_name;
- }
-
- @Override
public void populateViewHolder(DrawerItemViewHolder holder, int position) {
final int iconColor = getResources().getColor(R.color.car_tint);
int textResId, iconResId;