Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I65df7db8e2d28f09d915a35f94d5d2cc19995246
This commit is contained in:
Aran Ink
2020-05-15 21:14:08 +00:00
committed by Automerger Merge Worker
parent 950e8d69b5 944f789820
commit 9026e4ede1
1 changed files with 14 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
packages/SystemUI/res/layout/global_actions_grid_item_v2.xml
View File

@@ -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>