PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 03ec57d3: am 93b6ee6d: Merge "Revert "Allow 5 hotseat icons in DISABLE_ALL_APPS mode."" into jb-ub-now-kermit

Browse Source 
* commit '03ec57d313f3f72b76f3df0cc4a297d3788847e5':
  Revert "Allow 5 hotseat icons in DISABLE_ALL_APPS mode."
This commit is contained in:
Nilesh Agrawal
2014-02-14 20:54:26 +00:00
committed by Android Git Automerger
parent e4ccb341d8 03ec57d313
commit d1ce093cf0
2 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/DynamicGrid.java
+6 -6
View File
@@ -60,17 +60,17 @@ public class DynamicGrid {
DEFAULT_ICON_SIZE_PX = pxFromDp(DEFAULT_ICON_SIZE_DP, dm);
// Our phone profiles include the bar sizes in each orientation
deviceProfiles.add(new DeviceProfile("Super Short Stubby",
255, 300, 2, 3, 48, 13, (hasAA ? 5 : 5), 48));
255, 300, 2, 3, 48, 13, (hasAA ? 5 : 4), 48));
deviceProfiles.add(new DeviceProfile("Shorter Stubby",
255, 400, 3, 3, 48, 13, (hasAA ? 5 : 5), 48));
255, 400, 3, 3, 48, 13, (hasAA ? 5 : 4), 48));
deviceProfiles.add(new DeviceProfile("Short Stubby",
275, 420, 3, 4, 48, 13, (hasAA ? 5 : 5), 48));
275, 420, 3, 4, 48, 13, (hasAA ? 5 : 4), 48));
deviceProfiles.add(new DeviceProfile("Stubby",
255, 450, 3, 4, 48, 13, (hasAA ? 5 : 5), 48));
255, 450, 3, 4, 48, 13, (hasAA ? 5 : 4), 48));
deviceProfiles.add(new DeviceProfile("Nexus S",
296, 491.33f, 4, 4, 48, 13, (hasAA ? 5 : 5), 48));
296, 491.33f, 4, 4, 48, 13, (hasAA ? 5 : 4), 48));
deviceProfiles.add(new DeviceProfile("Nexus 4",
359, 518, 4, 4, DEFAULT_ICON_SIZE_DP, 13, (hasAA ? 5 : 5), 56));
359, 518, 4, 4, DEFAULT_ICON_SIZE_DP, 13, (hasAA ? 5 : 4), 56));
// The tablet profile is odd in that the landscape orientation
// also includes the nav bar on the side
deviceProfiles.add(new DeviceProfile("Nexus 7",
src/com/android/launcher3/LauncherProvider.java
+1 -10
View File
@@ -270,8 +270,7 @@ public class LauncherProvider extends ContentProvider {
// Use default workspace resource if none provided
if (workspaceResId == 0) {
workspaceResId =
sp.getInt(DEFAULT_WORKSPACE_RESOURCE_ID, getDefaultWorkspaceResourceId());
workspaceResId = sp.getInt(DEFAULT_WORKSPACE_RESOURCE_ID, R.xml.default_workspace);
}
// Populate favorites table with initial favorites
@@ -287,14 +286,6 @@ public class LauncherProvider extends ContentProvider {
}
}
private static int getDefaultWorkspaceResourceId() {
if (AppsCustomizePagedView.DISABLE_ALL_APPS) {
return R.xml.default_workspace_no_all_apps;
} else {
return R.xml.default_workspace;
}
}
private static interface ContentValuesCallback {
public void onRow(ContentValues values);
}