summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--res/xml/default_workspace_4x5.xml (renamed from res/xml/default_workspace_4x4.xml)0
-rw-r--r--res/xml/device_profiles.xml22
-rw-r--r--src/com/android/launcher3/LauncherFiles.java2
3 files changed, 11 insertions, 13 deletions
diff --git a/res/xml/default_workspace_4x4.xml b/res/xml/default_workspace_4x5.xml
index dfde7de186..dfde7de186 100644
--- a/res/xml/default_workspace_4x4.xml
+++ b/res/xml/default_workspace_4x5.xml
diff --git a/res/xml/device_profiles.xml b/res/xml/device_profiles.xml
index 08698e7d9d..be6bc25146 100644
--- a/res/xml/device_profiles.xml
+++ b/res/xml/device_profiles.xml
@@ -47,21 +47,21 @@
</grid-option>
<grid-option
- launcher:name="4_by_4"
- launcher:numRows="4"
+ launcher:name="4_by_5"
+ launcher:numRows="5"
launcher:numColumns="4"
- launcher:numFolderRows="3"
+ launcher:numFolderRows="4"
launcher:numFolderColumns="4"
- launcher:numHotseatIcons="4"
- launcher:dbFile="launcher_4_by_4.db"
- launcher:defaultLayoutId="@xml/default_workspace_4x4"
+ launcher:numHotseatIcons="5"
+ launcher:dbFile="launcher_4_by_5.db"
+ launcher:defaultLayoutId="@xml/default_workspace_4x5"
launcher:deviceCategory="phone|multi_display" >
<display-option
launcher:name="Short Stubby"
launcher:minWidthDps="275"
launcher:minHeightDps="420"
- launcher:iconImageSize="48"
+ launcher:iconImageSize="46"
launcher:iconTextSize="13.0"
launcher:canBeDefault="true" />
@@ -69,7 +69,7 @@
launcher:name="Stubby"
launcher:minWidthDps="255"
launcher:minHeightDps="450"
- launcher:iconImageSize="48"
+ launcher:iconImageSize="46"
launcher:iconTextSize="13.0"
launcher:canBeDefault="true" />
@@ -77,7 +77,7 @@
launcher:name="Nexus S"
launcher:minWidthDps="296"
launcher:minHeightDps="491.33"
- launcher:iconImageSize="48"
+ launcher:iconImageSize="46"
launcher:iconTextSize="13.0"
launcher:canBeDefault="true" />
@@ -85,7 +85,7 @@
launcher:name="Nexus 4"
launcher:minWidthDps="359"
launcher:minHeightDps="567"
- launcher:iconImageSize="54"
+ launcher:iconImageSize="50"
launcher:iconTextSize="13.0"
launcher:canBeDefault="true" />
@@ -93,7 +93,7 @@
launcher:name="Nexus 5"
launcher:minWidthDps="335"
launcher:minHeightDps="567"
- launcher:iconImageSize="54"
+ launcher:iconImageSize="50"
launcher:iconTextSize="13.0"
launcher:canBeDefault="true" />
diff --git a/src/com/android/launcher3/LauncherFiles.java b/src/com/android/launcher3/LauncherFiles.java
index e59eac8dd2..c3b518bb0f 100644
--- a/src/com/android/launcher3/LauncherFiles.java
+++ b/src/com/android/launcher3/LauncherFiles.java
@@ -18,7 +18,6 @@ public class LauncherFiles {
public static final String LAUNCHER_DB = "launcher.db";
public static final String LAUNCHER_6_BY_5_DB = "launcher_6_by_5.db";
public static final String LAUNCHER_4_BY_5_DB = "launcher_4_by_5.db";
- public static final String LAUNCHER_4_BY_4_DB = "launcher_4_by_4.db";
public static final String LAUNCHER_3_BY_3_DB = "launcher_3_by_3.db";
public static final String LAUNCHER_2_BY_2_DB = "launcher_2_by_2.db";
public static final String BACKUP_DB = "backup.db";
@@ -35,7 +34,6 @@ public class LauncherFiles {
LAUNCHER_DB,
LAUNCHER_6_BY_5_DB,
LAUNCHER_4_BY_5_DB,
- LAUNCHER_4_BY_4_DB,
LAUNCHER_3_BY_3_DB,
LAUNCHER_2_BY_2_DB));