diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2014-09-12 11:51:32 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2014-09-12 11:51:32 -0700 |
commit | 10c7764d0497b52c0286db409dda7fcc9a0d73bb (patch) | |
tree | 81a8e7dfea55d185f513ecd622ead03be64138fe | |
parent | 5b7d28fc4c44f9952ca6907b05f9f364c8d383aa (diff) | |
download | android_packages_apps_Trebuchet-10c7764d0497b52c0286db409dda7fcc9a0d73bb.tar.gz android_packages_apps_Trebuchet-10c7764d0497b52c0286db409dda7fcc9a0d73bb.tar.bz2 android_packages_apps_Trebuchet-10c7764d0497b52c0286db409dda7fcc9a0d73bb.zip |
Updating margin and content size for migration cling
Bug: 17446533
Change-Id: I1f980f0565083078ba4f5b7619938083367cbab7
-rw-r--r-- | res/layout-land/migration_cling.xml | 3 | ||||
-rw-r--r-- | res/layout-port/migration_cling.xml | 3 | ||||
-rw-r--r-- | res/values-sw600dp/dimens.xml | 2 | ||||
-rw-r--r-- | res/values-sw720dp/dimens.xml | 5 | ||||
-rw-r--r-- | res/values/dimens.xml | 2 |
5 files changed, 13 insertions, 2 deletions
diff --git a/res/layout-land/migration_cling.xml b/res/layout-land/migration_cling.xml index 4765524f3..307cba8a8 100644 --- a/res/layout-land/migration_cling.xml +++ b/res/layout-land/migration_cling.xml @@ -41,8 +41,9 @@ </FrameLayout> <LinearLayout - android:layout_width="280dp" + android:layout_width="@dimen/cling_migration_content_width" android:layout_height="wrap_content" + android:layout_marginEnd="@dimen/cling_migration_content_margin" android:orientation="vertical" android:paddingLeft="24dp" android:paddingRight="24dp" > diff --git a/res/layout-port/migration_cling.xml b/res/layout-port/migration_cling.xml index 932a9f4dd..dde8dbcdb 100644 --- a/res/layout-port/migration_cling.xml +++ b/res/layout-port/migration_cling.xml @@ -42,9 +42,10 @@ android:src="@drawable/ic_migration" /> <LinearLayout - android:layout_width="280dp" + android:layout_width="@dimen/cling_migration_content_width" android:layout_height="wrap_content" android:layout_below="@+id/ic_cling_migration" + android:layout_marginStart="@dimen/cling_migration_content_margin" android:orientation="vertical" android:paddingLeft="24dp" android:paddingRight="24dp" > diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml index 68f476dc5..28679be2e 100644 --- a/res/values-sw600dp/dimens.xml +++ b/res/values-sw600dp/dimens.xml @@ -29,5 +29,7 @@ <dimen name="cling_migration_logo_width">274dp</dimen> <dimen name="cling_migration_bg_size">600dp</dimen> <dimen name="cling_migration_bg_shift">-300dp</dimen> + <dimen name="cling_migration_content_margin">64dp</dimen> + <dimen name="cling_migration_content_width">280dp</dimen> </resources> diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml index 9ae155b3c..8be996474 100644 --- a/res/values-sw720dp/dimens.xml +++ b/res/values-sw720dp/dimens.xml @@ -25,4 +25,9 @@ the drag view should be offset from the position of the original view. --> <dimen name="dragViewOffsetX">0dp</dimen> <dimen name="dragViewOffsetY">0dp</dimen> + +<!-- Cling --> + <dimen name="cling_migration_content_margin">96dp</dimen> + <dimen name="cling_migration_content_width">320dp</dimen> + </resources> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index befaf375a..2c9e689c6 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -33,6 +33,8 @@ <dimen name="cling_migration_logo_width">165dp</dimen> <dimen name="cling_migration_bg_size">400dp</dimen> <dimen name="cling_migration_bg_shift">-200dp</dimen> + <dimen name="cling_migration_content_margin">16dp</dimen> + <dimen name="cling_migration_content_width">280dp</dimen> <!-- Workspace --> <dimen name="workspace_max_gap">16dp</dimen> |