diff options
author | Anthony Hugh <ahugh@google.com> | 2015-09-18 17:18:10 -0700 |
---|---|---|
committer | Anthony Hugh <ahugh@google.com> | 2015-09-22 10:56:16 -0700 |
commit | 6161f39f583cf202969125757d78010bdc06457c (patch) | |
tree | 50d06d0df5565e0c7105cfc2e8d4d26971f11511 /res/layout-watch | |
parent | 38e80af4a571207b1c8cbe550b8e29479ea086a4 (diff) | |
download | android_packages_apps_PackageInstaller-6161f39f583cf202969125757d78010bdc06457c.tar.gz android_packages_apps_PackageInstaller-6161f39f583cf202969125757d78010bdc06457c.tar.bz2 android_packages_apps_PackageInstaller-6161f39f583cf202969125757d78010bdc06457c.zip |
Update Grant Permissions dialog to redlines
Changes:
- Refactor the ViewHandler a bit to be more generic.
This should help with another upcoming Wear dialog.
- Update assets for buttons
- Add deny asset
- Fix margins and other UI number tweaks
BUG: 24133550
Change-Id: I330bdf3217fa5c554f71d9105a0475106b6f3e12
Diffstat (limited to 'res/layout-watch')
-rw-r--r-- | res/layout-watch/grant_permissions.xml | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/res/layout-watch/grant_permissions.xml b/res/layout-watch/grant_permissions.xml index 165de29f..2eedae35 100644 --- a/res/layout-watch/grant_permissions.xml +++ b/res/layout-watch/grant_permissions.xml @@ -38,7 +38,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:layout_marginBottom="@dimen/grant_permissions_app_breadcrumb_margin_bottom" + android:layout_marginTop="@dimen/grant_permissions_app_breadcrumb_margin_top" android:textAppearance="@style/GrantPermissions.BreadcrumbText" /> <ImageView @@ -53,20 +53,18 @@ android:id="@+id/message" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="10dp" - android:paddingLeft="16dp" - android:paddingRight="16dp" - android:textSize="20sp" + android:layout_marginTop="@dimen/grant_permissions_title_margin_top" + android:paddingLeft="@dimen/grant_permissions_message_side_padding" + android:paddingRight="@dimen/grant_permissions_message_side_padding" android:gravity="center" - android:fontFamily="sans-serif-condensed-light" android:textAppearance="@style/GrantPermissions.TitleText"/> </LinearLayout> </ScrollView> <!-- TODO: Change this to use a ViewStub instead of show/hiding the two layouts --> - <FrameLayout android:layout_width="match_parent" + <FrameLayout android:id="@+id/button_bar_container" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:id="@+id/button_bar_container" android:layout_gravity="bottom" android:background="#FF606060"> <FrameLayout @@ -105,15 +103,15 @@ android:layout_height="wrap_content" android:orientation="vertical"> <Button - android:id="@+id/vertical_allow_button" + android:id="@+id/vertical_button1" style="@style/Widget.WearDiag.Button"/> <Button - android:id="@+id/vertical_deny_button" + android:id="@+id/vertical_button2" style="@style/Widget.WearDiag.Button"/> <Button - android:id="@+id/vertical_deny_do_not_ask_again_button" + android:id="@+id/vertical_button3" style="@style/Widget.WearDiag.Button"/> </LinearLayout> </FrameLayout> |