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

Merge "Apply scrollable to app pinning text area" am: 7f3a7daaf5

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537210

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaa70f235fc1cadd5cb4441de61d4b03f645b6504
This commit is contained in:
Jeff DeCew
2021-01-13 15:01:33 +00:00
committed by Automerger Merge Worker
parent 62572cf783 7f3a7daaf5
commit b3deb44a56
1 changed files with 63 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
packages/SystemUI/res/layout/screen_pinning_request_text_area.xml
View File

@@ -16,65 +16,72 @@
* limitations under the License.
*/
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/screen_pinning_text_area"
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?android:attr/colorAccent"
android:gravity="center_vertical">
android:fillViewport="true">
<TextView
android:id="@+id/screen_pinning_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingEnd="48dp"
android:paddingStart="48dp"
android:paddingTop="43dp"
android:text="@string/screen_pinning_title"
android:textColor="@android:color/white"
android:textSize="24sp" />
<TextView
android:id="@+id/screen_pinning_description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/screen_pinning_title"
android:paddingEnd="48dp"
android:paddingStart="48dp"
android:paddingTop="12.6dp"
android:text="@string/screen_pinning_description"
android:textColor="@android:color/white"
android:textSize="16sp" />
<Button
android:id="@+id/screen_pinning_ok_button"
style="@android:style/Widget.Material.Button"
<RelativeLayout
android:id="@+id/screen_pinning_text_area"
android:layout_width="wrap_content"
android:layout_height="36dp"
android:layout_alignParentEnd="true"
android:layout_below="@+id/screen_pinning_description"
android:layout_marginEnd="40dp"
android:layout_marginTop="18dp"
android:background="@null"
android:paddingEnd="8dp"
android:paddingStart="8dp"
android:text="@string/screen_pinning_positive"
android:textColor="@android:color/white"
android:textSize="14sp" />
android:layout_height="wrap_content"
android:background="?android:attr/colorAccent"
android:gravity="center_vertical">
<Button
android:id="@+id/screen_pinning_cancel_button"
style="@android:style/Widget.Material.Button"
android:layout_width="wrap_content"
android:layout_height="36dp"
android:layout_alignTop="@id/screen_pinning_ok_button"
android:layout_marginEnd="4dp"
android:layout_toStartOf="@id/screen_pinning_ok_button"
android:background="@null"
android:paddingEnd="8dp"
android:paddingStart="8dp"
android:text="@string/screen_pinning_negative"
android:textColor="@android:color/white"
android:textSize="14sp" />
<TextView
android:id="@+id/screen_pinning_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingEnd="48dp"
android:paddingStart="48dp"
android:paddingTop="43dp"
android:text="@string/screen_pinning_title"
android:textColor="@android:color/white"
android:textSize="24sp" />
</RelativeLayout>
<TextView
android:id="@+id/screen_pinning_description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/screen_pinning_title"
android:paddingEnd="48dp"
android:paddingStart="48dp"
android:paddingTop="12.6dp"
android:text="@string/screen_pinning_description"
android:textColor="@android:color/white"
android:textSize="16sp" />
<Button
android:id="@+id/screen_pinning_ok_button"
style="@android:style/Widget.Material.Button"
android:layout_width="wrap_content"
android:layout_height="36dp"
android:layout_alignParentEnd="true"
android:layout_below="@+id/screen_pinning_description"
android:layout_marginEnd="40dp"
android:layout_marginTop="18dp"
android:background="@null"
android:paddingEnd="8dp"
android:paddingStart="8dp"
android:text="@string/screen_pinning_positive"
android:textColor="@android:color/white"
android:textSize="14sp" />
<Button
android:id="@+id/screen_pinning_cancel_button"
style="@android:style/Widget.Material.Button"
android:layout_width="wrap_content"
android:layout_height="36dp"
android:layout_alignTop="@id/screen_pinning_ok_button"
android:layout_marginEnd="4dp"
android:layout_toStartOf="@id/screen_pinning_ok_button"
android:background="@null"
android:paddingEnd="8dp"
android:paddingStart="8dp"
android:text="@string/screen_pinning_negative"
android:textColor="@android:color/white"
android:textSize="14sp" />
</RelativeLayout>
</ScrollView>