openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove unused code in DeviceProfile. 

Change-Id: I463302e6711ad39241257b8dff058d9f3e99d883
This commit is contained in:
Jon Miranda 2016-11-02 16:56:52 -07:00
parent df3bc52ca9
commit c3e4e228b1
3 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/dimens.xml
View File

@ -33,8 +33,6 @@
<dimen name="dynamic_grid_workspace_page_spacing">8dp</dimen> <dimen name="dynamic_grid_workspace_page_spacing">8dp</dimen>
<!-- Minimum space between workspace and hotseat in spring loaded mode --> <!-- Minimum space between workspace and hotseat in spring loaded mode -->
<dimen name="dynamic_grid_min_spring_loaded_space">8dp</dimen> <dimen name="dynamic_grid_min_spring_loaded_space">8dp</dimen>
<dimen name="dynamic_grid_container_land_left_padding">118dp</dimen>
<dimen name="dynamic_grid_container_land_right_padding">66dp</dimen>
<!-- Drop target bar --> <!-- Drop target bar -->
<dimen name="dynamic_grid_drop_target_size">48dp</dimen> <dimen name="dynamic_grid_drop_target_size">48dp</dimen>

2
src/com/android/launcher3/BaseContainerView.java
View File

@ -120,7 +120,7 @@ public abstract class BaseContainerView extends FrameLayout
int paddingBottom; int paddingBottom;
DeviceProfile grid = Launcher.getLauncher(context).getDeviceProfile(); DeviceProfile grid = Launcher.getLauncher(context).getDeviceProfile();
int[] padding = grid.getContainerPadding(context); int[] padding = grid.getContainerPadding();
paddingLeft = padding[0] + grid.edgeMarginPx; paddingLeft = padding[0] + grid.edgeMarginPx;
paddingRight = padding[1] + grid.edgeMarginPx; paddingRight = padding[1] + grid.edgeMarginPx;
if (!grid.isVerticalBarLayout()) { if (!grid.isVerticalBarLayout()) {

12
src/com/android/launcher3/DeviceProfile.java
View File

@ -116,10 +116,6 @@ public class DeviceProfile {
public int allAppsIconDrawablePaddingPx; public int allAppsIconDrawablePaddingPx;
public float allAppsIconTextSizePx; public float allAppsIconTextSizePx;
// Containers
private final int containerLeftPaddingPx;
private final int containerRightPaddingPx;
// Drop Target // Drop Target
public int dropTargetBarSizePx; public int dropTargetBarSizePx;
@ -184,10 +180,6 @@ public class DeviceProfile {
hotseatBarTopPaddingPx = hotseatBarTopPaddingPx =
res.getDimensionPixelSize(R.dimen.dynamic_grid_hotseat_top_padding); res.getDimensionPixelSize(R.dimen.dynamic_grid_hotseat_top_padding);
hotseatLandGutterPx = res.getDimensionPixelSize(R.dimen.dynamic_grid_hotseat_gutter_width); hotseatLandGutterPx = res.getDimensionPixelSize(R.dimen.dynamic_grid_hotseat_gutter_width);
containerLeftPaddingPx =
res.getDimensionPixelSize(R.dimen.dynamic_grid_container_land_left_padding);
containerRightPaddingPx =
res.getDimensionPixelSize(R.dimen.dynamic_grid_container_land_right_padding);
// Determine sizes. // Determine sizes.
widthPx = width; widthPx = width;
@ -588,9 +580,7 @@ public class DeviceProfile {
/** /**
* @return the left/right paddings for all containers. * @return the left/right paddings for all containers.
*/ */
public final int[] getContainerPadding(Context context) { public final int[] getContainerPadding() {
Resources res = context.getResources();
// No paddings for portrait phone // No paddings for portrait phone
if (isPhone && !isVerticalBarLayout()) { if (isPhone && !isVerticalBarLayout()) {
return new int[] {0, 0}; return new int[] {0, 0};