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

Commit 2de33751 authored by Alison Cichowlas's avatar Alison Cichowlas Committed by android-build-merger
Browse files

Merge "Global actions visuals:" into pi-dev am: a52c08a7 

am: ce0300fb

Change-Id: I85baad128659b2cf9c03252e1cd45c553ebdd0cf
parents d0cf9774 ce0300fb

core/res/res/layout/global_actions_item.xml

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<!-- Used with LegacyGlobalActions. -->



<!-- RelativeLayouts have an issue enforcing minimum heights, so just

     work around this for now with LinearLayouts. -->

packages/SystemUI/res/layout/global_actions_item.xml

+2 −2
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ 
    android:minHeight="92dp"

    android:gravity="center"

    android:orientation="vertical"

    android:paddingEnd="0dip"

    android:paddingStart="0dip">

    android:paddingEnd="4dip"

    android:paddingStart="4dip">



    <ImageView

        android:id="@*android:id/icon"

packages/SystemUI/res/layout/global_actions_wrapped.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
        android:layout_gravity="top|right"

        android:gravity="center"

        android:orientation="vertical"

        android:padding="16dp"

        android:padding="12dp"

        android:translationZ="9dp" />



</com.android.systemui.HardwareUiLayout>

packages/SystemUI/res/values/dimens.xml

+1 −3
Original line number Diff line number Diff line
@@ -899,8 +899,6 @@ 
    <dimen name="default_gear_space">18dp</dimen>

    <dimen name="cell_overlay_padding">18dp</dimen>



    <dimen name="hwui_edge_margin">16dp</dimen>



    <dimen name="global_actions_panel_width">120dp</dimen>



    <dimen name="global_actions_top_padding">120dp</dimen>
@@ -916,7 +914,7 @@ 
    <dimen name="corner_size">8dp</dimen>

    <dimen name="top_padding">0dp</dimen>

    <dimen name="bottom_padding">48dp</dimen>

    <dimen name="edge_margin">16dp</dimen>

    <dimen name="edge_margin">8dp</dimen>



    <dimen name="rounded_corner_radius">0dp</dimen>

    <dimen name="rounded_corner_content_padding">0dp</dimen>

packages/SystemUI/src/com/android/systemui/HardwareUiLayout.java

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ public class HardwareUiLayout extends FrameLayout implements Tunable { 
        mEdgeBleed = Settings.Secure.getInt(getContext().getContentResolver(),

                EDGE_BLEED, 0) != 0;

        mRoundedDivider = Settings.Secure.getInt(getContext().getContentResolver(),

                ROUNDED_DIVIDER, 1) != 0;

                ROUNDED_DIVIDER, 0) != 0;

        updateEdgeMargin(mEdgeBleed ? 0 : getEdgePadding());

        mBackground = new HardwareBgDrawable(mRoundedDivider, !mEdgeBleed, getContext());

        if (mChild != null) {