From 4de59fb9ceac10ed429cd8416251329aa03ad266 Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Thu, 13 Aug 2015 15:20:08 -0700 Subject: Rename "Recents" to "Call History". + All user-facing indications should now say "Call History". + I renamed many references in code to "Call Log", which is how we internally refer to many of the components related to call history. It seemed excessive to rename the fragment, list items, adapters, and other references to that throughout our codebase. Bug: 23017190 Change-Id: I99719122ce592962ff99705dcf4b16e17eee3ab7 --- AndroidManifest.xml | 2 +- res/drawable/tab_history.xml | 30 +++++++++++++++ res/drawable/tab_recents.xml | 30 --------------- res/layout/voicemail_playback_layout.xml | 2 +- res/menu/call_details_options.xml | 6 +-- res/menu/call_log_options.xml | 2 +- res/values/strings.xml | 43 ++++++++-------------- src/com/android/dialer/DialtactsActivity.java | 12 +++--- src/com/android/dialer/calllog/CallLogAdapter.java | 2 +- .../android/dialer/calllog/CallLogFragment.java | 12 +++--- .../dialer/calllog/DefaultVoicemailNotifier.java | 1 - src/com/android/dialer/list/ListsFragment.java | 22 +++++------ 12 files changed, 76 insertions(+), 88 deletions(-) create mode 100644 res/drawable/tab_history.xml delete mode 100644 res/drawable/tab_recents.xml diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 4055b4441..2098b17da 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -132,7 +132,7 @@ - + diff --git a/res/drawable/tab_history.xml b/res/drawable/tab_history.xml new file mode 100644 index 000000000..b1a531840 --- /dev/null +++ b/res/drawable/tab_history.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + diff --git a/res/drawable/tab_recents.xml b/res/drawable/tab_recents.xml deleted file mode 100644 index b1a531840..000000000 --- a/res/drawable/tab_recents.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - diff --git a/res/layout/voicemail_playback_layout.xml b/res/layout/voicemail_playback_layout.xml index 56865fcd6..555d20142 100644 --- a/res/layout/voicemail_playback_layout.xml +++ b/res/layout/voicemail_playback_layout.xml @@ -94,7 +94,7 @@ style="@style/VoicemailPlaybackLayoutButtonStyle" android:src="@drawable/ic_delete_24dp" android:tint="@color/voicemail_icon_tint" - android:contentDescription="@string/recentCalls_trashVoicemail" /> + android:contentDescription="@string/call_log_trash_voicemail" /> diff --git a/res/menu/call_details_options.xml b/res/menu/call_details_options.xml index f08b4facd..84cc2c9eb 100644 --- a/res/menu/call_details_options.xml +++ b/res/menu/call_details_options.xml @@ -18,15 +18,15 @@ + android:title="@string/call_log_trash_voicemail" /> + android:title="@string/call_log_remove_from_call_log" /> + android:title="@string/call_log_edit_number_before_call" /> diff --git a/res/menu/call_log_options.xml b/res/menu/call_log_options.xml index 50b1cad5b..da38d864d 100644 --- a/res/menu/call_log_options.xml +++ b/res/menu/call_log_options.xml @@ -16,7 +16,7 @@ diff --git a/res/values/strings.xml b/res/values/strings.xml index 8eeb03c4a..a80153c29 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -40,12 +40,7 @@ This is especially valuable for views without textual representation like ImageView. [CHAR LIMIT=NONE] --> - Call history - - - Call - %s - + Call history @@ -58,28 +53,16 @@ Copy transcription to clipboard - Edit number before call - - - Add to a contact + Edit number before call - Delete from call history + Delete from call history - Clear call history + Clear call history - Delete voicemail - - - Share voicemail - - - Your call log is empty - - - Make a call + Delete voicemail Clear call history? @@ -474,17 +457,23 @@ Do not translate. --> sans-serif + + Your call history is empty + + + Make a call + - You have no missed calls. + You have no missed calls. - Your voicemail inbox is empty. + Your voicemail inbox is empty. Show favorites only - History + Call History @@ -502,8 +491,8 @@ [CHAR LIMIT=40] --> Speed dial - - Recents + + Call History Contacts diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java index ddb09272d..8fa56f02f 100644 --- a/src/com/android/dialer/DialtactsActivity.java +++ b/src/com/android/dialer/DialtactsActivity.java @@ -189,7 +189,7 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O }; /** - * Fragment containing the speed dial list, recents list, and all contacts list. + * Fragment containing the speed dial list, call history list, and all contacts list. */ private ListsFragment mListsFragment; @@ -543,7 +543,7 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O mListsFragment.showTab(index); } } else if (Calls.CONTENT_TYPE.equals(getIntent().getType())) { - mListsFragment.showTab(ListsFragment.TAB_INDEX_RECENTS); + mListsFragment.showTab(ListsFragment.TAB_INDEX_HISTORY); } setSearchBoxHint(); @@ -1282,13 +1282,13 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { int tabIndex = mListsFragment.getCurrentTabIndex(); - // Scroll the button from center to end when moving from the Speed Dial to Recents tab. - // In RTL, scroll when the current tab is Recents instead of Speed Dial, because the order - // of the tabs is reversed and the ViewPager returns the left tab position during scroll. + // Scroll the button from center to end when moving from the Speed Dial to Call History tab. + // In RTL, scroll when the current tab is Call History instead, since the order of the tabs + // is reversed and the ViewPager returns the left tab position during scroll. boolean isRtl = DialerUtils.isRtl(); if (!isRtl && tabIndex == ListsFragment.TAB_INDEX_SPEED_DIAL && !mIsLandscape) { mFloatingActionButtonController.onPageScrolled(positionOffset); - } else if (isRtl && tabIndex == ListsFragment.TAB_INDEX_RECENTS && !mIsLandscape) { + } else if (isRtl && tabIndex == ListsFragment.TAB_INDEX_HISTORY && !mIsLandscape) { mFloatingActionButtonController.onPageScrolled(1 - positionOffset); } else if (tabIndex != ListsFragment.TAB_INDEX_SPEED_DIAL) { mFloatingActionButtonController.onPageScrolled(1); diff --git a/src/com/android/dialer/calllog/CallLogAdapter.java b/src/com/android/dialer/calllog/CallLogAdapter.java index 0d6fcac88..a0ce85bd9 100644 --- a/src/com/android/dialer/calllog/CallLogAdapter.java +++ b/src/com/android/dialer/calllog/CallLogAdapter.java @@ -240,7 +240,7 @@ public class CallLogAdapter extends GroupingListAdapter ContextMenu.NONE, R.id.context_menu_edit_before_call, ContextMenu.NONE, - R.string.recentCalls_editNumberBeforeCall); + R.string.call_log_edit_number_before_call); editItem.setOnMenuItemClickListener(new OnMenuItemClickListener() { @Override diff --git a/src/com/android/dialer/calllog/CallLogFragment.java b/src/com/android/dialer/calllog/CallLogFragment.java index cf354e596..c63b212d1 100644 --- a/src/com/android/dialer/calllog/CallLogFragment.java +++ b/src/com/android/dialer/calllog/CallLogFragment.java @@ -407,13 +407,13 @@ public class CallLogFragment extends Fragment implements CallLogQueryHandler.Lis final int messageId; switch (filterType) { case Calls.MISSED_TYPE: - messageId = R.string.recentMissed_empty; + messageId = R.string.call_log_missed_empty; break; case Calls.VOICEMAIL_TYPE: - messageId = R.string.recentVoicemails_empty; + messageId = R.string.call_log_voicemail_empty; break; case CallLogQueryHandler.CALL_TYPE_ALL: - messageId = R.string.recentCalls_empty; + messageId = R.string.call_log_all_empty; break; default: throw new IllegalArgumentException("Unexpected filter type in CallLogFragment: " @@ -422,8 +422,8 @@ public class CallLogFragment extends Fragment implements CallLogQueryHandler.Lis mEmptyListView.setDescription(messageId); if (mIsCallLogActivity) { mEmptyListView.setActionLabel(EmptyContentView.NO_LABEL); - } else { - mEmptyListView.setActionLabel(R.string.recentCalls_empty_action); + } else if (filterType == CallLogQueryHandler.CALL_TYPE_ALL) { + mEmptyListView.setActionLabel(R.string.call_log_all_empty_action); } } @@ -497,7 +497,7 @@ public class CallLogFragment extends Fragment implements CallLogQueryHandler.Lis if (!PermissionsUtil.hasPermission(activity, READ_CALL_LOG)) { requestPermissions(new String[] {READ_CALL_LOG}, READ_CALL_LOG_PERMISSION_REQUEST_CODE); } else if (!mIsCallLogActivity) { - // Show dialpad if we are the recents fragment. + // Show dialpad if we are not in the call log activity. ((HostInterface) activity).showDialpad(); } } diff --git a/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java b/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java index a6d165e3a..4eb74bd29 100644 --- a/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java +++ b/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java @@ -184,7 +184,6 @@ public class DefaultVoicemailNotifier { // Determine the intent to fire when the notification is clicked on. final Intent contentIntent; // Open the call log. - // TODO: Send to recents tab in Dialer instead. contentIntent = new Intent(mContext, DialtactsActivity.class); contentIntent.putExtra(DialtactsActivity.EXTRA_SHOW_TAB, ListsFragment.TAB_INDEX_VOICEMAIL); notificationBuilder.setContentIntent(PendingIntent.getActivity( diff --git a/src/com/android/dialer/list/ListsFragment.java b/src/com/android/dialer/list/ListsFragment.java index 1eeba58f7..931b9bd04 100644 --- a/src/com/android/dialer/list/ListsFragment.java +++ b/src/com/android/dialer/list/ListsFragment.java @@ -52,7 +52,7 @@ public class ListsFragment extends Fragment private static final String TAG = "ListsFragment"; public static final int TAB_INDEX_SPEED_DIAL = 0; - public static final int TAB_INDEX_RECENTS = 1; + public static final int TAB_INDEX_HISTORY = 1; public static final int TAB_INDEX_ALL_CONTACTS = 2; public static final int TAB_INDEX_VOICEMAIL = 3; @@ -74,7 +74,7 @@ public class ListsFragment extends Fragment private View mRemoveViewContent; private SpeedDialFragment mSpeedDialFragment; - private CallLogFragment mRecentsFragment; + private CallLogFragment mHistoryFragment; private AllContactsFragment mAllContactsFragment; private CallLogFragment mVoicemailFragment; @@ -111,9 +111,9 @@ public class ListsFragment extends Fragment case TAB_INDEX_SPEED_DIAL: mSpeedDialFragment = new SpeedDialFragment(); return mSpeedDialFragment; - case TAB_INDEX_RECENTS: - mRecentsFragment = new CallLogFragment(CallLogQueryHandler.CALL_TYPE_ALL); - return mRecentsFragment; + case TAB_INDEX_HISTORY: + mHistoryFragment = new CallLogFragment(CallLogQueryHandler.CALL_TYPE_ALL); + return mHistoryFragment; case TAB_INDEX_ALL_CONTACTS: mAllContactsFragment = new AllContactsFragment(); return mAllContactsFragment; @@ -133,8 +133,8 @@ public class ListsFragment extends Fragment (Fragment) super.instantiateItem(container, position); if (fragment instanceof SpeedDialFragment) { mSpeedDialFragment = (SpeedDialFragment) fragment; - } else if (fragment instanceof CallLogFragment && position == TAB_INDEX_RECENTS) { - mRecentsFragment = (CallLogFragment) fragment; + } else if (fragment instanceof CallLogFragment && position == TAB_INDEX_HISTORY) { + mHistoryFragment = (CallLogFragment) fragment; } else if (fragment instanceof AllContactsFragment) { mAllContactsFragment = (AllContactsFragment) fragment; } else if (fragment instanceof CallLogFragment && position == TAB_INDEX_VOICEMAIL) { @@ -206,13 +206,13 @@ public class ListsFragment extends Fragment mTabTitles = new String[TAB_COUNT_WITH_VOICEMAIL]; mTabTitles[TAB_INDEX_SPEED_DIAL] = getResources().getString(R.string.tab_speed_dial); - mTabTitles[TAB_INDEX_RECENTS] = getResources().getString(R.string.tab_recents); + mTabTitles[TAB_INDEX_HISTORY] = getResources().getString(R.string.tab_history); mTabTitles[TAB_INDEX_ALL_CONTACTS] = getResources().getString(R.string.tab_all_contacts); mTabTitles[TAB_INDEX_VOICEMAIL] = getResources().getString(R.string.tab_voicemail); mTabIcons = new int[TAB_COUNT_WITH_VOICEMAIL]; mTabIcons[TAB_INDEX_SPEED_DIAL] = R.drawable.tab_speed_dial; - mTabIcons[TAB_INDEX_RECENTS] = R.drawable.tab_recents; + mTabIcons[TAB_INDEX_HISTORY] = R.drawable.tab_history; mTabIcons[TAB_INDEX_ALL_CONTACTS] = R.drawable.tab_contacts; mTabIcons[TAB_INDEX_VOICEMAIL] = R.drawable.tab_voicemail; @@ -363,8 +363,8 @@ public class ListsFragment extends Fragment case TAB_INDEX_SPEED_DIAL: fragmentName = SpeedDialFragment.class.getSimpleName(); break; - case TAB_INDEX_RECENTS: - fragmentName = CallLogFragment.class.getSimpleName() + "#Recents"; + case TAB_INDEX_HISTORY: + fragmentName = CallLogFragment.class.getSimpleName() + "#History"; break; case TAB_INDEX_ALL_CONTACTS: fragmentName = AllContactsFragment.class.getSimpleName(); -- cgit v1.2.3