diff options
author | Chiao Cheng <chiaocheng@google.com> | 2013-07-25 00:12:01 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-07-25 00:12:01 +0000 |
commit | 01576533fef1e7e106cec6bd62241eaa06d71cfa (patch) | |
tree | 6180ae6a4f8240e47a98dec028463b8e9d4d841a /InCallUI | |
parent | 09c1da8a340373abf851fe3430d8f421952628a2 (diff) | |
parent | 07861f115f6edf9dbdb55cc90d896ff7416e6520 (diff) |
Merge "Renaming client side stub of ICallCommandService."
Diffstat (limited to 'InCallUI')
-rw-r--r-- | InCallUI/src/com/android/incallui/AnswerPresenter.java | 2 | ||||
-rw-r--r-- | InCallUI/src/com/android/incallui/CallButtonPresenter.java | 4 | ||||
-rw-r--r-- | InCallUI/src/com/android/incallui/CallCommandClient.java (renamed from InCallUI/src/com/android/incallui/CallCommandService.java) | 14 | ||||
-rw-r--r-- | InCallUI/src/com/android/incallui/CallHandlerService.java | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/InCallUI/src/com/android/incallui/AnswerPresenter.java b/InCallUI/src/com/android/incallui/AnswerPresenter.java index ecaa5cc54..d6f87c74c 100644 --- a/InCallUI/src/com/android/incallui/AnswerPresenter.java +++ b/InCallUI/src/com/android/incallui/AnswerPresenter.java @@ -37,7 +37,7 @@ public class AnswerPresenter extends Presenter<Ui> { public void onAnswer() { // TODO(klp): hook in call id. - CallCommandService.getInstance().answerCall(1); + CallCommandClient.getInstance().answerCall(1); notifyListeners(); } diff --git a/InCallUI/src/com/android/incallui/CallButtonPresenter.java b/InCallUI/src/com/android/incallui/CallButtonPresenter.java index f1e83e2fb..db727f38f 100644 --- a/InCallUI/src/com/android/incallui/CallButtonPresenter.java +++ b/InCallUI/src/com/android/incallui/CallButtonPresenter.java @@ -41,12 +41,12 @@ public class CallButtonPresenter extends Presenter<CallButtonPresenter.CallButto } public void muteClicked(boolean checked) { - CallCommandService.getInstance().mute(checked); + CallCommandClient.getInstance().mute(checked); getUi().setMute(checked); } public void speakerClicked(boolean checked) { - CallCommandService.getInstance().turnSpeakerOn(checked); + CallCommandClient.getInstance().turnSpeakerOn(checked); getUi().setSpeaker(checked); } diff --git a/InCallUI/src/com/android/incallui/CallCommandService.java b/InCallUI/src/com/android/incallui/CallCommandClient.java index 7b36b7617..5868fb817 100644 --- a/InCallUI/src/com/android/incallui/CallCommandService.java +++ b/InCallUI/src/com/android/incallui/CallCommandClient.java @@ -25,15 +25,15 @@ import com.android.services.telephony.common.ICallCommandService; /** * Main interface for phone related commands. */ -public class CallCommandService { +public class CallCommandClient { - private static final String TAG = CallCommandService.class.getSimpleName(); + private static final String TAG = CallCommandClient.class.getSimpleName(); - private static CallCommandService sInstance; + private static CallCommandClient sInstance; - public static CallCommandService getInstance() { + public static CallCommandClient getInstance() { if (sInstance == null) { - throw new IllegalStateException("CallCommandService has not been initialized."); + throw new IllegalStateException("CallCommandClient has not been initialized."); } return sInstance; } @@ -41,13 +41,13 @@ public class CallCommandService { // TODO(klp): Not sure if static call is ok. Might need to switch to normal service binding. public static void init(ICallCommandService service) { Preconditions.checkState(sInstance == null); - sInstance = new CallCommandService(service); + sInstance = new CallCommandClient(service); } private ICallCommandService mCommandService; - private CallCommandService(ICallCommandService service) { + private CallCommandClient(ICallCommandService service) { mCommandService = service; } diff --git a/InCallUI/src/com/android/incallui/CallHandlerService.java b/InCallUI/src/com/android/incallui/CallHandlerService.java index 85f57b399..a99acca8d 100644 --- a/InCallUI/src/com/android/incallui/CallHandlerService.java +++ b/InCallUI/src/com/android/incallui/CallHandlerService.java @@ -51,7 +51,7 @@ public class CallHandlerService extends Service { @Override public void setCallCommandService(ICallCommandService service) { logD("onConnected: " + service.toString()); - CallCommandService.init(service); + CallCommandClient.init(service); } @Override |