summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-03-30 18:44:35 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-03-30 18:44:35 +0000
commit25d4cf97057b0930ced78526dd42b0b115f292ab (patch)
tree8d298c7c6ea853fa199591400a3fd0768f7bf3a6
parent1a43996840ff1fb3df992a940d4c9cc607683d5d (diff)
parent2c3508f9349373a607baffcb39a7c85f30249a64 (diff)
downloadplatform_packages_apps_DocumentsUI-25d4cf97057b0930ced78526dd42b0b115f292ab.tar.gz
platform_packages_apps_DocumentsUI-25d4cf97057b0930ced78526dd42b0b115f292ab.tar.bz2
platform_packages_apps_DocumentsUI-25d4cf97057b0930ced78526dd42b0b115f292ab.zip
Merge "Fix DocsUI cross-profile error screens in landscape" into rvc-dev
-rw-r--r--res/layout/item_doc_inflated_message_cross_profile.xml9
-rw-r--r--res/values-h600dp/dimens.xml19
-rw-r--r--res/values/dimens.xml2
3 files changed, 26 insertions, 4 deletions
diff --git a/res/layout/item_doc_inflated_message_cross_profile.xml b/res/layout/item_doc_inflated_message_cross_profile.xml
index 15b66882b..eb9540d5e 100644
--- a/res/layout/item_doc_inflated_message_cross_profile.xml
+++ b/res/layout/item_doc_inflated_message_cross_profile.xml
@@ -18,11 +18,12 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="424dp"
+ android:layout_height="wrap_content"
android:orientation="vertical"
- android:gravity="center"
- android:paddingStart="24dp"
- android:paddingEnd="24dp">
+ android:gravity="center_horizontal"
+ android:paddingTop="@dimen/item_doc_inflated_message_padding_top"
+ android:paddingStart="72dp"
+ android:paddingEnd="72dp">
<ImageView
android:id="@+id/artwork"
diff --git a/res/values-h600dp/dimens.xml b/res/values-h600dp/dimens.xml
new file mode 100644
index 000000000..d21465289
--- /dev/null
+++ b/res/values-h600dp/dimens.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2020 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+<resources>
+ <dimen name="item_doc_inflated_message_padding_top">100dp</dimen>
+</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index ee62acece..bd903f729 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -121,4 +121,6 @@
<dimen name="action_bar_space_margin">@dimen/action_bar_space_height</dimen>
<dimen name="refresh_icon_range">64dp</dimen>
+
+ <dimen name="item_doc_inflated_message_padding_top">0dp</dimen>
</resources>