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

Commit 0b4431b4 authored by Xiaowen Lei's avatar Xiaowen Lei Committed by Automerger Merge Worker
Browse files

Merge "Set required type for media entry chip complication." into tm-qpr-dev... 

Merge "Set required type for media entry chip complication." into tm-qpr-dev am: 268f0020 am: 070063cc

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20281701



Change-Id: I9c8edaaa05cc830f7b56e9f6cb9905ec5da85c6b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 299e0e89 070063cc

packages/SettingsLib/src/com/android/settingslib/dream/DreamBackend.java

+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;

packages/SystemUI/src/com/android/systemui/dreams/complication/Complication.java

+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

packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationUtils.java

+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;

        }

packages/SystemUI/src/com/android/systemui/dreams/complication/DreamMediaEntryComplication.java

+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.

     */

packages/SystemUI/tests/src/com/android/systemui/dreams/complication/ComplicationUtilsTest.java

+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