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

Commit ffdd2191 authored by Darrell Shi's avatar Darrell Shi Committed by Automerger Merge Worker
Browse files

Merge changes from topic "home-controls-type" into tm-qpr-dev am: 111c26fe 

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



Change-Id: I52d1d15c722e04489ef995922345f1206055748b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d0d0e6f2 111c26fe

packages/SettingsLib/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -1608,6 +1608,8 @@ 
    <string name="dream_complication_title_aqi">Air Quality</string>

    <!-- Screensaver overlay which displays cast info. [CHAR LIMIT=20] -->

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



    <!-- 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>

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

+6 −1
Original line number Diff line number Diff line
@@ -91,7 +91,8 @@ public class DreamBackend { 
            COMPLICATION_TYPE_DATE,

            COMPLICATION_TYPE_WEATHER,

            COMPLICATION_TYPE_AIR_QUALITY,

            COMPLICATION_TYPE_CAST_INFO

            COMPLICATION_TYPE_CAST_INFO,

            COMPLICATION_TYPE_HOME_CONTROLS

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface ComplicationType {}
@@ -101,6 +102,7 @@ public class DreamBackend { 
    public static final int COMPLICATION_TYPE_WEATHER = 3;

    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;



    private final Context mContext;

    private final IDreamManager mDreamManager;
@@ -346,6 +348,9 @@ public class DreamBackend { 
            case COMPLICATION_TYPE_CAST_INFO:

                res = R.string.dream_complication_title_cast_info;

                break;

            case COMPLICATION_TYPE_HOME_CONTROLS:

                res = R.string.dream_complication_title_home_controls;

                break;

            default:

                return null;

        }

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

+3 −1
Original line number Diff line number Diff line
@@ -162,7 +162,8 @@ public interface Complication { 
            COMPLICATION_TYPE_DATE,

            COMPLICATION_TYPE_WEATHER,

            COMPLICATION_TYPE_AIR_QUALITY,

            COMPLICATION_TYPE_CAST_INFO

            COMPLICATION_TYPE_CAST_INFO,

            COMPLICATION_TYPE_HOME_CONTROLS

    })

    @Retention(RetentionPolicy.SOURCE)

    @interface ComplicationType {}
@@ -173,6 +174,7 @@ public interface Complication { 
    int COMPLICATION_TYPE_WEATHER = 1 << 2;

    int COMPLICATION_TYPE_AIR_QUALITY = 1 << 3;

    int COMPLICATION_TYPE_CAST_INFO = 1 << 4;

    int COMPLICATION_TYPE_HOME_CONTROLS = 1 << 5;



    /**

     * 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
@@ -19,6 +19,7 @@ package com.android.systemui.dreams.complication; 
import static com.android.systemui.dreams.complication.Complication.COMPLICATION_TYPE_AIR_QUALITY;

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

import static com.android.systemui.dreams.complication.Complication.COMPLICATION_TYPE_TIME;

import static com.android.systemui.dreams.complication.Complication.COMPLICATION_TYPE_WEATHER;
@@ -48,6 +49,8 @@ public class ComplicationUtils { 
                return COMPLICATION_TYPE_AIR_QUALITY;

            case DreamBackend.COMPLICATION_TYPE_CAST_INFO:

                return COMPLICATION_TYPE_CAST_INFO;

            case DreamBackend.COMPLICATION_TYPE_HOME_CONTROLS:

                return COMPLICATION_TYPE_HOME_CONTROLS;

            default:

                return COMPLICATION_TYPE_NONE;

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ public class DreamHomeControlsComplication implements Complication { 


    @Override

    public int getRequiredTypeAvailability() {

        return COMPLICATION_TYPE_NONE;

        return COMPLICATION_TYPE_HOME_CONTROLS;

    }



    /**