Merge "Launcher: Fix default auto-rotation preference" into ics

2 files changed, 3 insertions, 4 deletions

diff --git a/src/com/cyanogenmod/trebuchet/Launcher.java b/src/com/cyanogenmod/trebuchet/Launcher.java
index c46f2e869..1206ec1c7 100644
--- a/src/com/cyanogenmod/trebuchet/Launcher.java
+++ b/src/com/cyanogenmod/trebuchet/Launcher.java
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (C) 2008 The Android Open Source Project
  *
@@ -298,7 +297,7 @@ public final class Launcher extends Activity
         // Preferences
         mShowSearchBar = PreferencesProvider.Interface.Homescreen.getShowSearchBar(this);
         mShowDockDivider = PreferencesProvider.Interface.Homescreen.Indicator.getShowDockDivider(this);
-        mAutoRotate = PreferencesProvider.Interface.General.getAutoRotate(this);
+        mAutoRotate = PreferencesProvider.Interface.General.getAutoRotate(this, getResources().getBoolean(R.bool.config_defaultAutoRotate));
 
         if (PROFILE_STARTUP) {
             android.os.Debug.startMethodTracing(
diff --git a/src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java b/src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java
index 811b1dc89..e8d62ec67 100644
--- a/src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java
+++ b/src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java
@@ -101,9 +101,9 @@ public final class PreferencesProvider {
         }
 
         public static class General {
-            public static boolean getAutoRotate(Context context) {
+            public static boolean getAutoRotate(Context context, boolean def) {
                 final SharedPreferences preferences = context.getSharedPreferences(PREFERENCES_KEY, 0);
-                return preferences.getBoolean("ui_general_orientation", false);
+                return preferences.getBoolean("ui_general_orientation", def);
             }
         }
     }