From 3f1f8fbfed868f864cf92138053c1160b3729682 Mon Sep 17 00:00:00 2001
From: Matt Garnes <matt@cyngn.com>
Date: Fri, 16 Jan 2015 19:35:52 +0800
Subject: Rename carrier workspace files and config.

- Rename Micromax config and workspace.
- Rename Smartfren config and workspace.

Change-Id: Ic13191f11c325715eb5d6e97899e9cbc900778bd
---
 res/values/config.xml                              |   4 +-
 res/xml/micromax_default_workspace.xml             |  83 -------
 res/xml/mmx_default_workspace.xml                  |  83 +++++++
 res/xml/smartfren_default_workspace.xml            | 251 ---------------------
 res/xml/srf_default_workspace.xml                  | 251 +++++++++++++++++++++
 src/com/android/launcher3/DynamicGrid.java         |   4 +-
 src/com/android/launcher3/LauncherApplication.java |   4 +-
 7 files changed, 340 insertions(+), 340 deletions(-)
 delete mode 100755 res/xml/micromax_default_workspace.xml
 create mode 100755 res/xml/mmx_default_workspace.xml
 delete mode 100644 res/xml/smartfren_default_workspace.xml
 create mode 100644 res/xml/srf_default_workspace.xml

diff --git a/res/values/config.xml b/res/values/config.xml
index 36f719d6b..21660fd11 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/micromax_default_workspace.xml
deleted file mode 100755
index 99d6db118..000000000
--- a/res/xml/micromax_default_workspace.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2014, The Linux Foundation. All rights reserved.
-     Not a Contribution.
-
-     Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<favorites xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3">
-    <appwidget
-        launcher:className="com.android.alarmclock.AnalogAppWidgetProvider"
-        launcher:packageName="com.android.deskclock"
-        launcher:screen="2"
-        launcher:spanX="2"
-        launcher:spanY="2"
-        launcher:x="1"
-        launcher:y="0" />
-
-    <favorite
-        launcher:className="com.micromax.MainActivity"
-        launcher:packageName="com.micromax"
-        launcher:screen="2"
-        launcher:x="0"
-        launcher:y="3" />
-    <favorite
-        launcher:className="com.sisah.micromax.mizoneplus.Disclaimer1Activity"
-        launcher:packageName="com.sisah.micromax.mizoneplus"
-        launcher:screen="2"
-        launcher:x="1"
-        launcher:y="3" />
-    <favorite
-        launcher:className="com.android.vending.AssetBrowserActivity"
-        launcher:packageName="com.android.vending"
-        launcher:screen="2"
-        launcher:x="2"
-        launcher:y="3" />
-    <favorite
-        launcher:className="com.android.gallery3d.app.Gallery"
-        launcher:packageName="com.android.gallery3d"
-        launcher:screen="2"
-        launcher:x="3"
-        launcher:y="3" />
-    <favorite
-        launcher:className="com.android.dialer.DialtactsActivity"
-        launcher:container="-101"
-        launcher:packageName="com.android.dialer"
-        launcher:screen="1"
-        launcher:x="1"
-        launcher:y="0" />
-    <favorite
-        launcher:className="com.android.contacts.activities.PeopleActivity"
-        launcher:container="-101"
-        launcher:packageName="com.android.contacts"
-        launcher:screen="0"
-        launcher:x="0"
-        launcher:y="0" />
-    <favorite
-        launcher:className="com.android.mms.ui.ConversationList"
-        launcher:container="-101"
-        launcher:packageName="com.android.mms"
-        launcher:screen="3"
-        launcher:x="3"
-        launcher:y="0" />
-    <favorite
-        launcher:className="com.android.browser.BrowserActivity"
-        launcher:container="-101"
-        launcher:packageName="com.android.browser"
-        launcher:screen="4"
-        launcher:x="4"
-        launcher:y="0" />
-
-</favorites>
diff --git a/res/xml/mmx_default_workspace.xml b/res/xml/mmx_default_workspace.xml
new file mode 100755
index 000000000..99d6db118
--- /dev/null
+++ b/res/xml/mmx_default_workspace.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2014, The Linux Foundation. All rights reserved.
+     Not a Contribution.
+
+     Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<favorites xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3">
+    <appwidget
+        launcher:className="com.android.alarmclock.AnalogAppWidgetProvider"
+        launcher:packageName="com.android.deskclock"
+        launcher:screen="2"
+        launcher:spanX="2"
+        launcher:spanY="2"
+        launcher:x="1"
+        launcher:y="0" />
+
+    <favorite
+        launcher:className="com.micromax.MainActivity"
+        launcher:packageName="com.micromax"
+        launcher:screen="2"
+        launcher:x="0"
+        launcher:y="3" />
+    <favorite
+        launcher:className="com.sisah.micromax.mizoneplus.Disclaimer1Activity"
+        launcher:packageName="com.sisah.micromax.mizoneplus"
+        launcher:screen="2"
+        launcher:x="1"
+        launcher:y="3" />
+    <favorite
+        launcher:className="com.android.vending.AssetBrowserActivity"
+        launcher:packageName="com.android.vending"
+        launcher:screen="2"
+        launcher:x="2"
+        launcher:y="3" />
+    <favorite
+        launcher:className="com.android.gallery3d.app.Gallery"
+        launcher:packageName="com.android.gallery3d"
+        launcher:screen="2"
+        launcher:x="3"
+        launcher:y="3" />
+    <favorite
+        launcher:className="com.android.dialer.DialtactsActivity"
+        launcher:container="-101"
+        launcher:packageName="com.android.dialer"
+        launcher:screen="1"
+        launcher:x="1"
+        launcher:y="0" />
+    <favorite
+        launcher:className="com.android.contacts.activities.PeopleActivity"
+        launcher:container="-101"
+        launcher:packageName="com.android.contacts"
+        launcher:screen="0"
+        launcher:x="0"
+        launcher:y="0" />
+    <favorite
+        launcher:className="com.android.mms.ui.ConversationList"
+        launcher:container="-101"
+        launcher:packageName="com.android.mms"
+        launcher:screen="3"
+        launcher:x="3"
+        launcher:y="0" />
+    <favorite
+        launcher:className="com.android.browser.BrowserActivity"
+        launcher:container="-101"
+        launcher:packageName="com.android.browser"
+        launcher:screen="4"
+        launcher:x="4"
+        launcher:y="0" />
+
+</favorites>
diff --git a/res/xml/smartfren_default_workspace.xml b/res/xml/smartfren_default_workspace.xml
deleted file mode 100644
index 558ae2945..000000000
--- a/res/xml/smartfren_default_workspace.xml
+++ /dev/null
@@ -1,251 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2014, The Linux Foundation. All rights reserved.
-     Not a Contribution.
-
-     Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<favorites xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3">
-    <!-- Far-left screen [0] -->
-    <!-- Left screen [1] -->
-    <!-- Middle screen [2] -->
-    <appwidget launcher:className="com.dolby.DolbyWidgetSmallProvider"
-        launcher:packageName="com.dolby"
-        launcher:container="-100"
-        launcher:screen="2"
-        launcher:x="0"
-        launcher:y="0"
-        launcher:spanX="4"
-        launcher:spanY="2" />
-    <folder launcher:container="-100"
-        launcher:screen="2"
-        launcher:x="0"
-        launcher:y="3"
-        launcher:title="@string/foldname_smartworld">
-        <favorite launcher:className="com.smartfren.SplashActivity"
-            launcher:packageName="com.smartfren"
-            launcher:container="10"
-            launcher:screen="0"
-            launcher:x="0"
-            launcher:y="0" />
-        <favorite launcher:className="com.mfino.bsim.SplashScreen"
-            launcher:packageName="com.mfino.bsim"
-            launcher:container="10"
-            launcher:screen="0"
-            launcher:x="1"
-            launcher:y="0" />
-        <favorite launcher:className="com.smartfren.app.excite.Main"
-            launcher:packageName="com.smartfren.app.excite"
-            launcher:container="10"
-            launcher:screen="0"
-            launcher:x="0"
-            launcher:y="1" />
-        <favorite launcher:className="rocket.zalora.view.SplashScreen"
-            launcher:packageName="com.zalora.android"
-            launcher:container="10"
-            launcher:screen="0"
-            launcher:x="1"
-            launcher:y="1" />
-    </folder>
-    <folder launcher:container="-100"
-        launcher:screen="2"
-        launcher:x="3"
-        launcher:y="3"
-        launcher:title="@string/foldname_music">
-        <favorite launcher:className="com.foreverapps.smartfren.Activity"
-            launcher:packageName="com.foreverapps.smartfren"
-            launcher:container="27"
-            launcher:screen="0"
-            launcher:x="0"
-            launcher:y="0" />
-        <favorite launcher:className="com.melon.http.Splash"
-            launcher:packageName="com.smartfren.melon"
-            launcher:container="27"
-            launcher:screen="0"
-            launcher:x="1"
-            launcher:y="0" />
-        <favorite launcher:className="com.android.music.MusicBrowserActivity"
-            launcher:packageName="com.android.music"
-            launcher:container="27"
-            launcher:screen="0"
-            launcher:x="0"
-            launcher:y="1" />
-    </folder>
-    <favorite launcher:className="com.iguanasms.smartfrenstore.MainActivity"
-        launcher:packageName="com.iguanasms.smartfrenstore"
-        launcher:container="-100"
-        launcher:screen="2"
-        launcher:x="0"
-        launcher:y="4" />
-    <favorite launcher:className="com.linkit360.funbox.WelcomeActivity"
-        launcher:packageName="com.linkit360.funbox"
-        launcher:container="-100"
-        launcher:screen="2"
-        launcher:x="1"
-        launcher:y="4" />
-    <favorite launcher:className="com.android.vending.AssetBrowserActivity"
-        launcher:packageName="com.android.vending"
-        launcher:container="-100"
-        launcher:screen="2"
-        launcher:x="2"
-        launcher:y="4" />
-    <favorite launcher:className="com.baidu.browser.inter.SplashActivity"
-        launcher:packageName="com.baidu.browser.inter"
-        launcher:container="-100"
-        launcher:screen="2"
-        launcher:x="3"
-        launcher:y="4" />
-
-    <!-- Right screen [3] -->
-    <appwidget launcher:className="com.smartfren.widget.CustomerInfoWidget"
-        launcher:packageName="com.smartfren"
-        launcher:container="-100"
-        launcher:screen="3"
-        launcher:x="0"
-        launcher:y="0"
-        launcher:spanX="4"
-        launcher:spanY="3" />
-    <favorite launcher:className="com.bbm.ui.activities.StartupActivity"
-        launcher:packageName="com.bbm"
-        launcher:container="-100"
-        launcher:screen="3"
-        launcher:x="0"
-        launcher:y="4" />
-    <favorite launcher:className="com.caf.fmradio.FMRadio"
-        launcher:packageName="com.caf.fmradio"
-        launcher:container="-100"
-        launcher:screen="3"
-        launcher:x="1"
-        launcher:y="4" />
-    <favorite launcher:className="com.saraswati.gamesantigalau.activity.Splash"
-        launcher:packageName="com.saraswati.gamesantigalau"
-        launcher:container="-100"
-        launcher:screen="3"
-        launcher:x="2"
-        launcher:y="4" />
-    <favorite launcher:className="com.saraswati.lipstiktv.activity.Splash"
-        launcher:packageName="com.saraswati.lipstiktv"
-        launcher:container="-100"
-        launcher:screen="3"
-        launcher:x="3"
-        launcher:y="4" />
-    <!-- Far-right screen [4] -->
-
-    <!-- Hot Seat -->
-    <favorite launcher:className="com.android.dialer.DialtactsActivity"
-        launcher:packageName="com.android.dialer"
-        launcher:container="-101"
-        launcher:screen="0"
-        launcher:x="0"
-        launcher:y="0" />
-    <favorite launcher:className="com.android.mms.ui.ConversationList"
-        launcher:packageName="com.android.mms"
-        launcher:container="-101"
-        launcher:screen="1"
-        launcher:x="1"
-        launcher:y="0" />
-    <favorite launcher:className="com.android.camera.CameraActivity"
-        launcher:packageName="com.android.camera2"
-        launcher:container="-101"
-        launcher:screen="3"
-        launcher:x="3"
-        launcher:y="0" />
-    <folder launcher:container="-101"
-        launcher:screen="4"
-        launcher:x="4"
-        launcher:y="0"
-        launcher:title="@string/foldname_google">
-        <favorite launcher:className="com.google.android.apps.chrome.Main"
-            launcher:packageName="com.android.chrome"
-            launcher:container="47"
-            launcher:screen="0"
-            launcher:x="0"
-            launcher:y="0" />
-        <favorite launcher:className="com.google.android.gm.ConversationListActivityGmail"
-            launcher:packageName="com.google.android.gm"
-            launcher:container="47"
-            launcher:screen="0"
-            launcher:x="1"
-            launcher:y="0" />
-        <favorite launcher:className="com.google.android.apps.plus.phone.HomeActivity"
-            launcher:packageName="com.google.android.apps.plus"
-            launcher:container="47"
-            launcher:screen="0"
-            launcher:x="2"
-            launcher:y="0" />
-        <favorite launcher:className="com.google.android.maps.MapsActivity"
-            launcher:packageName="com.google.android.apps.maps"
-            launcher:container="47"
-            launcher:screen="0"
-            launcher:x="3"
-            launcher:y="0" />
-        <favorite
-            launcher:className="com.google.android.apps.genie.geniewidget.activities.NewsActivity"
-            launcher:packageName="com.google.android.apps.genie.geniewidget"
-            launcher:container="47"
-            launcher:screen="0"
-            launcher:x="0"
-            launcher:y="1" />
-        <favorite launcher:className="com.android.music.activitymanagement.TopLevelActivity"
-            launcher:packageName="com.google.android.music"
-            launcher:container="47"
-            launcher:screen="0"
-            launcher:x="1"
-            launcher:y="1" />
-        <favorite launcher:className="com.google.android.apps.books.app.BooksActivity"
-            launcher:packageName="com.google.android.apps.books"
-            launcher:container="47"
-            launcher:screen="0"
-            launcher:x="2"
-            launcher:y="1" />
-        <favorite
-            launcher:className="com.google.apps.dots.android.app.activity.CurrentsStartActivity"
-            launcher:packageName="com.google.android.apps.magazines"
-            launcher:container="47"
-            launcher:screen="0"
-            launcher:x="3"
-            launcher:y="1" />
-        <favorite launcher:className="com.google.android.gms.games.ui.destination.main.MainActivity"
-            launcher:packageName="com.google.android.play.games"
-            launcher:container="47"
-            launcher:screen="0"
-            launcher:x="0"
-            launcher:y="2" />
-        <favorite launcher:className="com.google.android.apps.docs.app.NewMainProxyActivity"
-            launcher:packageName="com.google.android.apps.docs"
-            launcher:container="47"
-            launcher:screen="0"
-            launcher:x="1"
-            launcher:y="2" />
-        <favorite launcher:className="com.google.android.youtube.app.honeycomb.Shell$HomeActivity"
-            launcher:packageName="com.google.android.youtube"
-            launcher:container="47"
-            launcher:screen="0"
-            launcher:x="2"
-            launcher:y="2" />
-        <favorite launcher:className="com.google.android.apps.plus.phone.ConversationListActivity"
-            launcher:packageName="com.google.android.apps.plus"
-            launcher:container="47"
-            launcher:screen="0"
-            launcher:x="3"
-            launcher:y="2" />
-        <favorite launcher:className="com.google.android.talk.SigningInActivity"
-            launcher:packageName="com.google.android.talk"
-            launcher:container="47"
-            launcher:screen="0"
-            launcher:x="0"
-            launcher:y="3" />
-    </folder>
-</favorites>
diff --git a/res/xml/srf_default_workspace.xml b/res/xml/srf_default_workspace.xml
new file mode 100644
index 000000000..558ae2945
--- /dev/null
+++ b/res/xml/srf_default_workspace.xml
@@ -0,0 +1,251 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2014, The Linux Foundation. All rights reserved.
+     Not a Contribution.
+
+     Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<favorites xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3">
+    <!-- Far-left screen [0] -->
+    <!-- Left screen [1] -->
+    <!-- Middle screen [2] -->
+    <appwidget launcher:className="com.dolby.DolbyWidgetSmallProvider"
+        launcher:packageName="com.dolby"
+        launcher:container="-100"
+        launcher:screen="2"
+        launcher:x="0"
+        launcher:y="0"
+        launcher:spanX="4"
+        launcher:spanY="2" />
+    <folder launcher:container="-100"
+        launcher:screen="2"
+        launcher:x="0"
+        launcher:y="3"
+        launcher:title="@string/foldname_smartworld">
+        <favorite launcher:className="com.smartfren.SplashActivity"
+            launcher:packageName="com.smartfren"
+            launcher:container="10"
+            launcher:screen="0"
+            launcher:x="0"
+            launcher:y="0" />
+        <favorite launcher:className="com.mfino.bsim.SplashScreen"
+            launcher:packageName="com.mfino.bsim"
+            launcher:container="10"
+            launcher:screen="0"
+            launcher:x="1"
+            launcher:y="0" />
+        <favorite launcher:className="com.smartfren.app.excite.Main"
+            launcher:packageName="com.smartfren.app.excite"
+            launcher:container="10"
+            launcher:screen="0"
+            launcher:x="0"
+            launcher:y="1" />
+        <favorite launcher:className="rocket.zalora.view.SplashScreen"
+            launcher:packageName="com.zalora.android"
+            launcher:container="10"
+            launcher:screen="0"
+            launcher:x="1"
+            launcher:y="1" />
+    </folder>
+    <folder launcher:container="-100"
+        launcher:screen="2"
+        launcher:x="3"
+        launcher:y="3"
+        launcher:title="@string/foldname_music">
+        <favorite launcher:className="com.foreverapps.smartfren.Activity"
+            launcher:packageName="com.foreverapps.smartfren"
+            launcher:container="27"
+            launcher:screen="0"
+            launcher:x="0"
+            launcher:y="0" />
+        <favorite launcher:className="com.melon.http.Splash"
+            launcher:packageName="com.smartfren.melon"
+            launcher:container="27"
+            launcher:screen="0"
+            launcher:x="1"
+            launcher:y="0" />
+        <favorite launcher:className="com.android.music.MusicBrowserActivity"
+            launcher:packageName="com.android.music"
+            launcher:container="27"
+            launcher:screen="0"
+            launcher:x="0"
+            launcher:y="1" />
+    </folder>
+    <favorite launcher:className="com.iguanasms.smartfrenstore.MainActivity"
+        launcher:packageName="com.iguanasms.smartfrenstore"
+        launcher:container="-100"
+        launcher:screen="2"
+        launcher:x="0"
+        launcher:y="4" />
+    <favorite launcher:className="com.linkit360.funbox.WelcomeActivity"
+        launcher:packageName="com.linkit360.funbox"
+        launcher:container="-100"
+        launcher:screen="2"
+        launcher:x="1"
+        launcher:y="4" />
+    <favorite launcher:className="com.android.vending.AssetBrowserActivity"
+        launcher:packageName="com.android.vending"
+        launcher:container="-100"
+        launcher:screen="2"
+        launcher:x="2"
+        launcher:y="4" />
+    <favorite launcher:className="com.baidu.browser.inter.SplashActivity"
+        launcher:packageName="com.baidu.browser.inter"
+        launcher:container="-100"
+        launcher:screen="2"
+        launcher:x="3"
+        launcher:y="4" />
+
+    <!-- Right screen [3] -->
+    <appwidget launcher:className="com.smartfren.widget.CustomerInfoWidget"
+        launcher:packageName="com.smartfren"
+        launcher:container="-100"
+        launcher:screen="3"
+        launcher:x="0"
+        launcher:y="0"
+        launcher:spanX="4"
+        launcher:spanY="3" />
+    <favorite launcher:className="com.bbm.ui.activities.StartupActivity"
+        launcher:packageName="com.bbm"
+        launcher:container="-100"
+        launcher:screen="3"
+        launcher:x="0"
+        launcher:y="4" />
+    <favorite launcher:className="com.caf.fmradio.FMRadio"
+        launcher:packageName="com.caf.fmradio"
+        launcher:container="-100"
+        launcher:screen="3"
+        launcher:x="1"
+        launcher:y="4" />
+    <favorite launcher:className="com.saraswati.gamesantigalau.activity.Splash"
+        launcher:packageName="com.saraswati.gamesantigalau"
+        launcher:container="-100"
+        launcher:screen="3"
+        launcher:x="2"
+        launcher:y="4" />
+    <favorite launcher:className="com.saraswati.lipstiktv.activity.Splash"
+        launcher:packageName="com.saraswati.lipstiktv"
+        launcher:container="-100"
+        launcher:screen="3"
+        launcher:x="3"
+        launcher:y="4" />
+    <!-- Far-right screen [4] -->
+
+    <!-- Hot Seat -->
+    <favorite launcher:className="com.android.dialer.DialtactsActivity"
+        launcher:packageName="com.android.dialer"
+        launcher:container="-101"
+        launcher:screen="0"
+        launcher:x="0"
+        launcher:y="0" />
+    <favorite launcher:className="com.android.mms.ui.ConversationList"
+        launcher:packageName="com.android.mms"
+        launcher:container="-101"
+        launcher:screen="1"
+        launcher:x="1"
+        launcher:y="0" />
+    <favorite launcher:className="com.android.camera.CameraActivity"
+        launcher:packageName="com.android.camera2"
+        launcher:container="-101"
+        launcher:screen="3"
+        launcher:x="3"
+        launcher:y="0" />
+    <folder launcher:container="-101"
+        launcher:screen="4"
+        launcher:x="4"
+        launcher:y="0"
+        launcher:title="@string/foldname_google">
+        <favorite launcher:className="com.google.android.apps.chrome.Main"
+            launcher:packageName="com.android.chrome"
+            launcher:container="47"
+            launcher:screen="0"
+            launcher:x="0"
+            launcher:y="0" />
+        <favorite launcher:className="com.google.android.gm.ConversationListActivityGmail"
+            launcher:packageName="com.google.android.gm"
+            launcher:container="47"
+            launcher:screen="0"
+            launcher:x="1"
+            launcher:y="0" />
+        <favorite launcher:className="com.google.android.apps.plus.phone.HomeActivity"
+            launcher:packageName="com.google.android.apps.plus"
+            launcher:container="47"
+            launcher:screen="0"
+            launcher:x="2"
+            launcher:y="0" />
+        <favorite launcher:className="com.google.android.maps.MapsActivity"
+            launcher:packageName="com.google.android.apps.maps"
+            launcher:container="47"
+            launcher:screen="0"
+            launcher:x="3"
+            launcher:y="0" />
+        <favorite
+            launcher:className="com.google.android.apps.genie.geniewidget.activities.NewsActivity"
+            launcher:packageName="com.google.android.apps.genie.geniewidget"
+            launcher:container="47"
+            launcher:screen="0"
+            launcher:x="0"
+            launcher:y="1" />
+        <favorite launcher:className="com.android.music.activitymanagement.TopLevelActivity"
+            launcher:packageName="com.google.android.music"
+            launcher:container="47"
+            launcher:screen="0"
+            launcher:x="1"
+            launcher:y="1" />
+        <favorite launcher:className="com.google.android.apps.books.app.BooksActivity"
+            launcher:packageName="com.google.android.apps.books"
+            launcher:container="47"
+            launcher:screen="0"
+            launcher:x="2"
+            launcher:y="1" />
+        <favorite
+            launcher:className="com.google.apps.dots.android.app.activity.CurrentsStartActivity"
+            launcher:packageName="com.google.android.apps.magazines"
+            launcher:container="47"
+            launcher:screen="0"
+            launcher:x="3"
+            launcher:y="1" />
+        <favorite launcher:className="com.google.android.gms.games.ui.destination.main.MainActivity"
+            launcher:packageName="com.google.android.play.games"
+            launcher:container="47"
+            launcher:screen="0"
+            launcher:x="0"
+            launcher:y="2" />
+        <favorite launcher:className="com.google.android.apps.docs.app.NewMainProxyActivity"
+            launcher:packageName="com.google.android.apps.docs"
+            launcher:container="47"
+            launcher:screen="0"
+            launcher:x="1"
+            launcher:y="2" />
+        <favorite launcher:className="com.google.android.youtube.app.honeycomb.Shell$HomeActivity"
+            launcher:packageName="com.google.android.youtube"
+            launcher:container="47"
+            launcher:screen="0"
+            launcher:x="2"
+            launcher:y="2" />
+        <favorite launcher:className="com.google.android.apps.plus.phone.ConversationListActivity"
+            launcher:packageName="com.google.android.apps.plus"
+            launcher:container="47"
+            launcher:screen="0"
+            launcher:x="3"
+            launcher:y="2" />
+        <favorite launcher:className="com.google.android.talk.SigningInActivity"
+            launcher:packageName="com.google.android.talk"
+            launcher:container="47"
+            launcher:screen="0"
+            launcher:x="0"
+            launcher:y="3" />
+    </folder>
+</favorites>
diff --git a/src/com/android/launcher3/DynamicGrid.java b/src/com/android/launcher3/DynamicGrid.java
index fe0897c8e..a01dfa1c8 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 689f54d1f..751ff7930 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();
     }
-- 
cgit v1.2.3