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

Commit cb46931f authored by Aran Ink's avatar Aran Ink Committed by Automerger Merge Worker
Browse files

Merge "Adjust GlobalActions power item layout to adapt to size changes." into...

Merge "Adjust GlobalActions power item layout to adapt to size changes." into rvc-dev am: 944f7898 am: 9026e4ed

Change-Id: I3c236702f6c0e887fe2a79e949a3d947d099214a
parents 5ae2bd6c 9026e4ed
Loading
Loading
Loading
Loading
+14 −30
Original line number Diff line number Diff line
@@ -20,51 +20,35 @@
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="0dp"
    android:layout_weight="1"
    android:layout_height="wrap_content"
    android:gravity="center"
    android:paddingTop="@dimen/global_actions_grid_item_vertical_margin"
    android:paddingBottom="@dimen/global_actions_grid_item_vertical_margin"
    android:layout_height="98dp"
    android:gravity="bottom|center_horizontal"
    android:orientation="vertical"
    android:paddingTop="12dp"
    android:paddingBottom="12dp"
    android:paddingLeft="@dimen/global_actions_grid_item_side_margin"
    android:paddingRight="@dimen/global_actions_grid_item_side_margin"
    android:layout_marginRight="@dimen/control_base_item_margin"
    android:layout_marginLeft="@dimen/control_base_item_margin"
    android:stateListAnimator="@anim/control_state_list_animator"
    android:background="@drawable/control_background">
    <LinearLayout
        android:layout_width="@dimen/global_actions_grid_item_width"
        android:layout_height="@dimen/global_actions_grid_item_height"
        android:gravity="top|center_horizontal"
        android:orientation="vertical">
        <ImageView
            android:id="@*android:id/icon"
            android:layout_width="@dimen/global_actions_grid_item_icon_width"
            android:layout_height="@dimen/global_actions_grid_item_icon_height"
            android:layout_marginTop="@dimen/global_actions_grid_item_icon_top_margin"
            android:layout_marginBottom="@dimen/global_actions_grid_item_icon_bottom_margin"
            android:layout_marginLeft="@dimen/global_actions_grid_item_icon_side_margin"
            android:layout_marginRight="@dimen/global_actions_grid_item_icon_side_margin"
            android:layout_width="20dp"
            android:layout_height="20dp"
            android:layout_marginBottom="14dp"
            android:scaleType="centerInside"
            android:tint="@color/control_default_foreground" />

            android:tint="@color/control_primary_text" />
        <TextView
            android:id="@*android:id/message"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:ellipsize="marquee"
            android:marqueeRepeatLimit="marquee_forever"
            android:singleLine="true"
            android:maxLines="2"
            android:textSize="12sp"
            android:gravity="center"
            android:textSize="12dp"
            android:textColor="@color/control_default_foreground"
            android:textColor="@color/control_primary_text"
            android:breakStrategy="high_quality"
            android:hyphenationFrequency="full"
            android:textAppearance="?android:attr/textAppearanceSmall" />

        <TextView
            android:visibility="gone"
            android:id="@*android:id/status"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:gravity="center"
            android:textColor="@color/control_default_foreground"
            android:textAppearance="?android:attr/textAppearanceSmall" />
    </LinearLayout>
</LinearLayout>