From 4f02639a38aa0fe522cfeb4c316d5bdffdeca7cd Mon Sep 17 00:00:00 2001 From: roldenburg Date: Fri, 13 Oct 2017 18:42:20 -0700 Subject: Rename Lightbringer to Duo Now that our Duo integration is public, we no longer need a code name. To avoid any disruption, logging and config related names were not changed. Bug: 63753964 Test: manual, existing tests PiperOrigin-RevId: 172172738 Change-Id: Ib9d3d80761944d850c8c4886def9fef9a28539a4 --- java/com/android/dialer/duo/Duo.java | 92 +++++++++++++++ java/com/android/dialer/duo/DuoComponent.java | 41 +++++++ java/com/android/dialer/duo/DuoListener.java | 21 ++++ java/com/android/dialer/duo/stub/DuoStub.java | 127 +++++++++++++++++++++ .../com/android/dialer/duo/stub/StubDuoModule.java | 30 +++++ 5 files changed, 311 insertions(+) create mode 100644 java/com/android/dialer/duo/Duo.java create mode 100644 java/com/android/dialer/duo/DuoComponent.java create mode 100644 java/com/android/dialer/duo/DuoListener.java create mode 100644 java/com/android/dialer/duo/stub/DuoStub.java create mode 100644 java/com/android/dialer/duo/stub/StubDuoModule.java (limited to 'java/com/android/dialer/duo') diff --git a/java/com/android/dialer/duo/Duo.java b/java/com/android/dialer/duo/Duo.java new file mode 100644 index 000000000..ec07ad4b4 --- /dev/null +++ b/java/com/android/dialer/duo/Duo.java @@ -0,0 +1,92 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.dialer.duo; + +import android.content.ComponentName; +import android.content.Context; +import android.content.Intent; +import android.support.annotation.MainThread; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.annotation.StringRes; +import android.telecom.Call; +import android.telecom.PhoneAccountHandle; +import com.google.auto.value.AutoValue; +import com.google.common.base.Optional; +import java.util.List; + +public interface Duo { + + boolean isEnabled(); + + @MainThread + boolean isReachable(@NonNull Context context, @Nullable String number); + + /** @return {@code null} if result is unknown. */ + @MainThread + Optional supportsUpgrade(@NonNull Context context, @Nullable String number); + + @MainThread + void updateReachability(@NonNull Context context, @NonNull List numbers); + + @MainThread + Intent getIntent(@NonNull Context context, @NonNull String number); + + @MainThread + void requestUpgrade(@NonNull Context context, Call call); + + @MainThread + void registerListener(@NonNull DuoListener listener); + + @MainThread + void unregisterListener(@NonNull DuoListener listener); + + @Nullable + @MainThread + ComponentName getPhoneAccountComponentName(); + + @Nullable + @MainThread + PhoneAccountHandle getPhoneAccountHandle(); + + @Nullable + @MainThread + String getPackageName(); + + @StringRes + @MainThread + int getOutgoingCallTypeText(); + + @StringRes + @MainThread + int getIncomingCallTypeText(); + + /** Reachability information for a number. */ + @AutoValue + abstract class ReachabilityData { + public abstract String number(); + + public abstract boolean videoCallable(); + + public abstract boolean supportsUpgrade(); + + public static ReachabilityData create( + String number, boolean videoCallable, boolean supportsUpgrade) { + return new AutoValue_Duo_ReachabilityData(number, videoCallable, supportsUpgrade); + } + } +} diff --git a/java/com/android/dialer/duo/DuoComponent.java b/java/com/android/dialer/duo/DuoComponent.java new file mode 100644 index 000000000..031ee9e53 --- /dev/null +++ b/java/com/android/dialer/duo/DuoComponent.java @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.dialer.duo; + +import android.content.Context; +import android.support.annotation.NonNull; +import com.android.dialer.inject.HasRootComponent; +import dagger.Subcomponent; + +/** + */ +@Subcomponent +public abstract class DuoComponent { + + @NonNull + public abstract Duo getDuo(); + + public static DuoComponent get(Context context) { + return ((HasComponent) ((HasRootComponent) context.getApplicationContext()).component()) + .duoComponent(); + } + + /** Used to refer to the root application component. */ + public interface HasComponent { + DuoComponent duoComponent(); + } +} diff --git a/java/com/android/dialer/duo/DuoListener.java b/java/com/android/dialer/duo/DuoListener.java new file mode 100644 index 000000000..9c660be9c --- /dev/null +++ b/java/com/android/dialer/duo/DuoListener.java @@ -0,0 +1,21 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.dialer.duo; + +public interface DuoListener { + void onDuoStateChanged(); +} diff --git a/java/com/android/dialer/duo/stub/DuoStub.java b/java/com/android/dialer/duo/stub/DuoStub.java new file mode 100644 index 000000000..99f03adfd --- /dev/null +++ b/java/com/android/dialer/duo/stub/DuoStub.java @@ -0,0 +1,127 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.dialer.duo.stub; + +import android.content.ComponentName; +import android.content.Context; +import android.content.Intent; +import android.support.annotation.MainThread; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.annotation.StringRes; +import android.telecom.Call; +import android.telecom.PhoneAccountHandle; +import com.android.dialer.common.Assert; +import com.android.dialer.duo.Duo; +import com.android.dialer.duo.DuoListener; +import com.google.common.base.Optional; +import java.util.List; +import javax.inject.Inject; + +public class DuoStub implements Duo { + + @Inject + public DuoStub() {} + + @Override + public boolean isEnabled() { + return false; + } + + @MainThread + @Override + public boolean isReachable(@NonNull Context context, @Nullable String number) { + Assert.isMainThread(); + Assert.isNotNull(context); + return false; + } + + @MainThread + @Override + public Optional supportsUpgrade(@NonNull Context context, @Nullable String number) { + Assert.isMainThread(); + Assert.isNotNull(context); + return Optional.of(false); + } + + @Override + public void updateReachability(@NonNull Context context, @NonNull List numbers) { + Assert.isMainThread(); + Assert.isNotNull(context); + Assert.isNotNull(numbers); + } + + @MainThread + @Override + public Intent getIntent(@NonNull Context context, @NonNull String number) { + Assert.isMainThread(); + Assert.isNotNull(context); + Assert.isNotNull(number); + return null; + } + + @MainThread + @Override + public void requestUpgrade(@NonNull Context context, Call call) { + Assert.isMainThread(); + Assert.isNotNull(call); + } + + @MainThread + @Override + public void registerListener(DuoListener listener) { + Assert.isMainThread(); + Assert.isNotNull(listener); + } + + @MainThread + @Override + public void unregisterListener(DuoListener listener) { + Assert.isMainThread(); + Assert.isNotNull(listener); + } + + @Nullable + @Override + public ComponentName getPhoneAccountComponentName() { + return null; + } + + @Nullable + @Override + public PhoneAccountHandle getPhoneAccountHandle() { + return null; + } + + @Nullable + @Override + public String getPackageName() { + return null; + } + + @StringRes + @Override + public int getOutgoingCallTypeText() { + return -1; + } + + @StringRes + @Override + public int getIncomingCallTypeText() { + return -1; + } +} diff --git a/java/com/android/dialer/duo/stub/StubDuoModule.java b/java/com/android/dialer/duo/stub/StubDuoModule.java new file mode 100644 index 000000000..604406a94 --- /dev/null +++ b/java/com/android/dialer/duo/stub/StubDuoModule.java @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.dialer.duo.stub; + +import com.android.dialer.duo.Duo; +import dagger.Binds; +import dagger.Module; +import javax.inject.Singleton; + +@Module +public abstract class StubDuoModule { + + @Binds + @Singleton + public abstract Duo bindsDuo(DuoStub duoStub); +} -- cgit v1.2.3