Merge "Smaller dialog margin, update button width & font weight" into lmp-preview-dev (07cd153e) · Commits · e / os / android_frameworks_base

core/res/res/layout/alert_dialog_quantum.xml

+10 −9

Original line number	Diff line number	Diff line
		@@ -23,7 +23,10 @@
		android:orientation="vertical"
		android:background="@drawable/dialog_background_quantum"
		android:translationZ="@dimen/floating_window_z"
		android:layout_margin="@dimen/floating_window_margin">
		android:layout_marginLeft="@dimen/floating_window_margin_left"
		android:layout_marginTop="@dimen/floating_window_margin_top"
		android:layout_marginRight="@dimen/floating_window_margin_right"
		android:layout_marginBottom="@dimen/floating_window_margin_bottom">

		<LinearLayout android:id="@+id/topPanel"
		android:layout_width="match_parent"
		@@ -44,7 +47,7 @@
		android:scaleType="fitCenter"
		android:src="@null" />
		<TextView android:id="@+id/alertTitle"
		style="?android:attr/windowTitleStyle"
		style="?attr/windowTitleStyle"
		android:singleLine="true"
		android:ellipsize="end"
		android:layout_width="match_parent"
		@@ -65,7 +68,7 @@
		android:layout_height="wrap_content"
		android:clipToPadding="false">
		<TextView android:id="@+id/message"
		style="?android:attr/textAppearanceMedium"
		style="?attr/textAppearanceMedium"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingStart="16dip"
		@@ -92,26 +95,24 @@
		android:gravity="end"
		android:padding="16dip">
		<LinearLayout
		style="?android:attr/buttonBarStyle"
		style="?attr/buttonBarStyle"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layoutDirection="locale">
		<Button android:id="@+id/button3"
		style="?android:attr/buttonBarButtonStyle"
		style="?attr/buttonBarButtonStyle"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginRight="8dip"
		android:maxLines="2"
		android:minHeight="@dimen/alert_dialog_button_bar_height" />
		<Button android:id="@+id/button2"
		style="?android:attr/buttonBarButtonStyle"
		style="?attr/buttonBarButtonStyle"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:maxLines="2"
		android:minHeight="@dimen/alert_dialog_button_bar_height" />
		<Button android:id="@+id/button1"
		style="?android:attr/buttonBarButtonStyle"
		android:layout_marginLeft="8dip"
		style="?attr/buttonBarButtonStyle"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:maxLines="2"

core/res/res/values/dimens_quantum.xml

+4 −1

Original line number	Diff line number	Diff line
		@@ -52,7 +52,10 @@
		<dimen name="text_size_small_quantum">14sp</dimen>

		<dimen name="floating_window_z">16dp</dimen>
		<dimen name="floating_window_margin">32dp</dimen>
		<dimen name="floating_window_margin_left">16dp</dimen>
		<dimen name="floating_window_margin_top">8dp</dimen>
		<dimen name="floating_window_margin_right">16dp</dimen>
		<dimen name="floating_window_margin_bottom">32dp</dimen>

		<!-- the amount of elevation for pressed button state-->
		<dimen name="button_pressed_z">2dp</dimen>

core/res/res/values/donottranslate_quantum.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -27,6 +27,6 @@
		<string name="font_family_body_1_quantum">sans-serif</string>
		<string name="font_family_caption_quantum">sans-serif</string>
		<string name="font_family_menu_quantum">sans-serif-medium</string>
		<string name="font_family_button_quantum">sans-serif</string>
		<string name="font_family_button_quantum">sans-serif-medium</string>

		</resources>

core/res/res/values/styles_quantum.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -404,7 +404,7 @@ please see styles_device_defaults.xml.
		<item name="textAppearance">?attr/textAppearanceButton</item>
		<item name="textColor">?attr/textColorPrimary</item>
		<item name="minHeight">48dip</item>
		<item name="minWidth">96dip</item>
		<item name="minWidth">88dip</item>

		<!-- TODO: Turn this back on when we support inset drawable outlines. -->
		<!-- <item name="stateListAnimator">@anim/button_state_list_anim_quantum</item> -->

core/res/res/values/themes_quantum.xml

+3 −3

Original line number	Diff line number	Diff line
		@@ -668,7 +668,7 @@ please see themes_device_defaults.xml.
		<item name="dividerVertical">?attr/listDivider</item>
		<item name="dividerHorizontal">?attr/listDivider</item>
		<item name="buttonBarStyle">@style/Widget.Quantum.Light.ButtonBar</item>
		<item name="buttonBarButtonStyle">@style/Widget.Quantum.Light.Button.Borderless.Small</item>
		<item name="buttonBarButtonStyle">@style/Widget.Quantum.Light.Button.Borderless</item>
		<item name="segmentedButtonStyle">@style/Widget.Quantum.Light.SegmentedButton</item>

		<!-- SearchView attributes -->
		@@ -1004,7 +1004,7 @@ please see themes_device_defaults.xml.
		<item name="colorBackgroundCacheHint">@null</item>

		<item name="buttonBarStyle">@style/Widget.Quantum.ButtonBar.AlertDialog</item>
		<item name="borderlessButtonStyle">@style/Widget.Quantum.Button.Borderless.Small</item>
		<item name="borderlessButtonStyle">@style/Widget.Quantum.Button.Borderless</item>

		<item name="textAppearance">@style/TextAppearance.Quantum</item>
		<item name="textAppearanceInverse">@style/TextAppearance.Quantum.Inverse</item>
		@@ -1123,7 +1123,7 @@ please see themes_device_defaults.xml.
		<item name="colorBackgroundCacheHint">@null</item>

		<item name="buttonBarStyle">@style/Widget.Quantum.Light.ButtonBar.AlertDialog</item>
		<item name="borderlessButtonStyle">@style/Widget.Quantum.Light.Button.Borderless.Small</item>
		<item name="borderlessButtonStyle">@style/Widget.Quantum.Light.Button.Borderless</item>

		<item name="textAppearance">@style/TextAppearance.Quantum</item>
		<item name="textAppearanceInverse">@style/TextAppearance.Quantum.Inverse</item>