diff options
6 files changed, 23 insertions, 2 deletions
diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml index 322e1be250a6..5795fd439fe2 100644 --- a/packages/SettingsLib/res/values/strings.xml +++ b/packages/SettingsLib/res/values/strings.xml @@ -1610,6 +1610,9 @@ <string name="dream_complication_title_cast_info">Cast Info</string> <!-- Screensaver overlay which displays home controls. [CHAR LIMIT=20] --> <string name="dream_complication_title_home_controls">Home Controls</string> + <!-- Screensaver overlay which displays smartspace. [CHAR LIMIT=20] --> + <string name="dream_complication_title_smartspace">Smartspace</string> + <!-- Title for a screen allowing the user to choose a profile picture. [CHAR LIMIT=NONE] --> <string name="avatar_picker_title">Choose a profile picture</string> diff --git a/packages/SettingsLib/src/com/android/settingslib/dream/DreamBackend.java b/packages/SettingsLib/src/com/android/settingslib/dream/DreamBackend.java index a46e23235843..22586171e5cf 100644 --- a/packages/SettingsLib/src/com/android/settingslib/dream/DreamBackend.java +++ b/packages/SettingsLib/src/com/android/settingslib/dream/DreamBackend.java @@ -92,7 +92,8 @@ public class DreamBackend { COMPLICATION_TYPE_WEATHER, COMPLICATION_TYPE_AIR_QUALITY, COMPLICATION_TYPE_CAST_INFO, - COMPLICATION_TYPE_HOME_CONTROLS + COMPLICATION_TYPE_HOME_CONTROLS, + COMPLICATION_TYPE_SMARTSPACE }) @Retention(RetentionPolicy.SOURCE) public @interface ComplicationType {} @@ -103,6 +104,7 @@ public class DreamBackend { public static final int COMPLICATION_TYPE_AIR_QUALITY = 4; 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; private final Context mContext; private final IDreamManager mDreamManager; @@ -351,6 +353,9 @@ public class DreamBackend { case COMPLICATION_TYPE_HOME_CONTROLS: res = R.string.dream_complication_title_home_controls; break; + case COMPLICATION_TYPE_SMARTSPACE: + res = R.string.dream_complication_title_smartspace; + break; default: return null; } diff --git a/packages/SystemUI/src/com/android/systemui/dreams/complication/Complication.java b/packages/SystemUI/src/com/android/systemui/dreams/complication/Complication.java index 54571448c981..29bb2f42cca5 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/complication/Complication.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/complication/Complication.java @@ -163,7 +163,8 @@ public interface Complication { COMPLICATION_TYPE_WEATHER, COMPLICATION_TYPE_AIR_QUALITY, COMPLICATION_TYPE_CAST_INFO, - COMPLICATION_TYPE_HOME_CONTROLS + COMPLICATION_TYPE_HOME_CONTROLS, + COMPLICATION_TYPE_SMARTSPACE }) @Retention(RetentionPolicy.SOURCE) @interface ComplicationType {} @@ -175,6 +176,7 @@ public interface Complication { int COMPLICATION_TYPE_AIR_QUALITY = 1 << 3; int COMPLICATION_TYPE_CAST_INFO = 1 << 4; int COMPLICATION_TYPE_HOME_CONTROLS = 1 << 5; + int COMPLICATION_TYPE_SMARTSPACE = 1 << 6; /** * The {@link Host} interface specifies a way a {@link Complication} to communicate with its diff --git a/packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationUtils.java b/packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationUtils.java index dcab90fe7ab9..d5db63dc9093 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationUtils.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationUtils.java @@ -21,6 +21,7 @@ import static com.android.systemui.dreams.complication.Complication.COMPLICATION 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_NONE; +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; @@ -51,6 +52,8 @@ public class ComplicationUtils { return COMPLICATION_TYPE_CAST_INFO; case DreamBackend.COMPLICATION_TYPE_HOME_CONTROLS: return COMPLICATION_TYPE_HOME_CONTROLS; + case DreamBackend.COMPLICATION_TYPE_SMARTSPACE: + return COMPLICATION_TYPE_SMARTSPACE; default: return COMPLICATION_TYPE_NONE; } diff --git a/packages/SystemUI/src/com/android/systemui/dreams/complication/SmartSpaceComplication.java b/packages/SystemUI/src/com/android/systemui/dreams/complication/SmartSpaceComplication.java index ac6edba6b3fa..567bdbc01170 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/complication/SmartSpaceComplication.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/complication/SmartSpaceComplication.java @@ -52,6 +52,11 @@ public class SmartSpaceComplication implements Complication { return mViewHolderProvider.get(); } + @Override + public int getRequiredTypeAvailability() { + return COMPLICATION_TYPE_SMARTSPACE; + } + /** * {@link CoreStartable} responsbile for registering {@link SmartSpaceComplication} with * SystemUI. diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/ComplicationUtilsTest.java b/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/ComplicationUtilsTest.java index 2915f5a504d7..e099c9269d3f 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/ComplicationUtilsTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/ComplicationUtilsTest.java @@ -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_SMARTSPACE; import static com.android.systemui.dreams.complication.Complication.COMPLICATION_TYPE_TIME; import static com.android.systemui.dreams.complication.Complication.COMPLICATION_TYPE_WEATHER; import static com.android.systemui.dreams.complication.ComplicationUtils.convertComplicationType; @@ -60,6 +61,8 @@ public class ComplicationUtilsTest extends SysuiTestCase { .isEqualTo(COMPLICATION_TYPE_CAST_INFO); assertThat(convertComplicationType(DreamBackend.COMPLICATION_TYPE_HOME_CONTROLS)) .isEqualTo(COMPLICATION_TYPE_HOME_CONTROLS); + assertThat(convertComplicationType(DreamBackend.COMPLICATION_TYPE_SMARTSPACE)) + .isEqualTo(COMPLICATION_TYPE_SMARTSPACE); } @Test |