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

Commit 9771f44d authored by Darrell Shi's avatar Darrell Shi Committed by Android (Google) Code Review
Browse files

Merge "Add showClockAndComplications to dream metadata."

parents e21f76af 7c4e947a

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1312,6 +1312,7 @@ package android { 
    field public static final int shouldDisableView = 16843246; // 0x10101ee

    field public static final int shouldUseDefaultUnfoldTransition = 16844364; // 0x101064c

    field public static final int showAsAction = 16843481; // 0x10102d9

    field public static final int showClockAndComplications;

    field public static final int showDefault = 16843258; // 0x10101fa

    field public static final int showDividers = 16843561; // 0x1010329

    field public static final int showForAllUsers = 16844015; // 0x10104ef

core/res/res/values/attrs.xml

+3 −0
Original line number Diff line number Diff line
@@ -8457,6 +8457,9 @@ 
        <attr name="settingsActivity" />

        <!-- A preview, in a drawable resource id, of what the Dream will look like. -->

        <attr name="previewImage" format="reference" />

        <!-- Whether to show clock and other complications such as weather in the overlay. Default

             to true. Note that the overlay on dreams is currently only supported on tablets. -->

        <attr name="showClockAndComplications" format="boolean" />

    </declare-styleable>















    <!--  Use <code>trust-agent</code> as the root tag of the XML resource that

































core/res/res/values/public.xml



+1
−0




























Original line number
Diff line number
Diff line








@@ -3250,6 +3250,7 @@













    <public name="supportedTypes" />















    <public name="resetEnabledSettingsOnAppDataCleared" />















    <public name="supportsStylusHandwriting" />













    <public name="showClockAndComplications" />















    <!-- @hide @SystemApi -->















    <public name="gameSessionService" />















  </staging-public-group>