Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7b8a596 authored by Xiaowen Lei's avatar Xiaowen Lei
Browse files

Set required type for media entry chip complication.

Bug: 242613318
Test: on device - media only shows if complications are enabled in Settings
Test: on device - media only shows for dreams with complications enabled
Test: atest ComplicationUtilsTest
Test: atest DreamMediaEntryComplicationTest
Change-Id: I3f9fd0f301ca379a11ab15a57737623df7d5daad
parent 639a4a91
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -92,7 +92,8 @@ public class DreamBackend {
            COMPLICATION_TYPE_AIR_QUALITY,
            COMPLICATION_TYPE_CAST_INFO,
            COMPLICATION_TYPE_HOME_CONTROLS,
            COMPLICATION_TYPE_SMARTSPACE
            COMPLICATION_TYPE_SMARTSPACE,
            COMPLICATION_TYPE_MEDIA_ENTRY
    })
    @Retention(RetentionPolicy.SOURCE)
    public @interface ComplicationType {
@@ -105,6 +106,7 @@ public class DreamBackend {
    public static final int COMPLICATION_TYPE_CAST_INFO = 5;
    public static final int COMPLICATION_TYPE_HOME_CONTROLS = 6;
    public static final int COMPLICATION_TYPE_SMARTSPACE = 7;
    public static final int COMPLICATION_TYPE_MEDIA_ENTRY = 8;

    private final Context mContext;
    private final IDreamManager mDreamManager;
+3 −1
Original line number Diff line number Diff line
@@ -164,7 +164,8 @@ public interface Complication {
            COMPLICATION_TYPE_AIR_QUALITY,
            COMPLICATION_TYPE_CAST_INFO,
            COMPLICATION_TYPE_HOME_CONTROLS,
            COMPLICATION_TYPE_SMARTSPACE
            COMPLICATION_TYPE_SMARTSPACE,
            COMPLICATION_TYPE_MEDIA_ENTRY
    })
    @Retention(RetentionPolicy.SOURCE)
    @interface ComplicationType {}
@@ -177,6 +178,7 @@ public interface Complication {
    int COMPLICATION_TYPE_CAST_INFO = 1 << 4;
    int COMPLICATION_TYPE_HOME_CONTROLS = 1 << 5;
    int COMPLICATION_TYPE_SMARTSPACE = 1 << 6;
    int COMPLICATION_TYPE_MEDIA_ENTRY = 1 << 7;

    /**
     * The {@link Host} interface specifies a way a {@link Complication} to communicate with its
+3 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static com.android.systemui.dreams.complication.Complication.COMPLICATION
import static com.android.systemui.dreams.complication.Complication.COMPLICATION_TYPE_CAST_INFO;
import static com.android.systemui.dreams.complication.Complication.COMPLICATION_TYPE_DATE;
import static com.android.systemui.dreams.complication.Complication.COMPLICATION_TYPE_HOME_CONTROLS;
import static com.android.systemui.dreams.complication.Complication.COMPLICATION_TYPE_MEDIA_ENTRY;
import static com.android.systemui.dreams.complication.Complication.COMPLICATION_TYPE_NONE;
import static com.android.systemui.dreams.complication.Complication.COMPLICATION_TYPE_SMARTSPACE;
import static com.android.systemui.dreams.complication.Complication.COMPLICATION_TYPE_TIME;
@@ -54,6 +55,8 @@ public class ComplicationUtils {
                return COMPLICATION_TYPE_HOME_CONTROLS;
            case DreamBackend.COMPLICATION_TYPE_SMARTSPACE:
                return COMPLICATION_TYPE_SMARTSPACE;
            case DreamBackend.COMPLICATION_TYPE_MEDIA_ENTRY:
                return COMPLICATION_TYPE_MEDIA_ENTRY;
            default:
                return COMPLICATION_TYPE_NONE;
        }
+5 −0
Original line number Diff line number Diff line
@@ -55,6 +55,11 @@ public class DreamMediaEntryComplication implements Complication {
        return mComponentFactory.create().getViewHolder();
    }

    @Override
    public int getRequiredTypeAvailability() {
        return COMPLICATION_TYPE_MEDIA_ENTRY;
    }

    /**
     * Contains values/logic associated with the dream complication view.
     */
+3 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static com.android.systemui.dreams.complication.Complication.COMPLICATION
import static com.android.systemui.dreams.complication.Complication.COMPLICATION_TYPE_CAST_INFO;
import static com.android.systemui.dreams.complication.Complication.COMPLICATION_TYPE_DATE;
import static com.android.systemui.dreams.complication.Complication.COMPLICATION_TYPE_HOME_CONTROLS;
import static com.android.systemui.dreams.complication.Complication.COMPLICATION_TYPE_MEDIA_ENTRY;
import static com.android.systemui.dreams.complication.Complication.COMPLICATION_TYPE_SMARTSPACE;
import static com.android.systemui.dreams.complication.Complication.COMPLICATION_TYPE_TIME;
import static com.android.systemui.dreams.complication.Complication.COMPLICATION_TYPE_WEATHER;
@@ -63,6 +64,8 @@ public class ComplicationUtilsTest extends SysuiTestCase {
                .isEqualTo(COMPLICATION_TYPE_HOME_CONTROLS);
        assertThat(convertComplicationType(DreamBackend.COMPLICATION_TYPE_SMARTSPACE))
                .isEqualTo(COMPLICATION_TYPE_SMARTSPACE);
        assertThat(convertComplicationType(DreamBackend.COMPLICATION_TYPE_MEDIA_ENTRY))
                .isEqualTo(COMPLICATION_TYPE_MEDIA_ENTRY);
    }

    @Test
Loading