diff options
author | yueg <yueg@google.com> | 2018-03-09 16:49:38 -0800 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-03-09 16:52:01 -0800 |
commit | 48f93f40f66f5695cdb370af679db4580cebb641 (patch) | |
tree | fb855d25b3e7ea777beaa7de19ab729c977ef0e5 /java/com/android/bubble | |
parent | d6cb3b9ac4db86cc5d37174a6e6c4d69c8a8a753 (diff) | |
download | android_packages_apps_Dialer-48f93f40f66f5695cdb370af679db4580cebb641.tar.gz android_packages_apps_Dialer-48f93f40f66f5695cdb370af679db4580cebb641.tar.bz2 android_packages_apps_Dialer-48f93f40f66f5695cdb370af679db4580cebb641.zip |
Remove bubble "new" prefix.
Test: BubbleImplTest, BubbleImplIntegrationTest, ReturnToCallControllerTest, ReturnToCallActionReceiverTest, BottomActionViewControllerTest, ChangeOnScreenBoundsTest
PiperOrigin-RevId: 188558386
Change-Id: Ieab3ee3f148092312a50597b41c0975419756e23
Diffstat (limited to 'java/com/android/bubble')
-rw-r--r-- | java/com/android/bubble/Bubble.java | 77 | ||||
-rw-r--r-- | java/com/android/bubble/BubbleComponent.java | 39 | ||||
-rw-r--r-- | java/com/android/bubble/BubbleInfo.java | 129 | ||||
-rw-r--r-- | java/com/android/bubble/stub/BubbleStub.java | 56 | ||||
-rw-r--r-- | java/com/android/bubble/stub/StubBubbleModule.java | 30 |
5 files changed, 331 insertions, 0 deletions
diff --git a/java/com/android/bubble/Bubble.java b/java/com/android/bubble/Bubble.java new file mode 100644 index 000000000..e192e06f4 --- /dev/null +++ b/java/com/android/bubble/Bubble.java @@ -0,0 +1,77 @@ +/* + * Copyright (C) 2018 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.bubble; + +import android.graphics.drawable.Drawable; +import android.support.annotation.NonNull; +import java.util.List; + +/** + * Creates and manages a bubble window from information in a {@link BubbleInfo}. Before creating, be + * sure to check whether bubbles may be shown using {@code Settings.canDrawOverlays(context)} and + * request permission if necessary + */ +public interface Bubble { + + /** + * Make the bubble visible. Will show a short entrance animation as it enters. If the bubble is + * already showing this method does nothing. + */ + void show(); + + /** Hide the bubble. */ + void hide(); + + /** Returns whether the bubble is currently visible */ + boolean isVisible(); + + /** + * Set the info for this Bubble to display + * + * @param bubbleInfo the BubbleInfo to display in this Bubble. + */ + void setBubbleInfo(@NonNull BubbleInfo bubbleInfo); + + /** + * Update the state and behavior of actions. + * + * @param actions the new state of the bubble's actions + */ + void updateActions(@NonNull List<BubbleInfo.Action> actions); + + /** + * Update the avatar from photo. + * + * @param avatar the new photo avatar in the bubble's primary button + */ + void updatePhotoAvatar(@NonNull Drawable avatar); + + /** + * Update the avatar. + * + * @param avatar the new avatar in the bubble's primary button + */ + void updateAvatar(@NonNull Drawable avatar); + + /** + * Display text. The bubble's drawer is not expandable while text is showing, and the drawer will + * be closed if already open. + * + * @param text the text to display to the user + */ + void showText(@NonNull CharSequence text); +} diff --git a/java/com/android/bubble/BubbleComponent.java b/java/com/android/bubble/BubbleComponent.java new file mode 100644 index 000000000..7a4665e74 --- /dev/null +++ b/java/com/android/bubble/BubbleComponent.java @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2018 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.bubble; + +import android.content.Context; +import android.support.annotation.NonNull; +import com.android.dialer.inject.HasRootComponent; +import dagger.Subcomponent; + +@Subcomponent +public abstract class BubbleComponent { + + @NonNull + public abstract Bubble getBubble(); + + public static BubbleComponent get(Context context) { + return ((HasComponent) ((HasRootComponent) context.getApplicationContext()).component()) + .bubbleComponent(); + } + + /** Used to refer to the root application component. */ + public interface HasComponent { + BubbleComponent bubbleComponent(); + } +} diff --git a/java/com/android/bubble/BubbleInfo.java b/java/com/android/bubble/BubbleInfo.java new file mode 100644 index 000000000..28793a78c --- /dev/null +++ b/java/com/android/bubble/BubbleInfo.java @@ -0,0 +1,129 @@ +/* + * Copyright (C) 2018 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.bubble; + +import android.app.PendingIntent; +import android.graphics.drawable.Drawable; +import android.graphics.drawable.Icon; +import android.support.annotation.ColorInt; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.annotation.Px; +import com.google.auto.value.AutoValue; +import java.util.Collections; +import java.util.List; + +/** Info for displaying a {@link Bubble} */ +@AutoValue +public abstract class BubbleInfo { + @ColorInt + public abstract int getPrimaryColor(); + + public abstract Icon getPrimaryIcon(); + + @Nullable + public abstract Drawable getAvatar(); + + @Px + public abstract int getStartingYPosition(); + + @NonNull + public abstract List<Action> getActions(); + + public static Builder builder() { + return new AutoValue_BubbleInfo.Builder().setActions(Collections.emptyList()); + } + + public static Builder from(@NonNull BubbleInfo bubbleInfo) { + return builder() + .setPrimaryColor(bubbleInfo.getPrimaryColor()) + .setPrimaryIcon(bubbleInfo.getPrimaryIcon()) + .setStartingYPosition(bubbleInfo.getStartingYPosition()) + .setActions(bubbleInfo.getActions()) + .setAvatar(bubbleInfo.getAvatar()); + } + + /** Builder for {@link BubbleInfo} */ + @AutoValue.Builder + public abstract static class Builder { + + public abstract Builder setPrimaryColor(@ColorInt int primaryColor); + + public abstract Builder setPrimaryIcon(@NonNull Icon primaryIcon); + + public abstract Builder setAvatar(@Nullable Drawable avatar); + + public abstract Builder setStartingYPosition(@Px int startingYPosition); + + public abstract Builder setActions(List<Action> actions); + + public abstract BubbleInfo build(); + } + + /** Represents actions to be shown in the bubble when expanded */ + @AutoValue + public abstract static class Action { + + public abstract Drawable getIconDrawable(); + + @Nullable + public abstract Drawable getSecondaryIconDrawable(); + + @NonNull + public abstract CharSequence getName(); + + @NonNull + public abstract PendingIntent getIntent(); + + public abstract boolean isCheckable(); + + public abstract boolean isChecked(); + + public static Builder builder() { + return new AutoValue_BubbleInfo_Action.Builder().setCheckable(true).setChecked(false); + } + + public static Builder from(@NonNull Action action) { + return builder() + .setIntent(action.getIntent()) + .setChecked(action.isChecked()) + .setCheckable(action.isCheckable()) + .setName(action.getName()) + .setIconDrawable(action.getIconDrawable()) + .setSecondaryIconDrawable(action.getSecondaryIconDrawable()); + } + + /** Builder for {@link Action} */ + @AutoValue.Builder + public abstract static class Builder { + + public abstract Builder setIconDrawable(Drawable iconDrawable); + + public abstract Builder setSecondaryIconDrawable(@Nullable Drawable secondaryIconDrawable); + + public abstract Builder setName(@NonNull CharSequence name); + + public abstract Builder setIntent(@NonNull PendingIntent intent); + + public abstract Builder setCheckable(boolean enabled); + + public abstract Builder setChecked(boolean checked); + + public abstract Action build(); + } + } +} diff --git a/java/com/android/bubble/stub/BubbleStub.java b/java/com/android/bubble/stub/BubbleStub.java new file mode 100644 index 000000000..267f33f31 --- /dev/null +++ b/java/com/android/bubble/stub/BubbleStub.java @@ -0,0 +1,56 @@ +/* + * Copyright (C) 2018 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.bubble.stub; + +import android.graphics.drawable.Drawable; +import android.support.annotation.NonNull; +import com.android.bubble.Bubble; +import com.android.bubble.BubbleInfo; +import java.util.List; +import javax.inject.Inject; + +public class BubbleStub implements Bubble { + + @Inject + public BubbleStub() {} + + @Override + public void show() {} + + @Override + public void hide() {} + + @Override + public boolean isVisible() { + return false; + } + + @Override + public void setBubbleInfo(@NonNull BubbleInfo bubbleInfo) {} + + @Override + public void updateActions(@NonNull List<BubbleInfo.Action> actions) {} + + @Override + public void updatePhotoAvatar(@NonNull Drawable avatar) {} + + @Override + public void updateAvatar(@NonNull Drawable avatar) {} + + @Override + public void showText(@NonNull CharSequence text) {} +} diff --git a/java/com/android/bubble/stub/StubBubbleModule.java b/java/com/android/bubble/stub/StubBubbleModule.java new file mode 100644 index 000000000..783983f2e --- /dev/null +++ b/java/com/android/bubble/stub/StubBubbleModule.java @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2018 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.bubble.stub; + +import com.android.bubble.Bubble; +import dagger.Binds; +import dagger.Module; +import javax.inject.Singleton; + +@Module +public abstract class StubBubbleModule { + + @Binds + @Singleton + public abstract Bubble bindsBubble(BubbleStub bubbleStub); +} |