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

Commit 87d9a709 authored by Josh Guilfoyle's avatar Josh Guilfoyle
Browse files

Removed color and status bar attributes. 

As a result, the status bar theming was refactored somewhat
significantly.  Some regressions were introduced.

CR: Sergey Ten
parent b855c2d1

api/current.xml

+15 −114
Original line number Diff line number Diff line
@@ -1597,7 +1597,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16843385"

 value="16843378"

 static="true"

 final="true"

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

 transient="false"

 volatile="false"

 value="16843388"

 value="16843381"

 static="true"

 final="true"

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

 transient="false"

 volatile="false"

 value="16843389"

 value="16843382"

 static="true"

 final="true"

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

 transient="false"

 volatile="false"

 value="16843394"

 value="16843387"

 static="true"

 final="true"

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

 transient="false"

 volatile="false"

 value="16843393"

 value="16843386"

 static="true"

 final="true"

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

>

</field>

<field name="colorDisabled"

 type="int"

 transient="false"

 volatile="false"

 value="16843380"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="colorForeground"

 type="int"

 transient="false"
@@ -2418,72 +2407,6 @@ 
 visibility="public"

>

</field>

<field name="colorPrimaryFocus"

 type="int"

 transient="false"

 volatile="false"

 value="16843376"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="colorPrimaryPressed"

 type="int"

 transient="false"

 volatile="false"

 value="16843377"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="colorRest"

 type="int"

 transient="false"

 volatile="false"

 value="16843381"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="colorRestStroke"

 type="int"

 transient="false"

 volatile="false"

 value="16843382"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="colorSecondaryFocus"

 type="int"

 transient="false"

 volatile="false"

 value="16843378"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="colorSecondaryPressed"

 type="int"

 transient="false"

 volatile="false"

 value="16843379"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="columnDelay"

 type="int"

 transient="false"
@@ -2774,7 +2697,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16843384"

 value="16843377"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -3269,7 +3192,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16843396"

 value="16843389"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -3841,7 +3764,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16843397"

 value="16843390"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -4963,7 +4886,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16843383"

 value="16843376"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -4974,7 +4897,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16843387"

 value="16843380"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -5205,7 +5128,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16843395"

 value="16843388"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -6492,7 +6415,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16843386"

 value="16843379"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -7082,28 +7005,6 @@ 
 visibility="public"

>

</field>

<field name="statusBarExpandedBackgroundColor"

 type="int"

 transient="false"

 volatile="false"

 value="16843398"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="statusBarLatestItemBackground"

 type="int"

 transient="false"

 volatile="false"

 value="16843399"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="stepSize"

 type="int"

 transient="false"
@@ -7218,7 +7119,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16843390"

 value="16843383"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -7493,7 +7394,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16843391"

 value="16843384"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -7845,7 +7746,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16843392"

 value="16843385"

 static="true"

 final="true"

 deprecated="not deprecated"

core/res/res/layout/status_bar_expanded.xml

+0 −1
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ 
            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:fadingEdge="none"

            android:background="?android:attr/statusBarExpandedBackgroundColor"

            >

            <com.android.server.status.NotificationLinearLayout

                android:id="@+id/notificationLinearLayout"

core/res/res/layout/status_bar_latest_event.xml

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
    <com.android.server.status.LatestItemView android:id="@+id/content"

            android:layout_width="fill_parent"

            android:layout_height="64sp"

            android:background="?android:attr/statusBarLatestItemBackground"

            android:focusable="true"

            android:clickable="true"

            android:paddingRight="6sp"

core/res/res/layout/status_bar_tracking.xml

+1 −2
Original line number Diff line number Diff line
@@ -23,10 +23,9 @@ 
    android:paddingBottom="0px"

    android:paddingLeft="0px"

    android:paddingRight="0px"

    android:background="?android:attr/statusBarExpandedBackgroundColor"

    >



    <LinearLayout

    <com.android.server.status.TrackingPatternView

        android:layout_width="fill_parent"

        android:layout_height="wrap_content"

        android:layout_weight="1"

core/res/res/values/attrs.xml

+2 −16
Original line number Diff line number Diff line
@@ -37,20 +37,6 @@ 
             window is floating. -->

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



		<!-- ============== -->

        <!-- Pluto color palette styles -->

        <!-- ============== -->

        <eat-comment />

        

        <attr name="colorPrimaryFocus" format="reference|color" />

        <attr name="colorPrimaryPressed" format="reference|color" />

        <attr name="colorSecondaryFocus" format="reference|color" />

        <attr name="colorSecondaryPressed" format="reference|color" />

        <attr name="colorTertiary" format="reference|color" />

        <attr name="colorDisabled" format="reference|color" />

        <attr name="colorRest" format="reference|color" />

        <attr name="colorRestStroke" format="reference|color" />



        <!-- =========== -->

        <!-- Text styles -->

        <!-- =========== -->
@@ -454,8 +440,8 @@ 
        <!-- =================== -->

        <!-- status bar related attributes -->

        <!-- =================== -->

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

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

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

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



    </declare-styleable>