diff options
| author | Vinod Krishnan <vinodkrishnan@google.com> | 2015-09-10 09:42:27 -0700 |
|---|---|---|
| committer | Vinod Krishnan <vinodkrishnan@google.com> | 2015-09-14 15:21:47 -0700 |
| commit | 03dc824d37099b29acb5a0aa28e881d5b05cce0e (patch) | |
| tree | 146c411c4375c59c6a11689b7d591a26c4afce4f /res/layout-watch | |
| parent | 46fed54b3ee49e4bebabca50bcff5bceaece96b8 (diff) | |
| download | android_packages_apps_PackageInstaller-03dc824d37099b29acb5a0aa28e881d5b05cce0e.tar.gz android_packages_apps_PackageInstaller-03dc824d37099b29acb5a0aa28e881d5b05cce0e.tar.bz2 android_packages_apps_PackageInstaller-03dc824d37099b29acb5a0aa28e881d5b05cce0e.zip | |
Changing layout to make button animations work
- Fix the Permissions Dialogs for round layout
- Show animation for the buttons
- Also fixed the names ellipsis issue.
- Fixed the theming of the dialogs.
Bug: 23118402
Change-Id: I385c827ac41b06222334c36bfda2c70b346232a2
Diffstat (limited to 'res/layout-watch')
| -rw-r--r-- | res/layout-watch/grant_permissions.xml | 112 |
1 files changed, 56 insertions, 56 deletions
diff --git a/res/layout-watch/grant_permissions.xml b/res/layout-watch/grant_permissions.xml index 2d567068..165de29f 100644 --- a/res/layout-watch/grant_permissions.xml +++ b/res/layout-watch/grant_permissions.xml @@ -15,12 +15,9 @@ --> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - xmlns:tools="http://schemas.android.com/tools" android:id="@+id/confirmation" android:layout_width="match_parent" - android:layout_height="match_parent" - > + android:layout_height="match_parent"> <ScrollView android:id="@+id/scrolling_container" @@ -32,6 +29,7 @@ <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"> @@ -62,60 +60,62 @@ 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" - android:layout_height="wrap_content" - android:id="@+id/button_bar_container" - android:layout_gravity="bottom" - android:background="#FF606060"> - <FrameLayout - android:id="@+id/horizontal_button_bar" - android:layout_width="match_parent" - android:layout_height="72dp"> - <Button - android:id="@+id/horizontal_deny_button" - android:layout_width="54dp" - android:layout_height="54dp" - android:layout_gravity="top|left" - android:layout_marginLeft="16dp" - android:layout_marginTop="9dp" - android:background="@drawable/cancel_button"/> + <!-- TODO: Change this to use a ViewStub instead of show/hiding the two layouts --> + <FrameLayout android:layout_width="match_parent" + android:layout_height="wrap_content" + android:id="@+id/button_bar_container" + android:layout_gravity="bottom" + android:background="#FF606060"> + <FrameLayout + android:id="@+id/horizontal_button_bar" + android:layout_width="match_parent" + android:layout_height="@dimen/conf_diag_button_container_height"> + <Button + android:id="@+id/horizontal_deny_button" + android:layout_width="54dp" + android:layout_height="54dp" + android:layout_gravity="top|left" + android:layout_marginLeft="@dimen/conf_diag_2button_margin_side" + android:layout_marginTop="@dimen/conf_diag_2button_margin_top" + android:background="@drawable/cancel_button"/> - <Button - android:id="@+id/horizontal_allow_button" - android:layout_width="54dp" - android:layout_height="54dp" - android:layout_gravity="top|right" - android:layout_marginRight="16dp" - android:layout_marginTop="9dp" - android:background="@drawable/confirm_button"/> - </FrameLayout> + <Button + android:id="@+id/horizontal_allow_button" + android:layout_width="54dp" + android:layout_height="54dp" + android:layout_gravity="top|right" + android:layout_marginRight="@dimen/conf_diag_2button_margin_side" + 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:visibility="gone"> - <LinearLayout - android:id="@+id/buttonPanel" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> - <Button - android:id="@+id/vertical_allow_button" - style="@style/Widget.WearDiag.Button"/> + <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:visibility="gone"> + <LinearLayout + android:id="@+id/buttonPanel" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="vertical"> + <Button + android:id="@+id/vertical_allow_button" + style="@style/Widget.WearDiag.Button"/> - <Button - android:id="@+id/vertical_deny_button" - style="@style/Widget.WearDiag.Button"/> + <Button + android:id="@+id/vertical_deny_button" + style="@style/Widget.WearDiag.Button"/> - <Button - android:id="@+id/vertical_deny_do_not_ask_again_button" - style="@style/Widget.WearDiag.Button"/> - </LinearLayout> - </FrameLayout> - </FrameLayout> - </LinearLayout> - </ScrollView> -</FrameLayout>
\ No newline at end of file + <Button + android:id="@+id/vertical_deny_do_not_ask_again_button" + style="@style/Widget.WearDiag.Button"/> + </LinearLayout> + </FrameLayout> + </FrameLayout> +</FrameLayout> |