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

Commit bbc6f3e6 authored by Alan Viverette's avatar Alan Viverette
Browse files

Revert action bar theme attribute 

BUG: 13878093
Change-Id: I7cc4e270854f66d604a6e22eafbeef37c968fdae
parent 012785d8

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -246,6 +246,7 @@ package android { 
    field public static final int actionBarTabBarStyle = 16843508; // 0x10102f4

    field public static final int actionBarTabStyle = 16843507; // 0x10102f3

    field public static final int actionBarTabTextStyle = 16843509; // 0x10102f5

    field public static final int actionBarTheme = 16843836; // 0x101043c

    field public static final int actionBarWidgetTheme = 16843671; // 0x1010397

    field public static final int actionButtonStyle = 16843480; // 0x10102d8

    field public static final int actionDropDownStyle = 16843479; // 0x10102d7

core/res/res/layout/screen_action_bar.xml

+5 −5
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ This is an optimized layout for a screen with the Action Bar enabled. 
    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:splitMotionEvents="false"

    android:theme="?attr/actionBarWidgetTheme">

    android:theme="?attr/actionBarTheme">

    <FrameLayout android:id="@android:id/content"

                 android:layout_width="match_parent"

                 android:layout_height="match_parent" />
@@ -33,25 +33,25 @@ This is an optimized layout for a screen with the Action Bar enabled. 
        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_alignParentTop="true"

        style="?android:attr/actionBarStyle"

        style="?attr/actionBarStyle"

        android:sharedElementName="android:action_bar"

        android:gravity="top">

        <com.android.internal.widget.ActionBarView

            android:id="@+id/action_bar"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            style="?android:attr/actionBarStyle" />

            style="?attr/actionBarStyle" />

        <com.android.internal.widget.ActionBarContextView

            android:id="@+id/action_context_bar"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:visibility="gone"

            style="?android:attr/actionModeStyle" />

            style="?attr/actionModeStyle" />

    </com.android.internal.widget.ActionBarContainer>

    <com.android.internal.widget.ActionBarContainer android:id="@+id/split_action_bar"

                  android:layout_width="match_parent"

                  android:layout_height="wrap_content"

                  style="?android:attr/actionBarSplitStyle"

                  style="?attr/actionBarSplitStyle"

                  android:visibility="gone"

                  android:gravity="center"/>

</com.android.internal.widget.ActionBarOverlayLayout>

core/res/res/values/attrs.xml

+4 −0
Original line number Diff line number Diff line
@@ -691,6 +691,10 @@ 
             buttons. actionBarStyle is still used for the primary

             bar. -->

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

        <!-- Reference to a theme that should be used to inflate the

             action bar. This will be inherited by any widget inflated

             into the action bar. -->

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

        <!-- Reference to a theme that should be used to inflate widgets

             and layouts destined for the action bar. Most of the time

             this will be a reference to the current theme, but when

core/res/res/values/public.xml

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

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

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

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



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

core/res/res/values/themes_quantum.xml

+1 −1
Original line number Diff line number Diff line
@@ -694,7 +694,7 @@ please see themes_device_defaults.xml. 
         with an inverse color profile. The dark action bar sharply stands out against

         the light content. -->

    <style name="Theme.Quantum.Light.DarkActionBar">

        <item name="actionBarWidgetTheme">@style/Theme.Quantum</item>

        <item name="actionBarTheme">@style/Theme.Quantum</item>

    </style>



    <!-- Variant of the quantum (dark) theme with no action bar. -->