summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Garnes <matt@cyngn.com>2015-01-16 11:35:52 (GMT)
committerMatt Garnes <matt@cyngn.com>2015-01-16 11:52:48 (GMT)
commit3f1f8fbfed868f864cf92138053c1160b3729682 (patch)
treef189ad4e3618f351acba8d0451697dd2fd860828
parent980b87ecea6e6db8e5aede8d463df88181721838 (diff)
downloadandroid_packages_apps_Trebuchet-3f1f8fbfed868f864cf92138053c1160b3729682.zip
android_packages_apps_Trebuchet-3f1f8fbfed868f864cf92138053c1160b3729682.tar.gz
android_packages_apps_Trebuchet-3f1f8fbfed868f864cf92138053c1160b3729682.tar.bz2
Rename carrier workspace files and config.
- Rename Micromax config and workspace. - Rename Smartfren config and workspace. Change-Id: Ic13191f11c325715eb5d6e97899e9cbc900778bd
-rw-r--r--res/values/config.xml4
-rwxr-xr-xres/xml/mmx_default_workspace.xml (renamed from res/xml/micromax_default_workspace.xml)0
-rw-r--r--res/xml/srf_default_workspace.xml (renamed from res/xml/smartfren_default_workspace.xml)0
-rw-r--r--src/com/android/launcher3/DynamicGrid.java4
-rw-r--r--src/com/android/launcher3/LauncherApplication.java4
5 files changed, 6 insertions, 6 deletions
diff --git a/res/values/config.xml b/res/values/config.xml
index 36f719d..21660fd 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -123,6 +123,6 @@
<bool name="config_launcher_shortcut">false</bool>
<bool name="config_launcher_show_unread_number">true</bool>
<bool name="config_launcher_show_backup_shortcut">false</bool>
- <bool name="config_micromax_enabled">false</bool>
- <bool name="config_smartfren_enabled">false</bool>
+ <bool name="config_mmx_enabled">false</bool>
+ <bool name="config_srf_enabled">false</bool>
</resources>
diff --git a/res/xml/micromax_default_workspace.xml b/res/xml/mmx_default_workspace.xml
index 99d6db1..99d6db1 100755
--- a/res/xml/micromax_default_workspace.xml
+++ b/res/xml/mmx_default_workspace.xml
diff --git a/res/xml/smartfren_default_workspace.xml b/res/xml/srf_default_workspace.xml
index 558ae29..558ae29 100644
--- a/res/xml/smartfren_default_workspace.xml
+++ b/res/xml/srf_default_workspace.xml
diff --git a/src/com/android/launcher3/DynamicGrid.java b/src/com/android/launcher3/DynamicGrid.java
index fe0897c..a01dfa1 100644
--- a/src/com/android/launcher3/DynamicGrid.java
+++ b/src/com/android/launcher3/DynamicGrid.java
@@ -68,9 +68,9 @@ public class DynamicGrid {
} else if (LauncherApplication.LAUNCHER_BACKUP_SHORTCUT_ENABLED) {
fourByFourDefaultLayout = R.xml.cm_with_backup_default_workspace;
} else if (LauncherApplication.LAUNCHER_MMX_SHORTCUT_ENABLED) {
- fourByFourDefaultLayout = R.xml.micromax_default_workspace;
+ fourByFourDefaultLayout = R.xml.mmx_default_workspace;
} else if (LauncherApplication.LAUNCHER_SFR_SHORTCUT_ENABLED) {
- fourByFourDefaultLayout = R.xml.smartfren_default_workspace;
+ fourByFourDefaultLayout = R.xml.srf_default_workspace;
}
DEFAULT_ICON_SIZE_PX = pxFromDp(DEFAULT_ICON_SIZE_DP, dm);
diff --git a/src/com/android/launcher3/LauncherApplication.java b/src/com/android/launcher3/LauncherApplication.java
index 689f54d..751ff79 100644
--- a/src/com/android/launcher3/LauncherApplication.java
+++ b/src/com/android/launcher3/LauncherApplication.java
@@ -37,9 +37,9 @@ public class LauncherApplication extends Application {
LAUNCHER_BACKUP_SHORTCUT_ENABLED =
getResources().getBoolean(R.bool.config_launcher_show_backup_shortcut);
LAUNCHER_MMX_SHORTCUT_ENABLED =
- getResources().getBoolean(R.bool.config_micromax_enabled);
+ getResources().getBoolean(R.bool.config_mmx_enabled);
LAUNCHER_SFR_SHORTCUT_ENABLED =
- getResources().getBoolean(R.bool.config_smartfren_enabled);
+ getResources().getBoolean(R.bool.config_srf_enabled);
LauncherAppState.setApplicationContext(this);
LauncherAppState.getInstance();
}