diff options
| author | Danny Epstein <depstein@google.com> | 2015-10-20 22:36:01 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-10-20 22:36:01 +0000 |
| commit | c55cd1b71de88188fa3c5843d820f180a688a683 (patch) | |
| tree | 1ef4c5804a7bd479833d67b82993272be98c5d8f /res | |
| parent | 71649cda4041642b9b456dd35225b30fa54c4224 (diff) | |
| parent | 51f646b19dfbe663fcd2ea78d10fd2813c4d20f8 (diff) | |
| download | android_packages_apps_PackageInstaller-c55cd1b71de88188fa3c5843d820f180a688a683.tar.gz android_packages_apps_PackageInstaller-c55cd1b71de88188fa3c5843d820f180a688a683.tar.bz2 android_packages_apps_PackageInstaller-c55cd1b71de88188fa3c5843d820f180a688a683.zip | |
Reduce the top padding when message isn\'t at top.
am: 51f646b19d
* commit '51f646b19dfbe663fcd2ea78d10fd2813c4d20f8':
Reduce the top padding when message isn't at top.
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout-watch/confirmation_dialog.xml | 33 | ||||
| -rw-r--r-- | res/values-round/dimens.xml | 4 | ||||
| -rw-r--r-- | res/values-watch/dimens.xml | 2 |
3 files changed, 25 insertions, 14 deletions
diff --git a/res/layout-watch/confirmation_dialog.xml b/res/layout-watch/confirmation_dialog.xml index 32e0657d..ea25b6b4 100644 --- a/res/layout-watch/confirmation_dialog.xml +++ b/res/layout-watch/confirmation_dialog.xml @@ -33,21 +33,28 @@ android:layout_height="wrap_content" android:paddingTop="@dimen/conf_diag_content_padding_top"> - <TextView - android:id="@+id/current_page_text" - android:layout_width="wrap_content" + <LinearLayout + android:orientation="vertical" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="center" - android:layout_marginTop="@dimen/grant_permissions_app_breadcrumb_margin_top" - android:textAppearance="@style/GrantPermissions.BreadcrumbText" /> + android:minHeight="@dimen/conf_diag_min_space_above_message" + android:gravity="bottom"> + <TextView + android:id="@+id/current_page_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:layout_marginTop="@dimen/grant_permissions_app_breadcrumb_margin_top" + android:textAppearance="@style/GrantPermissions.BreadcrumbText" /> - <ImageView - android:id="@+id/icon" - android:layout_width="@dimen/grant_permissions_app_icon_size" - android:layout_height="@dimen/grant_permissions_app_icon_size" - android:tint="@color/grant_permissions_app_color" - android:layout_gravity="center" - android:layout_marginTop="@dimen/grant_permissions_app_icon_margin_top"/> + <ImageView + android:id="@+id/icon" + android:layout_width="@dimen/grant_permissions_app_icon_size" + android:layout_height="@dimen/grant_permissions_app_icon_size" + android:tint="@color/grant_permissions_app_color" + android:layout_gravity="center_horizontal" + android:layout_marginTop="@dimen/grant_permissions_app_icon_margin_top"/> + </LinearLayout> <TextView android:id="@+id/message" diff --git a/res/values-round/dimens.xml b/res/values-round/dimens.xml index ad0fbe03..bed41ce0 100644 --- a/res/values-round/dimens.xml +++ b/res/values-round/dimens.xml @@ -19,6 +19,8 @@ <dimen name="conf_diag_button_container_height">96dp</dimen> <dimen name="conf_diag_2button_margin_side">32dp</dimen> <dimen name="conf_diag_2button_margin_top">10dp</dimen> - <dimen name="conf_diag_content_padding_top">32dp</dimen> + <!-- On round screens, the message can't be too close to the top or the corners will be + clipped. --> + <dimen name="conf_diag_min_space_above_message">26dp</dimen> </resources> diff --git a/res/values-watch/dimens.xml b/res/values-watch/dimens.xml index aa5652df..96f32148 100644 --- a/res/values-watch/dimens.xml +++ b/res/values-watch/dimens.xml @@ -33,6 +33,8 @@ <dimen name="conf_diag_3button_padding_side">32dp</dimen> <dimen name="conf_diag_3button_padding_bottom">22dp</dimen> <dimen name="conf_diag_content_padding_top">6dp</dimen> + <!-- On square screens, the message can be at the top of the screen. --> + <dimen name="conf_diag_min_space_above_message">0dp</dimen> <!-- START: Ported values --> |