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

Commit d0e94499 authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "Add public attribute for window clipToOutline" into lmp-dev

parents c2f33167 40982d46

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1388,6 +1388,7 @@ package android { 
    field public static final int windowAllowExitTransitionOverlap = 16843837; // 0x101043d

    field public static final int windowAnimationStyle = 16842926; // 0x10100ae

    field public static final int windowBackground = 16842836; // 0x1010054

    field public static final int windowClipToOutline = 16843953; // 0x10104b1

    field public static final int windowCloseOnTouchOutside = 16843611; // 0x101035b

    field public static final int windowContentOverlay = 16842841; // 0x1010059

    field public static final int windowContentTransitionManager = 16843795; // 0x1010413

core/res/res/values/attrs.xml

+3 −0
Original line number Diff line number Diff line
@@ -1847,6 +1847,9 @@ 


        <!-- Elevation to use for the window. -->

        <attr name="windowElevation" format="dimension" />



        <!-- Whether to clip window content to the outline of the window background. -->

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

    </declare-styleable>



    <!-- The set of attributes that describe a AlertDialog's theme. -->

core/res/res/values/public.xml

+1 −0
Original line number Diff line number Diff line
@@ -2268,6 +2268,7 @@ 
  <public type="attr" name="checkMarkTintMode" />

  <public type="attr" name="popupTheme" />

  <public type="attr" name="toolbarStyle" />

  <public type="attr" name="windowClipToOutline" />



  <public-padding type="dimen" name="l_resource_pad" end="0x01050010" />

core/res/res/values/themes.xml

+3 −0
Original line number Diff line number Diff line
@@ -169,6 +169,7 @@ please see themes_device_defaults.xml. 


        <!-- Window attributes -->

        <item name="windowBackground">@drawable/screen_background_selector_dark</item>

        <item name="windowClipToOutline">false</item>

        <item name="windowFrame">@null</item>

        <item name="windowNoTitle">false</item>

        <item name="windowFullscreen">false</item>
@@ -473,6 +474,8 @@ please see themes_device_defaults.xml. 
         <p>This is designed for API level 10 and lower.</p>-->

    <style name="Theme.Light">

        <item name="windowBackground">@drawable/screen_background_selector_light</item>

        <item name="windowClipToOutline">false</item>



        <item name="colorBackground">@color/background_light</item>

        <item name="colorForeground">@color/bright_foreground_light</item>

        <item name="colorForegroundInverse">@color/bright_foreground_light_inverse</item>

core/res/res/values/themes_material.xml

+2 −0
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ please see themes_device_defaults.xml. 


        <!-- Window attributes -->

        <item name="windowBackground">@color/background_material_dark</item>

        <item name="windowClipToOutline">true</item>

        <item name="windowFrame">@null</item>

        <item name="windowNoTitle">false</item>

        <item name="windowFullscreen">false</item>
@@ -512,6 +513,7 @@ please see themes_device_defaults.xml. 


        <!-- Window attributes -->

        <item name="windowBackground">@color/background_material_light</item>

        <item name="windowClipToOutline">true</item>

        <item name="windowFrame">@null</item>

        <item name="windowNoTitle">false</item>

        <item name="windowFullscreen">false</item>