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

Modifying portals in landscape on the phone UI 

Change-Id: I4190b0e4958dfd0d59d943d9b4c4d6fd2e9303c0
This commit is contained in:
Adam Cohen 2011-11-15 17:10:00 -08:00
parent 2cf7a80c87
commit 78dc83e875
4 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
res/values-land/config.xml
View File

@ -20,4 +20,9 @@
<bool name="config_useDropTargetDownTransition">false</bool>
<!-- Whether or not to fade the side pages -->
<bool name="config_workspaceFadeAdjacentScreens">false</bool>
<!-- Folder max bounds and max number of items.
Note: folder_max_count_x * folder_max_count_y >= folder_max_num_items. -->
<integer name="folder_max_count_x">6</integer>
<integer name="folder_max_count_y">3</integer>
</resources>

5
res/values-sw600dp/config.xml
View File

@ -19,4 +19,9 @@
<!-- When shrinking the workspace, this is the percentage of its original size. -->
<integer name="config_workspaceShrinkPercent">17</integer>
<!-- Folder max bounds and max number of items. Note: folder_max_count_x * folder_max_count_y
>= folder_max_num_items. When these are set to -1, they are automatically determined. -->
<integer name="folder_max_count_x">-1</integer>
<integer name="folder_max_count_y">-1</integer>
<integer name="folder_max_num_items">-1</integer>
</resources>

6
res/values/config.xml
View File

@ -84,4 +84,10 @@
<!-- When shrinking the workspace, this is the percentage of its original size. -->
<integer name="config_workspaceShrinkPercent">17</integer>
<!-- Folder max bounds and max number of items. Note: folder_max_count_x * folder_max_count_y
>= folder_max_num_items. When these are set to -1, they are automatically determined. -->
<integer name="folder_max_count_x">4</integer>
<integer name="folder_max_count_y">4</integer>
<integer name="folder_max_num_items">16</integer>
</resources>

18
src/com/android/launcher2/Folder.java
View File

@ -83,6 +83,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
private FolderIcon mFolderIcon;
private int mMaxCountX;
private int mMaxCountY;
private int mMaxNumItems;
private Rect mNewSize = new Rect();
private Rect mIconRect = new Rect();
private ArrayList<View> mItemsInReadingOrder = new ArrayList<View>();
@ -121,13 +122,20 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
setAlwaysDrawnWithCacheEnabled(false);
mInflater = LayoutInflater.from(context);
mIconCache = ((LauncherApplication)context.getApplicationContext()).getIconCache();
mMaxCountX = LauncherModel.getCellCountX();
mMaxCountY = LauncherModel.getCellCountY();
Resources res = getResources();
mMaxCountX = res.getInteger(R.integer.folder_max_count_x);
mMaxCountY = res.getInteger(R.integer.folder_max_count_y);
mMaxNumItems = res.getInteger(R.integer.folder_max_num_items);
if (mMaxCountX < 0 || mMaxCountY < 0 || mMaxNumItems < 0) {
mMaxCountX = LauncherModel.getCellCountX();
mMaxCountY = LauncherModel.getCellCountY();
mMaxNumItems = mMaxCountX * mMaxCountY;
}
mInputMethodManager = (InputMethodManager)
mContext.getSystemService(Context.INPUT_METHOD_SERVICE);
Resources res = getResources();
mExpandDuration = res.getInteger(R.integer.config_folderAnimDuration);
if (sDefaultFolderName == null) {
@ -746,7 +754,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
int oldCountY = countY;
if (countX * countY < count) {
// Current grid is too small, expand it
if (countX <= countY && countX < mMaxCountX) {
if ((countX <= countY || countY == mMaxCountY) && countX < mMaxCountX) {
countX++;
} else if (countY < mMaxCountY) {
countY++;
@ -764,7 +772,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
}
public boolean isFull() {
return getItemCount() >= mMaxCountX * mMaxCountY;
return getItemCount() >= mMaxNumItems;
}
private void centerAboutIcon() {