From 68d86c656e5522dec1b04e85ebc0e0f78e436c3d Mon Sep 17 00:00:00 2001 From: Sailesh Nepal Date: Sun, 21 Feb 2016 11:41:28 -0800 Subject: [Gradle] Allow dialer to be compiled as a library This CL adds a new build-library.gradle file for AOSP dialer. This allows the dialer to be built as a library that can be included from GoogleDialer. Switching to a library project meant making two other changes: - changed all switch statements that used resources to if statements. This was required because resource IDs are not final in library projects. - changed InCalUI code to import com.android.dialer.R instead of com.android.incallui.R. See http://b.android.com/82743 for more info on why this is required. src-N isn't supported yet. Also, this isn't the ideal project layout. In the future we should consider switching to the following layout: - dialer/incallui/ <- incall UI as an independent library project - dialer/dialerlib/ <- dialer code as an independent library project - dialer/app <- skelent app that builds a standalone dialer AOSP app Bug: 26676586 Change-Id: I07fbee4d33cc683539e4f8b3953c93f1427af9d7 --- .../com/android/incallui/CallButtonFragment.java | 169 +++++++++------------ .../src/com/android/incallui/CallCardFragment.java | 1 + .../com/android/incallui/CallCardPresenter.java | 1 + InCallUI/src/com/android/incallui/CallerInfo.java | 1 + .../com/android/incallui/CallerInfoAsyncQuery.java | 1 + .../src/com/android/incallui/CallerInfoUtils.java | 1 + .../android/incallui/CircularRevealFragment.java | 1 + .../incallui/ConferenceManagerFragment.java | 1 + .../incallui/ConferenceParticipantListAdapter.java | 1 + .../src/com/android/incallui/ContactInfoCache.java | 1 + .../com/android/incallui/ContactsAsyncHelper.java | 2 + .../src/com/android/incallui/DialpadFragment.java | 1 + .../src/com/android/incallui/GlowPadWrapper.java | 44 +++--- .../src/com/android/incallui/InCallActivity.java | 1 + .../incallui/InCallContactInteractions.java | 4 +- .../src/com/android/incallui/InCallDateUtils.java | 2 + .../src/com/android/incallui/InCallPresenter.java | 1 + .../incallui/InCallUIMaterialColorMapUtils.java | 9 +- .../android/incallui/PostCharDialogFragment.java | 2 + .../com/android/incallui/StatusBarNotifier.java | 22 +-- .../com/android/incallui/VideoCallFragment.java | 1 + .../com/android/incallui/VideoCallPresenter.java | 1 + .../incallui/widget/multiwaveview/GlowPadView.java | 2 +- 23 files changed, 132 insertions(+), 138 deletions(-) (limited to 'InCallUI/src/com/android/incallui') diff --git a/InCallUI/src/com/android/incallui/CallButtonFragment.java b/InCallUI/src/com/android/incallui/CallButtonFragment.java index 1904ab041..d9e474de5 100644 --- a/InCallUI/src/com/android/incallui/CallButtonFragment.java +++ b/InCallUI/src/com/android/incallui/CallButtonFragment.java @@ -54,6 +54,7 @@ import android.widget.PopupMenu.OnDismissListener; import android.widget.PopupMenu.OnMenuItemClickListener; import com.android.contacts.common.util.MaterialColorMapUtils.MaterialPalette; +import com.android.dialer.R; import com.android.dialer.compat.CallAudioStateCompat; /** @@ -199,56 +200,40 @@ public class CallButtonFragment int id = view.getId(); Log.d(this, "onClick(View " + view + ", id " + id + ")..."); - switch (id) { - case R.id.audioButton: - onAudioButtonClicked(); - break; - case R.id.addButton: - getPresenter().addCallClicked(); - break; - case R.id.muteButton: { - getPresenter().muteClicked(!mMuteButton.isSelected()); - break; + if (id == R.id.audioButton) { + onAudioButtonClicked(); + } else if (id == R.id.addButton) { + getPresenter().addCallClicked(); + } else if (id == R.id.muteButton) { + getPresenter().muteClicked(!mMuteButton.isSelected()); + } else if (id == R.id.mergeButton) { + getPresenter().mergeClicked(); + mMergeButton.setEnabled(false); + } else if (id == R.id.holdButton) { + getPresenter().holdClicked(!mHoldButton.isSelected()); + } else if (id == R.id.swapButton) { + getPresenter().swapClicked(); + } else if (id == R.id.dialpadButton) { + getPresenter().showDialpadClicked(!mShowDialpadButton.isSelected()); + } else if (id == R.id.changeToVideoButton) { + getPresenter().changeToVideoClicked(); + } else if (id == R.id.changeToVoiceButton) { + getPresenter().changeToVoiceClicked(); + } else if (id == R.id.switchCameraButton) { + getPresenter().switchCameraClicked( + mSwitchCameraButton.isSelected() /* useFrontFacingCamera */); + } else if (id == R.id.pauseVideoButton) { + getPresenter().pauseVideoClicked( + !mPauseVideoButton.isSelected() /* pause */); + } else if (id == R.id.overflowButton) { + if (mOverflowPopup != null) { + mOverflowPopup.show(); } - case R.id.mergeButton: - getPresenter().mergeClicked(); - mMergeButton.setEnabled(false); - break; - case R.id.holdButton: { - getPresenter().holdClicked(!mHoldButton.isSelected()); - break; - } - case R.id.swapButton: - getPresenter().swapClicked(); - break; - case R.id.dialpadButton: - getPresenter().showDialpadClicked(!mShowDialpadButton.isSelected()); - break; - case R.id.changeToVideoButton: - getPresenter().changeToVideoClicked(); - break; - case R.id.changeToVoiceButton: - getPresenter().changeToVoiceClicked(); - break; - case R.id.switchCameraButton: - getPresenter().switchCameraClicked( - mSwitchCameraButton.isSelected() /* useFrontFacingCamera */); - break; - case R.id.pauseVideoButton: - getPresenter().pauseVideoClicked( - !mPauseVideoButton.isSelected() /* pause */); - break; - case R.id.overflowButton: - if (mOverflowPopup != null) { - mOverflowPopup.show(); - } - break; - case R.id.manageVideoCallConferenceButton: - onManageVideoCallConferenceClicked(); - break; - default: - Log.wtf(this, "onClick: unexpected"); - return; + } else if (id == R.id.manageVideoCallConferenceButton) { + onManageVideoCallConferenceClicked(); + } else { + Log.wtf(this, "onClick: unexpected"); + return; } view.performHapticFeedback( @@ -394,34 +379,33 @@ public class CallButtonFragment } private View getButtonById(int id) { - switch (id) { - case BUTTON_AUDIO: - return mAudioButton; - case BUTTON_MUTE: - return mMuteButton; - case BUTTON_DIALPAD: - return mShowDialpadButton; - case BUTTON_HOLD: - return mHoldButton; - case BUTTON_SWAP: - return mSwapButton; - case BUTTON_UPGRADE_TO_VIDEO: - return mChangeToVideoButton; - case BUTTON_DOWNGRADE_TO_AUDIO: - return mChangeToVoiceButton; - case BUTTON_SWITCH_CAMERA: - return mSwitchCameraButton; - case BUTTON_ADD_CALL: - return mAddCallButton; - case BUTTON_MERGE: - return mMergeButton; - case BUTTON_PAUSE_VIDEO: - return mPauseVideoButton; - case BUTTON_MANAGE_VIDEO_CONFERENCE: - return mManageVideoCallConferenceButton; - default: - Log.w(this, "Invalid button id"); - return null; + if (id == BUTTON_AUDIO) { + return mAudioButton; + } else if (id == BUTTON_MUTE) { + return mMuteButton; + } else if (id == BUTTON_DIALPAD) { + return mShowDialpadButton; + } else if (id == BUTTON_HOLD) { + return mHoldButton; + } else if (id == BUTTON_SWAP) { + return mSwapButton; + } else if (id == BUTTON_UPGRADE_TO_VIDEO) { + return mChangeToVideoButton; + } else if (id == BUTTON_DOWNGRADE_TO_AUDIO) { + return mChangeToVoiceButton; + } else if (id == BUTTON_SWITCH_CAMERA) { + return mSwitchCameraButton; + } else if (id == BUTTON_ADD_CALL) { + return mAddCallButton; + } else if (id == BUTTON_MERGE) { + return mMergeButton; + } else if (id == BUTTON_PAUSE_VIDEO) { + return mPauseVideoButton; + } else if (id == BUTTON_MANAGE_VIDEO_CONFERENCE) { + return mManageVideoCallConferenceButton; + } else { + Log.w(this, "Invalid button id"); + return null; } } @@ -540,24 +524,19 @@ public class CallButtonFragment Log.d(this, " title: '" + item.getTitle() + "'"); int mode = CallAudioStateCompat.ROUTE_WIRED_OR_EARPIECE; - - switch (item.getItemId()) { - case R.id.audio_mode_speaker: - mode = CallAudioStateCompat.ROUTE_SPEAKER; - break; - case R.id.audio_mode_earpiece: - case R.id.audio_mode_wired_headset: - // InCallCallAudioState.ROUTE_EARPIECE means either the handset earpiece, - // or the wired headset (if connected.) - mode = CallAudioStateCompat.ROUTE_WIRED_OR_EARPIECE; - break; - case R.id.audio_mode_bluetooth: - mode = CallAudioStateCompat.ROUTE_BLUETOOTH; - break; - default: - Log.e(this, "onMenuItemClick: unexpected View ID " + item.getItemId() - + " (MenuItem = '" + item + "')"); - break; + int resId = item.getItemId(); + + if (resId == R.id.audio_mode_speaker) { + mode = CallAudioStateCompat.ROUTE_SPEAKER; + } else if (resId == R.id.audio_mode_earpiece || resId == R.id.audio_mode_wired_headset) { + // InCallCallAudioState.ROUTE_EARPIECE means either the handset earpiece, + // or the wired headset (if connected.) + mode = CallAudioStateCompat.ROUTE_WIRED_OR_EARPIECE; + } else if (resId == R.id.audio_mode_bluetooth) { + mode = CallAudioStateCompat.ROUTE_BLUETOOTH; + } else { + Log.e(this, "onMenuItemClick: unexpected View ID " + item.getItemId() + + " (MenuItem = '" + item + "')"); } getPresenter().setAudioMode(mode); diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java index ad7269059..84a732ccc 100644 --- a/InCallUI/src/com/android/incallui/CallCardFragment.java +++ b/InCallUI/src/com/android/incallui/CallCardFragment.java @@ -58,6 +58,7 @@ import android.widget.Toast; import com.android.contacts.common.compat.PhoneNumberUtilsCompat; import com.android.contacts.common.util.MaterialColorMapUtils.MaterialPalette; import com.android.contacts.common.widget.FloatingActionButtonController; +import com.android.dialer.R; import com.android.phone.common.animation.AnimUtils; import java.util.List; diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java index a77de1e72..dd255e09e 100644 --- a/InCallUI/src/com/android/incallui/CallCardPresenter.java +++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java @@ -45,6 +45,7 @@ import com.android.contacts.common.compat.telecom.TelecomManagerCompat; import com.android.contacts.common.preference.ContactsPreferences; import com.android.contacts.common.testing.NeededForTesting; import com.android.contacts.common.util.ContactDisplayUtils; +import com.android.dialer.R; import com.android.incallui.Call.State; import com.android.incallui.ContactInfoCache.ContactCacheEntry; import com.android.incallui.ContactInfoCache.ContactInfoCacheCallback; diff --git a/InCallUI/src/com/android/incallui/CallerInfo.java b/InCallUI/src/com/android/incallui/CallerInfo.java index 55a4be6fd..a638e114c 100644 --- a/InCallUI/src/com/android/incallui/CallerInfo.java +++ b/InCallUI/src/com/android/incallui/CallerInfo.java @@ -39,6 +39,7 @@ import com.android.contacts.common.ContactsUtils; import com.android.contacts.common.ContactsUtils.UserType; import com.android.contacts.common.util.PhoneNumberHelper; import com.android.contacts.common.util.TelephonyManagerUtils; +import com.android.dialer.R; import com.android.dialer.calllog.ContactInfoHelper; /** diff --git a/InCallUI/src/com/android/incallui/CallerInfoAsyncQuery.java b/InCallUI/src/com/android/incallui/CallerInfoAsyncQuery.java index be5a275f3..6dbbfc1fb 100644 --- a/InCallUI/src/com/android/incallui/CallerInfoAsyncQuery.java +++ b/InCallUI/src/com/android/incallui/CallerInfoAsyncQuery.java @@ -37,6 +37,7 @@ import com.android.contacts.common.ContactsUtils; import com.android.contacts.common.compat.DirectoryCompat; import com.android.contacts.common.util.PermissionsUtil; import com.android.contacts.common.util.TelephonyManagerUtils; +import com.android.dialer.R; import com.android.dialer.calllog.ContactInfoHelper; import com.android.dialer.service.CachedNumberLookupService; import com.android.dialer.service.CachedNumberLookupService.CachedContactInfo; diff --git a/InCallUI/src/com/android/incallui/CallerInfoUtils.java b/InCallUI/src/com/android/incallui/CallerInfoUtils.java index ae59d7d2d..aff39566d 100644 --- a/InCallUI/src/com/android/incallui/CallerInfoUtils.java +++ b/InCallUI/src/com/android/incallui/CallerInfoUtils.java @@ -12,6 +12,7 @@ import android.util.Log; import com.android.contacts.common.compat.telecom.TelecomManagerCompat; import com.android.contacts.common.model.Contact; import com.android.contacts.common.model.ContactLoader; +import com.android.dialer.R; import com.android.dialer.calllog.ContactInfo; import com.android.dialer.service.CachedNumberLookupService; import com.android.dialer.service.CachedNumberLookupService.CachedContactInfo; diff --git a/InCallUI/src/com/android/incallui/CircularRevealFragment.java b/InCallUI/src/com/android/incallui/CircularRevealFragment.java index f4a2e91ff..01bd253ec 100644 --- a/InCallUI/src/com/android/incallui/CircularRevealFragment.java +++ b/InCallUI/src/com/android/incallui/CircularRevealFragment.java @@ -34,6 +34,7 @@ import android.view.ViewTreeObserver; import android.view.ViewTreeObserver.OnPreDrawListener; import com.android.contacts.common.util.MaterialColorMapUtils.MaterialPalette; +import com.android.dialer.R; public class CircularRevealFragment extends Fragment { static final String TAG = "CircularRevealFragment"; diff --git a/InCallUI/src/com/android/incallui/ConferenceManagerFragment.java b/InCallUI/src/com/android/incallui/ConferenceManagerFragment.java index f5f52fcb6..fe941c8c5 100644 --- a/InCallUI/src/com/android/incallui/ConferenceManagerFragment.java +++ b/InCallUI/src/com/android/incallui/ConferenceManagerFragment.java @@ -25,6 +25,7 @@ import android.view.ViewGroup; import android.widget.ListView; import com.android.contacts.common.ContactPhotoManager; +import com.android.dialer.R; import java.util.List; diff --git a/InCallUI/src/com/android/incallui/ConferenceParticipantListAdapter.java b/InCallUI/src/com/android/incallui/ConferenceParticipantListAdapter.java index 9d7069d1c..d68ae1f6f 100644 --- a/InCallUI/src/com/android/incallui/ConferenceParticipantListAdapter.java +++ b/InCallUI/src/com/android/incallui/ConferenceParticipantListAdapter.java @@ -37,6 +37,7 @@ import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest; import com.android.contacts.common.compat.PhoneNumberUtilsCompat; import com.android.contacts.common.preference.ContactsPreferences; import com.android.contacts.common.util.ContactDisplayUtils; +import com.android.dialer.R; import com.android.incallui.ContactInfoCache.ContactCacheEntry; import java.lang.ref.WeakReference; diff --git a/InCallUI/src/com/android/incallui/ContactInfoCache.java b/InCallUI/src/com/android/incallui/ContactInfoCache.java index ab4150ba4..9d6fc4627 100644 --- a/InCallUI/src/com/android/incallui/ContactInfoCache.java +++ b/InCallUI/src/com/android/incallui/ContactInfoCache.java @@ -40,6 +40,7 @@ import android.util.Pair; import com.android.contacts.common.ContactsUtils; import com.android.contacts.common.util.PhoneNumberHelper; +import com.android.dialer.R; import com.android.dialer.calllog.ContactInfo; import com.android.dialer.service.CachedNumberLookupService; import com.android.dialer.service.CachedNumberLookupService.CachedContactInfo; diff --git a/InCallUI/src/com/android/incallui/ContactsAsyncHelper.java b/InCallUI/src/com/android/incallui/ContactsAsyncHelper.java index 011eef2ac..d959fadd4 100644 --- a/InCallUI/src/com/android/incallui/ContactsAsyncHelper.java +++ b/InCallUI/src/com/android/incallui/ContactsAsyncHelper.java @@ -30,6 +30,8 @@ import android.os.Looper; import android.os.Message; import android.provider.ContactsContract.Contacts; +import com.android.dialer.R; + import java.io.IOException; import java.io.InputStream; diff --git a/InCallUI/src/com/android/incallui/DialpadFragment.java b/InCallUI/src/com/android/incallui/DialpadFragment.java index ab44cf2ca..ae66a491f 100644 --- a/InCallUI/src/com/android/incallui/DialpadFragment.java +++ b/InCallUI/src/com/android/incallui/DialpadFragment.java @@ -34,6 +34,7 @@ import android.widget.LinearLayout; import android.widget.TextView; import com.android.contacts.common.compat.PhoneNumberUtilsCompat; +import com.android.dialer.R; import com.android.phone.common.dialpad.DialpadKeyButton; import com.android.phone.common.dialpad.DialpadView; diff --git a/InCallUI/src/com/android/incallui/GlowPadWrapper.java b/InCallUI/src/com/android/incallui/GlowPadWrapper.java index 1bd6d3919..342f6b4fd 100644 --- a/InCallUI/src/com/android/incallui/GlowPadWrapper.java +++ b/InCallUI/src/com/android/incallui/GlowPadWrapper.java @@ -23,6 +23,7 @@ import android.telecom.VideoProfile; import android.util.AttributeSet; import android.view.View; +import com.android.dialer.R; import com.android.incallui.widget.multiwaveview.GlowPadView; /** @@ -111,31 +112,24 @@ public class GlowPadWrapper extends GlowPadView implements GlowPadView.OnTrigger public void onTrigger(View v, int target) { Log.d(this, "onTrigger() view=" + v + " target=" + target); final int resId = getResourceIdForTarget(target); - switch (resId) { - case R.drawable.ic_lockscreen_answer: - mAnswerFragment.onAnswer(VideoProfile.STATE_AUDIO_ONLY, getContext()); - mTargetTriggered = true; - break; - case R.drawable.ic_lockscreen_decline: - mAnswerFragment.onDecline(getContext()); - mTargetTriggered = true; - break; - case R.drawable.ic_lockscreen_text: - mAnswerFragment.onText(); - mTargetTriggered = true; - break; - case R.drawable.ic_videocam: - case R.drawable.ic_lockscreen_answer_video: - mAnswerFragment.onAnswer(mVideoState, getContext()); - mTargetTriggered = true; - break; - case R.drawable.ic_lockscreen_decline_video: - mAnswerFragment.onDeclineUpgradeRequest(getContext()); - mTargetTriggered = true; - break; - default: - // Code should never reach here. - Log.e(this, "Trigger detected on unhandled resource. Skipping."); + if (resId == R.drawable.ic_lockscreen_answer) { + mAnswerFragment.onAnswer(VideoProfile.STATE_AUDIO_ONLY, getContext()); + mTargetTriggered = true; + } else if (resId == R.drawable.ic_lockscreen_decline) { + mAnswerFragment.onDecline(getContext()); + mTargetTriggered = true; + } else if (resId == R.drawable.ic_lockscreen_text) { + mAnswerFragment.onText(); + mTargetTriggered = true; + } else if (resId == R.drawable.ic_videocam || resId == R.drawable.ic_lockscreen_answer_video) { + mAnswerFragment.onAnswer(mVideoState, getContext()); + mTargetTriggered = true; + } else if (resId == R.drawable.ic_lockscreen_decline_video) { + mAnswerFragment.onDeclineUpgradeRequest(getContext()); + mTargetTriggered = true; + } else { + // Code should never reach here. + Log.e(this, "Trigger detected on unhandled resource. Skipping."); } } diff --git a/InCallUI/src/com/android/incallui/InCallActivity.java b/InCallUI/src/com/android/incallui/InCallActivity.java index dec1323b2..5cd21a555 100644 --- a/InCallUI/src/com/android/incallui/InCallActivity.java +++ b/InCallUI/src/com/android/incallui/InCallActivity.java @@ -55,6 +55,7 @@ import com.android.contacts.common.compat.CompatUtils; import com.android.contacts.common.interactions.TouchPointManager; import com.android.contacts.common.widget.SelectPhoneAccountDialogFragment; import com.android.contacts.common.widget.SelectPhoneAccountDialogFragment.SelectPhoneAccountListener; +import com.android.dialer.R; import com.android.dialer.logging.Logger; import com.android.dialer.logging.ScreenEvent; import com.android.incallui.Call.State; diff --git a/InCallUI/src/com/android/incallui/InCallContactInteractions.java b/InCallUI/src/com/android/incallui/InCallContactInteractions.java index e62766844..88070fe37 100644 --- a/InCallUI/src/com/android/incallui/InCallContactInteractions.java +++ b/InCallUI/src/com/android/incallui/InCallContactInteractions.java @@ -33,6 +33,8 @@ import android.widget.RelativeLayout; import android.widget.RelativeLayout.LayoutParams; import android.widget.TextView; +import com.android.dialer.R; + import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -394,4 +396,4 @@ public class InCallContactInteractions { return listItem; } } -} \ No newline at end of file +} diff --git a/InCallUI/src/com/android/incallui/InCallDateUtils.java b/InCallUI/src/com/android/incallui/InCallDateUtils.java index da3bb6bf4..e6089d5f1 100644 --- a/InCallUI/src/com/android/incallui/InCallDateUtils.java +++ b/InCallUI/src/com/android/incallui/InCallDateUtils.java @@ -3,6 +3,8 @@ package com.android.incallui; import android.content.Context; import android.content.res.Resources; +import com.android.dialer.R; + /** * Methods to parse time and date information in the InCallUi */ diff --git a/InCallUI/src/com/android/incallui/InCallPresenter.java b/InCallUI/src/com/android/incallui/InCallPresenter.java index 249071faa..5a27b4ca0 100644 --- a/InCallUI/src/com/android/incallui/InCallPresenter.java +++ b/InCallUI/src/com/android/incallui/InCallPresenter.java @@ -47,6 +47,7 @@ import com.android.contacts.common.compat.telecom.TelecomManagerCompat; import com.android.contacts.common.interactions.TouchPointManager; import com.android.contacts.common.testing.NeededForTesting; import com.android.contacts.common.util.MaterialColorMapUtils.MaterialPalette; +import com.android.dialer.R; import com.android.dialer.calllog.CallLogAsyncTaskUtil; import com.android.dialer.calllog.CallLogAsyncTaskUtil.OnCallLogQueryFinishedListener; import com.android.dialer.database.FilteredNumberAsyncQueryHandler; diff --git a/InCallUI/src/com/android/incallui/InCallUIMaterialColorMapUtils.java b/InCallUI/src/com/android/incallui/InCallUIMaterialColorMapUtils.java index 44b035f30..9c108b855 100644 --- a/InCallUI/src/com/android/incallui/InCallUIMaterialColorMapUtils.java +++ b/InCallUI/src/com/android/incallui/InCallUIMaterialColorMapUtils.java @@ -6,6 +6,7 @@ import android.telecom.PhoneAccount; import com.android.contacts.common.util.MaterialColorMapUtils; import com.android.contacts.common.util.MaterialColorMapUtils.MaterialPalette; +import com.android.dialer.R; public class InCallUIMaterialColorMapUtils extends MaterialColorMapUtils { private final TypedArray sPrimaryColors; @@ -14,10 +15,8 @@ public class InCallUIMaterialColorMapUtils extends MaterialColorMapUtils { public InCallUIMaterialColorMapUtils(Resources resources) { super(resources); - sPrimaryColors = resources.obtainTypedArray( - com.android.incallui.R.array.background_colors); - sSecondaryColors = resources.obtainTypedArray( - com.android.incallui.R.array.background_colors_dark); + sPrimaryColors = resources.obtainTypedArray(R.array.background_colors); + sSecondaryColors = resources.obtainTypedArray(R.array.background_colors_dark); mResources = resources; } @@ -53,4 +52,4 @@ public class InCallUIMaterialColorMapUtils extends MaterialColorMapUtils { final int secondaryColor = resources.getColor(R.color.dialer_theme_color_dark); return new MaterialPalette(primaryColor, secondaryColor); } -} \ No newline at end of file +} diff --git a/InCallUI/src/com/android/incallui/PostCharDialogFragment.java b/InCallUI/src/com/android/incallui/PostCharDialogFragment.java index 400e8d762..6f904ad9e 100644 --- a/InCallUI/src/com/android/incallui/PostCharDialogFragment.java +++ b/InCallUI/src/com/android/incallui/PostCharDialogFragment.java @@ -23,6 +23,8 @@ import android.content.DialogInterface; import android.os.Bundle; import android.view.WindowManager; +import com.android.dialer.R; + /** * Pop up an alert dialog with OK and Cancel buttons to allow user to Accept or Reject the WAIT * inserted as part of the Dial string. diff --git a/InCallUI/src/com/android/incallui/StatusBarNotifier.java b/InCallUI/src/com/android/incallui/StatusBarNotifier.java index 6c00164b9..1a4ec0935 100644 --- a/InCallUI/src/com/android/incallui/StatusBarNotifier.java +++ b/InCallUI/src/com/android/incallui/StatusBarNotifier.java @@ -50,6 +50,7 @@ import com.android.contacts.common.preference.ContactsPreferences; import com.android.contacts.common.testing.NeededForTesting; import com.android.contacts.common.util.BitmapUtil; import com.android.contacts.common.util.ContactDisplayUtils; +import com.android.dialer.R; import com.android.incallui.Call.State; import com.android.incallui.ContactInfoCache.ContactCacheEntry; import com.android.incallui.ContactInfoCache.ContactInfoCacheCallback; @@ -520,17 +521,16 @@ public class StatusBarNotifier implements InCallPresenter.InCallStateListener, } private static int getWorkStringFromPersonalString(int resId) { - switch(resId) { - case R.string.notification_ongoing_call: - return R.string.notification_ongoing_work_call; - case R.string.notification_ongoing_call_wifi: - return R.string.notification_ongoing_work_call_wifi; - case R.string.notification_incoming_call_wifi: - return R.string.notification_incoming_work_call_wifi; - case R.string.notification_incoming_call: - return R.string.notification_incoming_work_call; - default: - return resId; + if (resId == R.string.notification_ongoing_call) { + return R.string.notification_ongoing_work_call; + } else if (resId == R.string.notification_ongoing_call_wifi) { + return R.string.notification_ongoing_work_call_wifi; + } else if (resId == R.string.notification_incoming_call_wifi) { + return R.string.notification_incoming_work_call_wifi; + } else if (resId == R.string.notification_incoming_call) { + return R.string.notification_incoming_work_call; + } else { + return resId; } } diff --git a/InCallUI/src/com/android/incallui/VideoCallFragment.java b/InCallUI/src/com/android/incallui/VideoCallFragment.java index f80b04c51..cb8c6449b 100644 --- a/InCallUI/src/com/android/incallui/VideoCallFragment.java +++ b/InCallUI/src/com/android/incallui/VideoCallFragment.java @@ -31,6 +31,7 @@ import android.view.ViewTreeObserver; import android.widget.FrameLayout; import android.widget.ImageView; +import com.android.dialer.R; import com.android.phone.common.animation.AnimUtils; import com.google.common.base.Objects; diff --git a/InCallUI/src/com/android/incallui/VideoCallPresenter.java b/InCallUI/src/com/android/incallui/VideoCallPresenter.java index c9a332881..9a33d80eb 100644 --- a/InCallUI/src/com/android/incallui/VideoCallPresenter.java +++ b/InCallUI/src/com/android/incallui/VideoCallPresenter.java @@ -33,6 +33,7 @@ import android.widget.ImageView; import com.android.contacts.common.ContactPhotoManager; import com.android.contacts.common.compat.CompatUtils; +import com.android.dialer.R; import com.android.incallui.InCallPresenter.InCallDetailsListener; import com.android.incallui.InCallPresenter.InCallOrientationListener; import com.android.incallui.InCallPresenter.InCallStateListener; diff --git a/InCallUI/src/com/android/incallui/widget/multiwaveview/GlowPadView.java b/InCallUI/src/com/android/incallui/widget/multiwaveview/GlowPadView.java index 23200279e..efeb4b7e3 100644 --- a/InCallUI/src/com/android/incallui/widget/multiwaveview/GlowPadView.java +++ b/InCallUI/src/com/android/incallui/widget/multiwaveview/GlowPadView.java @@ -50,7 +50,7 @@ import android.view.accessibility.AccessibilityNodeInfo; import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction; import android.view.accessibility.AccessibilityNodeProvider; -import com.android.incallui.R; +import com.android.dialer.R; import java.util.ArrayList; import java.util.List; -- cgit v1.2.3