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

Commit 0db3ff0b authored by Adam Powell's avatar Adam Powell
Browse files

Remove default background from Holo; add Holo.Extended themes 

Change-Id: Ie3143230ebb827eb3625ffe40ee4fc24853ab9dc
parent 7f3154d7

api/current.xml

+29 −7
Original line number Diff line number Diff line
@@ -14275,7 +14275,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973947"

 value="16973949"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -14286,7 +14286,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973948"

 value="16973950"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -14436,6 +14436,17 @@ 
 visibility="public"

>

</field>

<field name="Theme_Holo_Extended"

 type="int"

 transient="false"

 volatile="false"

 value="16973943"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="Theme_Holo_Light"

 type="int"

 transient="false"
@@ -14458,6 +14469,17 @@ 
 visibility="public"

>

</field>

<field name="Theme_Holo_Light_Extended"

 type="int"

 transient="false"

 volatile="false"

 value="16973944"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="Theme_Holo_NoActionBar"

 type="int"

 transient="false"
@@ -14759,7 +14781,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973946"

 value="16973948"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -14770,7 +14792,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973945"

 value="16973947"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -14924,7 +14946,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973949"

 value="16973951"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -14990,7 +15012,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973943"

 value="16973945"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -15045,7 +15067,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16973944"

 value="16973946"

 static="true"

 final="true"

 deprecated="not deprecated"

core/res/res/values/public.xml

+2 −0
Original line number Diff line number Diff line
@@ -1402,6 +1402,8 @@ 
  <public type="style" name="Theme.Holo.Light" />

  <public type="style" name="Theme.Holo.Dialog" />

  <public type="style" name="Theme.Holo.Light.Dialog" />

  <public type="style" name="Theme.Holo.Extended" />

  <public type="style" name="Theme.Holo.Light.Extended" />



  <public type="style" name="Widget.ListPopupWindow" />

  <public type="style" name="Widget.PopupMenu" />

core/res/res/values/themes.xml

+18 −4
Original line number Diff line number Diff line
@@ -641,7 +641,7 @@ 
        <item name="colorForeground">@android:color/bright_foreground_holo_dark</item>

        <item name="colorForegroundInverse">@android:color/bright_foreground_inverse_holo_dark</item>

        <item name="colorBackground">@android:color/background_holo_dark</item>

        <item name="colorBackgroundCacheHint">@android:color/transparent</item>

        <item name="colorBackgroundCacheHint">?android:attr/colorBackground</item>

        <item name="disabledAlpha">0.5</item>

        <item name="backgroundDimAmount">0.6</item>
@@ -734,7 +734,7 @@ 
        <item name="galleryItemBackground">@android:drawable/gallery_item_background</item>

        

        <!-- Window attributes -->

        <item name="windowBackground">@android:drawable/background_holo_dark</item>

        <item name="windowBackground">?android:attr/colorBackground</item>

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

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

        <item name="windowFullscreen">false</item>
@@ -875,7 +875,7 @@ 
        <item name="colorForeground">@android:color/bright_foreground_holo_light</item>

        <item name="colorForegroundInverse">@android:color/bright_foreground_inverse_holo_light</item>

        <item name="colorBackground">@android:color/background_holo_light</item>

        <item name="colorBackgroundCacheHint">@android:color/transparent</item>

        <item name="colorBackgroundCacheHint">?android:attr/colorBackground</item>

        <item name="disabledAlpha">0.5</item>

        <item name="backgroundDimAmount">0.6</item>
@@ -968,7 +968,7 @@ 
        <item name="galleryItemBackground">@android:drawable/gallery_item_background</item>

        

        <!-- Window attributes -->

        <item name="windowBackground">@android:drawable/background_holo_light</item>

        <item name="windowBackground">?android:attr/colorBackground</item>

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

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

        <item name="windowFullscreen">false</item>
@@ -1130,6 +1130,20 @@ 
        <item name="android:windowContentOverlay">@null</item>

    </style>



    <!-- Variant of the holographic dark theme that includes extra decorations

         appropriate for when hardware acceleration is in use. -->

    <style name="Theme.Holo.Extended">

        <item name="windowBackground">@android:drawable/background_holo_dark</item>

        <item name="colorBackgroundCacheHint">@android:color/transparent</item>

    </style>



    <!-- Variant of the holographic light theme that includes extra decorations

         appropriate for when hardware acceleration is in use. -->

    <style name="Theme.Holo.Light.Extended">

        <item name="windowBackground">@android:drawable/background_holo_light</item>

        <item name="colorBackgroundCacheHint">@android:color/transparent</item>

    </style>

 

    <!-- Dialog themes for Holo -->



    <!-- Holo theme for dialog windows and activities, which is used by the