diff options
| author | Clark Scheff <clark@cyngn.com> | 2014-07-28 18:16:29 -0700 |
|---|---|---|
| committer | Clark Scheff <clark@cyngn.com> | 2014-07-29 09:47:13 -0700 |
| commit | 7790b47c8c41fbafebfce0165727e25cae57fbca (patch) | |
| tree | 2f234775e89a5dcdc7930637e0d95e45ee8337f7 /src/org | |
| parent | afcb3429bccca1d52a3bdf6faba388848b1f1320 (diff) | |
| download | packages_apps_ThemeChooser-7790b47c8c41fbafebfce0165727e25cae57fbca.zip packages_apps_ThemeChooser-7790b47c8c41fbafebfce0165727e25cae57fbca.tar.gz packages_apps_ThemeChooser-7790b47c8c41fbafebfce0165727e25cae57fbca.tar.bz2 | |
Refactor theme preview layout to use LinearLayout.
Change-Id: I048a5e3563fe3c4734b0f6dd989f815f8d7a239f
Diffstat (limited to 'src/org')
| -rw-r--r-- | src/org/cyanogenmod/theme/chooserv2/ThemeFragment.java | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/src/org/cyanogenmod/theme/chooserv2/ThemeFragment.java b/src/org/cyanogenmod/theme/chooserv2/ThemeFragment.java index 87057bf..310b857 100644 --- a/src/org/cyanogenmod/theme/chooserv2/ThemeFragment.java +++ b/src/org/cyanogenmod/theme/chooserv2/ThemeFragment.java @@ -462,13 +462,9 @@ public class ThemeFragment extends Fragment implements LoaderManager.LoaderCallb for (int i = 0; i < mPreviewContent.getChildCount(); i++) { ComponentCardView child = (ComponentCardView) mPreviewContent.getChildAt(i); - RelativeLayout.LayoutParams lparams = - (RelativeLayout.LayoutParams) child.getLayoutParams(); + LinearLayout.LayoutParams lparams = + (LinearLayout.LayoutParams) child.getLayoutParams(); lparams.setMargins(0, top, 0, 0); - if (child.getId() == R.id.navigation_bar_container) { - lparams.removeRule(RelativeLayout.ALIGN_PARENT_BOTTOM); - lparams.addRule(RelativeLayout.BELOW, R.id.icon_container); - } child.setLayoutParams(lparams); child.expand(false); @@ -564,14 +560,11 @@ public class ThemeFragment extends Fragment implements LoaderManager.LoaderCallb for (int i = 0; i < mPreviewContent.getChildCount(); i++) { ComponentCardView child = (ComponentCardView) mPreviewContent.getChildAt(i); - RelativeLayout.LayoutParams lparams = - (RelativeLayout.LayoutParams) child.getLayoutParams(); + LinearLayout.LayoutParams lparams = + (LinearLayout.LayoutParams) child.getLayoutParams(); lparams.setMargins(0, 0, 0, 0); - if (child.getId() == R.id.navigation_bar_container) { - lparams.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM); - lparams.removeRule(RelativeLayout.BELOW); - } else if (child.getId() == R.id.icon_container) { + if (child.getId() == R.id.icon_container) { int top = (int) child.getResources() .getDimension(R.dimen.collapsed_icon_card_margin_top); lparams.setMargins(0, top, 0, 0); @@ -579,6 +572,10 @@ public class ThemeFragment extends Fragment implements LoaderManager.LoaderCallb int top = (int) child.getResources() .getDimension(R.dimen.collapsed_font_card_margin_top); lparams.setMargins(0, top, 0, 0); + } else if (child.getId() == R.id.navigation_bar_container) { + int top = (int) child.getResources() + .getDimension(R.dimen.collapsed_navbar_card_margin_top); + lparams.setMargins(0, top, 0, 0); } child.getLayoutParams(); @@ -629,7 +626,7 @@ public class ThemeFragment extends Fragment implements LoaderManager.LoaderCallb endY = v.getY(); prevHeight = v.getHeight(); endHeight = v.getHeight(); - } else { + s} else { Rect boundary = prevBounds.get(i); prevY = boundary.top; prevHeight = boundary.height(); @@ -640,7 +637,7 @@ public class ThemeFragment extends Fragment implements LoaderManager.LoaderCallb endHeight = v.getHeight(); } - int paddingTop = v.getPaddingTop(); + int paddingTop = v.getPaddingTop() / 2; v.setTranslationY((prevY - endY - paddingTop) + (prevHeight - endHeight) / 2); root.getOverlay().add(v); |