diff options
| author | Danny Epstein <depstein@google.com> | 2015-10-20 00:34:18 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-10-20 00:34:18 +0000 |
| commit | e7cdf95de2b88b5ea55e68e0d400793f573cb3e4 (patch) | |
| tree | 81beba8807ec6e5ca39cf3a57e1324277bc9405e | |
| parent | 70dc85721058cf7721a8375c982357ff27c96ec9 (diff) | |
| parent | dc40bd77b1ab709de9d705c88f56ff61d618ed5c (diff) | |
| download | android_packages_apps_PackageInstaller-e7cdf95de2b88b5ea55e68e0d400793f573cb3e4.tar.gz android_packages_apps_PackageInstaller-e7cdf95de2b88b5ea55e68e0d400793f573cb3e4.tar.bz2 android_packages_apps_PackageInstaller-e7cdf95de2b88b5ea55e68e0d400793f573cb3e4.zip | |
Add top padding to grant permission content.
am: dc40bd77b1
* commit 'dc40bd77b1ab709de9d705c88f56ff61d618ed5c':
Add top padding to grant permission content.
| -rw-r--r-- | res/layout-watch/confirmation_dialog.xml | 3 | ||||
| -rw-r--r-- | res/values-round/dimens.xml | 1 | ||||
| -rw-r--r-- | res/values-watch/dimens.xml | 1 | ||||
| -rw-r--r-- | src/com/android/packageinstaller/permission/ui/wear/ConfirmationViewHandler.java | 2 |
4 files changed, 5 insertions, 2 deletions
diff --git a/res/layout-watch/confirmation_dialog.xml b/res/layout-watch/confirmation_dialog.xml index 0b93579e..32e0657d 100644 --- a/res/layout-watch/confirmation_dialog.xml +++ b/res/layout-watch/confirmation_dialog.xml @@ -30,7 +30,8 @@ android:id="@+id/content" android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + android:paddingTop="@dimen/conf_diag_content_padding_top"> <TextView android:id="@+id/current_page_text" diff --git a/res/values-round/dimens.xml b/res/values-round/dimens.xml index 5e7309b9..ad0fbe03 100644 --- a/res/values-round/dimens.xml +++ b/res/values-round/dimens.xml @@ -19,5 +19,6 @@ <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> </resources> diff --git a/res/values-watch/dimens.xml b/res/values-watch/dimens.xml index 24d2a058..aa5652df 100644 --- a/res/values-watch/dimens.xml +++ b/res/values-watch/dimens.xml @@ -32,6 +32,7 @@ <dimen name="conf_diag_2button_margin_top">9dp</dimen> <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> <!-- START: Ported values --> diff --git a/src/com/android/packageinstaller/permission/ui/wear/ConfirmationViewHandler.java b/src/com/android/packageinstaller/permission/ui/wear/ConfirmationViewHandler.java index db3340f6..abaf3e48 100644 --- a/src/com/android/packageinstaller/permission/ui/wear/ConfirmationViewHandler.java +++ b/src/com/android/packageinstaller/permission/ui/wear/ConfirmationViewHandler.java @@ -189,7 +189,7 @@ public abstract class ConfirmationViewHandler implements // In order to fake the buttons peeking at the bottom, need to do set the // padding properly. if (mContent.getPaddingBottom() != mButtonBarContainer.getHeight()) { - mContent.setPadding(0, 0, 0, mButtonBarContainer.getHeight()); + mContent.setPadding(0, mContent.getPaddingTop(), 0, mButtonBarContainer.getHeight()); if (Log.isLoggable(TAG, Log.DEBUG)) { Log.d(TAG, " set mContent.PaddingBottom: " + mButtonBarContainer.getHeight()); } |