summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/res/layout
diff options
context:
space:
mode:
authorUtkarsh Gupta <utkarsh.eminem@gmail.com>2015-04-04 15:13:00 +0530
committerSteve Kondik <shade@chemlab.org>2015-12-04 19:44:15 -0800
commit1af5b1590a4bbb8bcb9b0d5b46c9eb090c95523f (patch)
tree6516c9e7b2fefb847959766639fc0d8bbf066246 /packages/SystemUI/res/layout
parent5ead120b6274841fe4a4c7552c44383e611478a7 (diff)
downloadframeworks_base-1af5b1590a4bbb8bcb9b0d5b46c9eb090c95523f.zip
frameworks_base-1af5b1590a4bbb8bcb9b0d5b46c9eb090c95523f.tar.gz
frameworks_base-1af5b1590a4bbb8bcb9b0d5b46c9eb090c95523f.tar.bz2
Allow screen unpinning on devices without navbar
Change-Id: Iedfc08f4d95bbee3c8578c0d2450b90739e63603
Diffstat (limited to 'packages/SystemUI/res/layout')
-rw-r--r--packages/SystemUI/res/layout/screen_pinning_request.xml6
-rw-r--r--packages/SystemUI/res/layout/screen_pinning_request_text_area.xml6
2 files changed, 3 insertions, 9 deletions
diff --git a/packages/SystemUI/res/layout/screen_pinning_request.xml b/packages/SystemUI/res/layout/screen_pinning_request.xml
index fea45cc..af203ce 100644
--- a/packages/SystemUI/res/layout/screen_pinning_request.xml
+++ b/packages/SystemUI/res/layout/screen_pinning_request.xml
@@ -28,12 +28,6 @@
android:layout_height="wrap_content"
layout="@layout/screen_pinning_request_text_area" />
- <View
- android:id="@+id/spacer"
- android:layout_width="@dimen/screen_pinning_request_width"
- android:layout_height="18dp"
- android:background="@color/screen_pinning_request_bg" />
-
<include
android:layout_width="@dimen/screen_pinning_request_width"
android:layout_height="wrap_content"
diff --git a/packages/SystemUI/res/layout/screen_pinning_request_text_area.xml b/packages/SystemUI/res/layout/screen_pinning_request_text_area.xml
index 8bf742a..7dbdb9f 100644
--- a/packages/SystemUI/res/layout/screen_pinning_request_text_area.xml
+++ b/packages/SystemUI/res/layout/screen_pinning_request_text_area.xml
@@ -29,7 +29,7 @@
android:layout_height="wrap_content"
android:paddingEnd="48dp"
android:paddingStart="48dp"
- android:paddingTop="43dp"
+ android:paddingTop="18dp"
android:text="@string/screen_pinning_title"
android:textColor="@color/screen_pinning_primary_text"
android:textSize="24sp" />
@@ -50,7 +50,7 @@
android:id="@+id/screen_pinning_ok_button"
style="@android:style/Widget.Material.Button"
android:layout_width="wrap_content"
- android:layout_height="36dp"
+ android:layout_height="54dp"
android:layout_alignParentEnd="true"
android:layout_below="@+id/screen_pinning_description"
android:layout_marginEnd="40dp"
@@ -66,7 +66,7 @@
android:id="@+id/screen_pinning_cancel_button"
style="@android:style/Widget.Material.Button"
android:layout_width="wrap_content"
- android:layout_height="36dp"
+ android:layout_height="54dp"
android:layout_alignTop="@id/screen_pinning_ok_button"
android:layout_marginEnd="4dp"
android:layout_toStartOf="@id/screen_pinning_ok_button"