diff options
| author | Anthony Hugh <ahugh@google.com> | 2015-10-05 12:28:07 -0700 |
|---|---|---|
| committer | Anthony Hugh <ahugh@google.com> | 2015-10-05 15:15:48 -0700 |
| commit | 6a5762884adc64ea95bd206c46d60031428e977c (patch) | |
| tree | 8e6e1f047cdf15d26a9c2fb3950587038ae51220 /res/layout-watch | |
| parent | 12c698b4d2d75895c72bc900ed363acd03c94bfe (diff) | |
| download | android_packages_apps_PackageInstaller-6a5762884adc64ea95bd206c46d60031428e977c.tar.gz android_packages_apps_PackageInstaller-6a5762884adc64ea95bd206c46d60031428e977c.tar.bz2 android_packages_apps_PackageInstaller-6a5762884adc64ea95bd206c46d60031428e977c.zip | |
Permissions redline fixes
This fixes the button bar animation to work on round
devices and also fixes the max height animation to make
sure the vertical button layout animates to max height
when there are only two buttons.
Also adjust some redlines like margins on the buttons and
updated some files that were missing our licensing header.
Change-Id: Ifad4d0f92605be04db2d3c991b4e8a26eadb4b14
Diffstat (limited to 'res/layout-watch')
| -rw-r--r-- | res/layout-watch/confirmation_dialog.xml | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/res/layout-watch/confirmation_dialog.xml b/res/layout-watch/confirmation_dialog.xml index 783d4051..0b93579e 100644 --- a/res/layout-watch/confirmation_dialog.xml +++ b/res/layout-watch/confirmation_dialog.xml @@ -29,7 +29,6 @@ <LinearLayout android:id="@+id/content" android:orientation="vertical" - android:paddingBottom="@dimen/conf_diag_button_container_height" android:layout_width="match_parent" android:layout_height="wrap_content"> @@ -89,13 +88,13 @@ android:layout_marginTop="@dimen/conf_diag_2button_margin_top" android:background="@drawable/confirm_button"/> </FrameLayout> - + <FrameLayout android:id="@+id/vertical_button_bar" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/conf_diag_3button_margin_left" - android:layout_marginBottom="@dimen/conf_diag_3button_margin_bottom" + android:paddingLeft="@dimen/conf_diag_3button_padding_side" + android:paddingRight="@dimen/conf_diag_3button_padding_side" android:visibility="gone"> <LinearLayout android:id="@+id/buttonPanel" @@ -113,6 +112,11 @@ <Button android:id="@+id/vertical_button3" style="@style/Widget.WearDiag.Button"/> + + <!-- Adding padding to the bottom button causes rendering issues, so add + an empty view here instead --> + <Space android:layout_width="match_parent" + android:layout_height="@dimen/conf_diag_3button_padding_bottom"/> </LinearLayout> </FrameLayout> </FrameLayout> |