summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Michael Kwan <mkwan@google.com> 2016-10-20 18:36:09 -0700
committer Michael Kwan <mkwan@google.com> 2016-10-20 18:39:31 -0700
commit9c86e68bfafc48800ebc71db4db0147f7b5e1d50 (patch)
tree54a8126f9da9e01dfb83bf3e1e22ab82aa8bd8bd
parentfaf09eaa40eb66876688a62c77ccfb5b390e5c15 (diff)
Fix improperly laid out alert dialog title to match UX specs.
Test: visual inspect using ApiDemos Bug: 32315229 Change-Id: I486edc94c077af49e1235519e158e55833796231
-rw-r--r--core/res/res/layout-round-watch/alert_dialog_title_material.xml30
1 files changed, 18 insertions, 12 deletions
diff --git a/core/res/res/layout-round-watch/alert_dialog_title_material.xml b/core/res/res/layout-round-watch/alert_dialog_title_material.xml
index e543c9b69390..aefe28f7f359 100644
--- a/core/res/res/layout-round-watch/alert_dialog_title_material.xml
+++ b/core/res/res/layout-round-watch/alert_dialog_title_material.xml
@@ -14,25 +14,31 @@
~ See the License for the specific language governing permissions and
~ limitations under the License
-->
-<FrameLayout
+<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:gravity="top|center_horizontal"
- android:minHeight="@dimen/alert_dialog_title_height">
- <ImageView android:id="@+id/icon"
+ android:orientation="vertical"
+ android:gravity="top|center_horizontal">
+ <FrameLayout
android:adjustViewBounds="true"
- android:maxHeight="24dp"
- android:maxWidth="24dp"
- android:layout_marginTop="12dp"
- android:layout_gravity="center_horizontal"
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:src="@null" />
+ android:minHeight="@dimen/screen_percentage_15">
+ <ImageView android:id="@+id/icon"
+ android:adjustViewBounds="true"
+ android:maxHeight="24dp"
+ android:maxWidth="24dp"
+ android:layout_marginTop="@dimen/screen_percentage_10"
+ android:layout_marginBottom="8dp"
+ android:layout_gravity="center_horizontal"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:src="@null" />
+ </FrameLayout>
<TextView android:id="@+id/alertTitle"
style="?android:attr/windowTitleStyle"
- android:layout_marginTop="36dp"
android:layout_marginBottom="8dp"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
-</FrameLayout>
+</LinearLayout>