From c82d2622bc7305fd3545fe7df97a30187283113f Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Wed, 6 Nov 2013 13:23:29 -0800 Subject: [PATCH] Dyanmically lay out overview mode across all orientations and form factors. Change-Id: I788bbf289717b30b19afc9ad9d611c85715bc623 --- res/drawable-hdpi/ic_setting.png | Bin 2637 -> 3282 bytes res/drawable-hdpi/ic_setting_pressed.png | Bin 3099 -> 3642 bytes res/drawable-mdpi/ic_setting.png | Bin 1669 -> 2065 bytes res/drawable-mdpi/ic_setting_pressed.png | Bin 1868 -> 2182 bytes res/drawable-xhdpi/ic_setting.png | Bin 3625 -> 4499 bytes res/drawable-xhdpi/ic_setting_pressed.png | Bin 4524 -> 5300 bytes res/drawable-xxhdpi/ic_setting.png | Bin 4105 -> 4512 bytes res/drawable-xxhdpi/ic_setting_pressed.png | Bin 7113 -> 7627 bytes res/layout-land/launcher.xml | 13 ------- res/layout/overview_panel.xml | 16 +++----- res/values/config.xml | 6 ++- res/values/dimens.xml | 6 +-- src/com/android/launcher3/DynamicGrid.java | 42 +++++++++++++++++++++ src/com/android/launcher3/PagedView.java | 6 +-- src/com/android/launcher3/Workspace.java | 28 +++++++------- 15 files changed, 72 insertions(+), 45 deletions(-) diff --git a/res/drawable-hdpi/ic_setting.png b/res/drawable-hdpi/ic_setting.png index c617154f10ef95833e9ec0b649016731883a2e6b..3f5bc43fd26690951c718bd04c452ef1dbeffef1 100644 GIT binary patch delta 3111 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 diff --git a/res/drawable-hdpi/ic_setting_pressed.png b/res/drawable-hdpi/ic_setting_pressed.png index fb58a4b12ada90dbbf20ed1ac24667bde4de12f4..9201064cfcb34675a5e0fb974bf441aa0bc0765e 100644 GIT binary patch delta 3484 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 K6;1<_>I*T!^Pn97 delta 2954 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 A<^TWy diff --git a/res/drawable-mdpi/ic_setting.png b/res/drawable-mdpi/ic_setting.png index 0c8ae9d65df610c81f220e4ecb474a1336792273..1e76459533e7d6199f9146aae45dbca79d6dd988 100644 GIT binary patch delta 1894 zcmV-s2buVV4UrI#lYa)`NklGahz$)txO$COrtaOMc@_5HaPK|K?|jeie1FS15B^8Lpi}{27r2sA~ zX{j;nl2`84<$!iQ4-3tv1m;>`s@~J;(gFMh+zRZ_d|`J%{}Y2F{-g{@!&u#ZOpw82> zD`^2915~^An177Yz8bg3lz$9P^u#CvVb z0VrPQCxG)Y3$Kzk{{;34KmdHA1v!n?13k6C-O}b@;40u^pdawP7S#asSN}BdJ8&uR z3khy639JJ;8F&)d>uEYrdo{2NxDWUUI1#uU7z^|PdSD#h3v33K0`E)HbAi)EtE?8~ zINk?%2YtK5&KY73s04lkW{D1Sfpa9Q1+)H~#*_(o1@I$q5AZec zC~%(W;@eHA{MYa}qU9ROctvHOeReu8aYY_{@&nC&KSHDfbYG5OgH!0H& zWq^AzJGc$_RhsnOV+NQgYK1<=Vl?OrJd1@&$JrXpn63w2049jH6)JB6uL9eotu*E- zt^}?iifrZ5;1u8t;1SFa(;8QY@%v8EDhPrgEC3q=+#j>@p_uj8YSK#J6>oxa;BMeu z@_!A{e@+1&B+A0-fj2a6xhT@C`lZ0_>e~slfCl16NaRLt5#MTnpMdqiWfGKA{fh!x z?k(O;5U74RFc0%0ffheW-z&5;y?~D~Ptdv0qMY@7T2?&U3@pGR(|S!jTKua7wqr&E zQMmQxzHq?#0>FB@p6^GHUf8P?tjE&y&yO68sj;^X3U}26IuN_V2|YF36IH1 zVS!~0W>C(x4aYd%ff?3r0ZmNSyOJW-s$WI`-DGJj#JcS+5bk}um+czowz*c6XcMKJ z2MUrB^sazyA#&DPX(90H4&_%tzTvg1&ZUwr03;?d1z=-Y7Xp{X5{_M%D=Sm|aDQKT zJgxJ--OC8_Ik^oOh(*jMB6=jIh^ZpNU9LJ3OF;HunNbGVg3)0=mZOfuJ9iaH&~sSg zGY)f6WqN)qxmn3MDK4uhSn~Mfaf)^S#{M|PViU~%mfMmye&=cA+k`HvR$af%-7^u%&K=_>D?NQ z>y4$1Q?V$R(fEGAYgqJJ0Gx_>1b6bS!Sae38q*oY;>Q{XXsy7y#W-s80)HODP6-cS zDPIONyuMh(YY|1t#O-E*Ph%l`g@De&@>HP~rksKEF1 zCJ&{}t(ZY9(Y6l=D!1&UskR^q%CW}_??zUU6ksfXS=lf0q`>3=~c4aCCEzcT;c^@;&t9ZZe$=oS9KR1i-~fF z_$7xs4$TI>ATnzI@-9r6?~t=D{|w|`3As|PZC`_N++8io(XR2>b)mHkDDBF}agN0Q>>`pnkbSohNV3QU=F7#~>B|;MjqAl16`#hXdG1 zXo-Jx{1;%|rCmWcyzT$D7IN7A{syy^oNjH{ekcF{03~!qSX*>tVRU6WV{&C-bY%cC zFflVNF)%GMI8-q+IyEplFflDKH##sdJt8-&0000bbVXQnWMOn=I&E)cX=Zr4-h761SM delta 1454 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 delta 1696 zcmV;R24DGx5zG#dlYa&rNkl%Ats6_B9a(1 zF~Nk5CN6Y=OA|MmxN_&l|G*urTo@K;h>?{9NkBr>sQ5r(1Ob)78HS!$Pd}<$obSxN zQ`5-I0IudHmF}urb?AMFu0trwA zT7h=`CO{pi0OR_9Pe7MuVO$%qFgi-W5HJYb0EPwlu8%2TbFTKoM=P)xSPi@kJSrB; zz#-sk-8T%RTF)2E;Lezy0Go4l0cat(x~O{>0Ly?UfY-%rU2NBYo4|aaAE;`shRLG_ zq`uE=Kqt2V+J6Qt($OuD3D5;>0(JtA>sls5t^&t^Z-BpmF|edRqFnJV+q;Mx-69MS}{>C&`BxtiBW6GE;`m}ME*jy@x8+yj2F^oy4jTsiANnmrS zs;C7!Fl}Wypb2ma3#9X6J;gG>a^NXo4<@5p|l$Swt9dyzz!^u zJs4WW=waYz;CciSx&1mJHFXMbqVsuJy1Ody8885hW?7ap%~8;=v-%kDF7OhQbLdUr z3*dK5%V3pk2e1#=C}Yc5iaH6Llaa{ijlkQ$TYvK0f@uGI`n)aJ`2xEQOEvyVJtO=H6QhJT0%a$6#l|tZTM}1(v5453m8OS*b(@?7~X# z2(T5{pt(9$x&D!1u^6km)}}Rz!cYJTS(YU_@FO0s*;F8h<+=t@l_3O}8<1iFm16zD zb$=b+)5c9uyyHBbj}m%~Hm#o$(q7du#Jz-rt%{*jSogGx5X~9ZA9QK6G8RZjG`|Ws z4V)EgEm-R75ul0~tn0qxST<D|CXggjgjplg!bV&ECwn_z)m(|zs0AB5^RqPf(;X0l)e z3#Q)$>=A(-7Za}vl=rM-goedS?jB%ov~Cd#&hwJT60At9*Semc7s`m0BIYYS4RO)V0Po9ZzC! zA%}pYTBFvi>uM-SHs`K;0Bn+r`^2tStR6y7P>;DP?aDUA=2zl7=uZfkS=6bRIc1*e~3(y`ymbfHBu3{Oc zMMO=hAgL_B2pp8_I<(n1mb(1msx}=XEDM~BjE~82srY&95l?9uK*_tF z2<)gdc2ofOVnXl3-WIlq^#+rxle71u+&idy&jBZ7)CS$xj+N&tV)G-pyMJ5PYuKw* zx7f`lENk)+qaBOPPO;OX#TH1fyRba$6{;2Z4)_fC35)P?8Sd{~Dc0}qBfJ%##G3eV z!mHF)&GiEx0^dv5wFzdL0Cs>SLb;ufCH?iln_|Js;{hzXuZdM}us!v(iLJHr)+Wsl z$Rk|>T*1=TX{;R`kkO4P9e?j_zGs!NO4E%6*fJS5hy_fa{#TgX6L_Q45xM#ec@L3M zCp7T~vBJ}jX}=C+Q&Lydu}^$Si45@CUB$}e1ww5fA=LAHL+t@ML}=Pi$mM6{=7sXu z8LVf%5d+P$_MfB4XQd)jJF%49N4cE5{8hgL%Nm_I52S=fX;LGTB!9{5-!x}3ntbso z5t4nJKHXq1ER#Nl{4Zde0G`gicl;r5Zp@9jF@y0hNtr6?p1UIp0000bbVXQnWMOn= zI%9HWVRU5xGB7bSEigGPGB#8(H99afIx;pbFgH3dF!^7NjQ{`uC3HntbYx+4Wjbwd qWNBu305UK!Gc7PVEfq30R53L=Ff=+cHZ3qWIxsMZ0yQy{RR}Tsd?Kd+ diff --git a/res/drawable-xhdpi/ic_setting.png b/res/drawable-xhdpi/ic_setting.png index 91ba98c557f3589d1a880c3a2504a15838e3147d..6f06bcfd90f8fc56f21dc6c8bf7d4a010ff53a00 100644 GIT binary patch delta 4362 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 EBC~}~+5i9m delta 3425 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 D-YH}9 diff --git a/res/drawable-xhdpi/ic_setting_pressed.png b/res/drawable-xhdpi/ic_setting_pressed.png index 08aafc405414cfa148a1cbe81591e99913ff6761..bca8ccdd085df5173547eca6ca291a77825d50af 100644 GIT binary patch delta 5155 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 diff --git a/res/drawable-xxhdpi/ic_setting.png b/res/drawable-xxhdpi/ic_setting.png index 6e1e6627cfff280ed4ea31ea6b3e374ce51aac5d..b3729d315f2659a5c878cf1a59c8f86b9d397132 100644 GIT binary patch delta 3709 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 M8>z2RujUZ-KfgF2oB#j- delta 6445 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 - - - + android:orientation="horizontal"> - - - + diff --git a/res/values/config.xml b/res/values/config.xml index 1a83556fb5..1538d9fab4 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -3,6 +3,10 @@ 6 5 3 + + 20 + + 80 false @@ -24,8 +28,6 @@ 80 - - 58 diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 740393ea58..c86fe314df 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -23,6 +23,9 @@ 4dp 18dp 8dp + 80dp + 120dp + 280dp 106.5dp @@ -49,9 +52,6 @@ 16dp 0dp - 50dp - 60dp - 130dp 4dip diff --git a/src/com/android/launcher3/DynamicGrid.java b/src/com/android/launcher3/DynamicGrid.java index 0d759a1759..5f8c011f93 100644 --- a/src/com/android/launcher3/DynamicGrid.java +++ b/src/com/android/launcher3/DynamicGrid.java @@ -86,6 +86,12 @@ class DeviceProfile { int availableHeightPx; int defaultPageSpacingPx; + int overviewModeMinIconZoneHeightPx; + int overviewModeMaxIconZoneHeightPx; + int overviewModeMaxBarWidthPx; + float overviewModeIconZoneRatio; + float overviewModeScaleFactor; + int iconSizePx; int iconTextSizePx; int iconDrawablePaddingPx; @@ -158,6 +164,16 @@ class DeviceProfile { res.getDimensionPixelSize(R.dimen.dynamic_grid_workspace_page_spacing); allAppsCellPaddingPx = res.getDimensionPixelSize(R.dimen.dynamic_grid_all_apps_cell_padding); + overviewModeMinIconZoneHeightPx = + res.getDimensionPixelSize(R.dimen.dynamic_grid_overview_min_icon_zone_height); + overviewModeMaxIconZoneHeightPx = + res.getDimensionPixelSize(R.dimen.dynamic_grid_overview_max_icon_zone_height); + overviewModeMaxBarWidthPx = + res.getDimensionPixelSize(R.dimen.dynamic_grid_overview_bar_max_width); + overviewModeIconZoneRatio = + res.getInteger(R.integer.config_dynamic_grid_overview_icon_zone_percentage) / 100f; + overviewModeScaleFactor = + res.getInteger(R.integer.config_dynamic_grid_overview_scale_percentage) / 100f; // Interpolate the rows for (DeviceProfile p : profiles) { @@ -454,6 +470,20 @@ class DeviceProfile { } } + Rect getOverviewModeButtonBarRect() { + int zoneHeight = (int) (overviewModeIconZoneRatio * availableHeightPx); + zoneHeight = Math.min(overviewModeMaxIconZoneHeightPx, + Math.max(overviewModeMinIconZoneHeightPx, zoneHeight)); + return new Rect(0, availableHeightPx - zoneHeight, 0, availableHeightPx); + } + + float getOverviewModeScale() { + Rect workspacePadding = getWorkspacePadding(); + Rect overviewBar = getOverviewModeButtonBarRect(); + int pageSpace = availableHeightPx - workspacePadding.top - workspacePadding.bottom; + return (overviewModeScaleFactor * (pageSpace - overviewBar.height())) / pageSpace; + } + // The rect returned will be extended to below the system ui that covers the workspace Rect getHotseatRect() { if (isVerticalBarLayout()) { @@ -601,6 +631,7 @@ class DeviceProfile { } } + // Layout AllApps AppsCustomizeTabHost host = (AppsCustomizeTabHost) launcher.findViewById(R.id.apps_customize_pane); if (host != null) { @@ -639,6 +670,17 @@ class DeviceProfile { pagedView.setWidgetsPageIndicatorPadding(pageIndicatorHeight); } } + + // Layout the Overview Mode + View overviewMode = launcher.getOverviewPanel(); + if (overviewMode != null) { + Rect r = getOverviewModeButtonBarRect(); + lp = (FrameLayout.LayoutParams) overviewMode.getLayoutParams(); + lp.gravity = Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM; + lp.width = Math.min(availableWidthPx, overviewModeMaxBarWidthPx); + lp.height = r.height(); + overviewMode.setLayoutParams(lp); + } } } diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index 8181bea4f9..5ff80b8f13 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -786,14 +786,14 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc int widthSize = MeasureSpec.getSize(widthMeasureSpec); int heightMode = MeasureSpec.getMode(heightMeasureSpec); int heightSize = MeasureSpec.getSize(heightMeasureSpec); - // NOTE: We multiply by 1.5f to account for the fact that depending on the offset of the + // NOTE: We multiply by 2f to account for the fact that depending on the offset of the // viewport, we can be at most one and a half screens offset once we scale down DisplayMetrics dm = getResources().getDisplayMetrics(); int maxSize = Math.max(dm.widthPixels + mInsets.left + mInsets.right, dm.heightPixels + mInsets.top + mInsets.bottom); - int parentWidthSize = (int) (1.5f * maxSize); - int parentHeightSize = maxSize; + int parentWidthSize = (int) (2f * maxSize); + int parentHeightSize = (int) (2f * maxSize); int scaledWidthSize, scaledHeightSize; if (mUseMinScale) { scaledWidthSize = (int) (parentWidthSize / mMinScale); diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 8c2c89d757..7692ae6d8c 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -184,7 +184,6 @@ public class Workspace extends SmoothPagedView private SpringLoadedDragController mSpringLoadedDragController; private float mSpringLoadedShrinkFactor; private float mOverviewModeShrinkFactor; - private int mOverviewModePageOffset; // State variable that indicates whether the pages are small (ie when you're // in all apps or customize mode) @@ -315,13 +314,13 @@ public class Workspace extends SmoothPagedView mFadeInAdjacentScreens = false; mWallpaperManager = WallpaperManager.getInstance(context); + LauncherAppState app = LauncherAppState.getInstance(); + DeviceProfile grid = app.getDynamicGrid().getDeviceProfile(); TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.Workspace, defStyle, 0); mSpringLoadedShrinkFactor = res.getInteger(R.integer.config_workspaceSpringLoadShrinkPercentage) / 100.0f; - mOverviewModeShrinkFactor = - res.getInteger(R.integer.config_workspaceOverviewShrinkPercentage) / 100.0f; - mOverviewModePageOffset = res.getDimensionPixelSize(R.dimen.overview_mode_page_offset); + mOverviewModeShrinkFactor = grid.getOverviewModeScale(); mCameraDistance = res.getInteger(R.integer.config_cameraDistance); mOriginalDefaultPage = mDefaultPage = a.getInt(R.styleable.Workspace_defaultScreen, 1); a.recycle(); @@ -417,10 +416,8 @@ public class Workspace extends SmoothPagedView setClipChildren(false); setClipToPadding(false); setChildrenDrawnWithCacheEnabled(true); - - // This is a bit of a hack to account for the fact that we translate the workspace - // up a bit, and still need to draw the background covering the whole screen. - setMinScale(mOverviewModeShrinkFactor - 0.2f); + + setMinScale(mOverviewModeShrinkFactor); setupLayoutTransition(); final Resources res = getResources(); @@ -1998,14 +1995,17 @@ public class Workspace extends SmoothPagedView } int getOverviewModeTranslationY() { - int childHeight = getNormalChildHeight(); - int viewPortHeight = getViewportHeight(); - int scaledChildHeight = (int) (mOverviewModeShrinkFactor * childHeight); + LauncherAppState app = LauncherAppState.getInstance(); + DeviceProfile grid = app.getDynamicGrid().getDeviceProfile(); + Rect overviewBar = grid.getOverviewModeButtonBarRect(); - int offset = (viewPortHeight - scaledChildHeight) / 2; - int offsetDelta = mOverviewModePageOffset - offset + mInsets.top; + int availableHeight = getViewportHeight(); + int scaledHeight = (int) (mOverviewModeShrinkFactor * getNormalChildHeight()); + int offsetFromTopEdge = (availableHeight - scaledHeight) / 2; + int offsetToCenterInOverview = (availableHeight - mInsets.top - overviewBar.height() + - scaledHeight) / 2; - return offsetDelta; + return -offsetFromTopEdge + mInsets.top + offsetToCenterInOverview; } boolean shouldVoiceButtonProxyBeVisible() {