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

Merge "Sharesheet - Add copy text in response to UXR" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-16 16:15:24 +00:00
committed by Android (Google) Code Review
parent 10ae84a9c1 9ea80f3d37
commit aec888d7cd
1 changed files with 41 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
core/res/res/layout/chooser_grid_preview_text.xml
View File

@@ -24,9 +24,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="@dimen/chooser_view_spacing" android:paddingBottom="@dimen/chooser_view_spacing"
android:background="?attr/colorBackgroundFloating"> android:background="?android:attr/colorBackgroundFloating">
<LinearLayout <RelativeLayout
android:layout_width="@dimen/chooser_preview_width" android:layout_width="@dimen/chooser_preview_width"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
@@ -35,28 +35,51 @@
android:paddingRight="@dimen/chooser_edge_margin_normal" android:paddingRight="@dimen/chooser_edge_margin_normal"
android:layout_marginBottom="@dimen/chooser_view_spacing" android:layout_marginBottom="@dimen/chooser_view_spacing"
android:id="@+id/content_preview_text_layout"> android:id="@+id/content_preview_text_layout">
<TextView <TextView
android:id="@+id/content_preview_text" android:id="@+id/content_preview_text"
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_weight="1"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_alignParentStart="true"
android:layout_toStartOf="@id/copy_button"
android:layout_centerVertical="true"
android:ellipsize="end" android:ellipsize="end"
android:gravity="start|top" android:textColor="?android:attr/textColorPrimary"
android:paddingRight="@dimen/chooser_view_spacing"
android:maxLines="2"/> android:maxLines="2"/>
<ImageButton
<LinearLayout
android:id="@+id/copy_button" android:id="@+id/copy_button"
android:layout_width="48dp" android:orientation="vertical"
android:layout_height="48dp" android:layout_width="wrap_content"
android:padding="12dp" android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_alignParentEnd="true"
android:layout_marginStart="@dimen/chooser_view_spacing"
android:gravity="center" android:gravity="center"
android:layout_gravity="center_vertical" android:minWidth="48dp"
android:src="@drawable/ic_content_copy_gm2" android:minHeight="48dp"
android:clickable="true" android:clickable="true"
android:contentDescription="@string/copy" android:background="?android:attr/selectableItemBackgroundBorderless">
android:background="?attr/selectableItemBackgroundBorderless"/>
</LinearLayout> <ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:gravity="top|center_horizontal"
android:src="@drawable/ic_content_copy_gm2" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:gravity="center_horizontal"
android:text="@string/copy"
android:textColor="?android:textColorSecondary"
android:textSize="12sp"
android:maxWidth="72dp"
android:maxLines="2"
android:ellipsize="end" />
</LinearLayout>
</RelativeLayout>
<!-- Required sub-layout so we can get the nice rounded corners--> <!-- Required sub-layout so we can get the nice rounded corners-->
<!-- around this section --> <!-- around this section -->
@@ -89,7 +112,8 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="2" android:maxLines="2"
android:textSize="20sp"/> android:textSize="20sp"
android:textColor="?android:attr/textColorPrimary"/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>