[*] Updated the ActionBarSherlock library, and all the references

artiomchi · Apr 1, 2012 · 14c9ad1 · 14c9ad1
1 parent 800da9c
commit 14c9ad1
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 25 deletions.
diff --git a/DualBattery.iml b/DualBattery.iml
@@ -33,13 +33,21 @@
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="Android 3.2 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android 4.0.3 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="ActionBarSherlock" />
-    <orderEntry type="module" module-name="ActionBarSherlock-Preference" />
     <orderEntry type="module" module-name="AndroidBilling" />
     <orderEntry type="module" module-name="AChartEngine" />
     <orderEntry type="module" module-name="MixPanel" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/lib/ActionBarSherlock/library/libs/android-support-v4.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
   </component>
 </module>
 
diff --git a/DualBattery.ipr b/DualBattery.ipr
@@ -189,7 +189,6 @@
     <modules>
       <module fileurl="file://$PROJECT_DIR$/lib/AChartEngine/AChartEngine.iml" filepath="$PROJECT_DIR$/lib/AChartEngine/AChartEngine.iml" />
       <module fileurl="file://$PROJECT_DIR$/lib/ActionBarSherlock/library/ActionBarSherlock.iml" filepath="$PROJECT_DIR$/lib/ActionBarSherlock/library/ActionBarSherlock.iml" />
-      <module fileurl="file://$PROJECT_DIR$/lib/ActionBarSherlock/plugins/preference/ActionBarSherlock-Preference.iml" filepath="$PROJECT_DIR$/lib/ActionBarSherlock/plugins/preference/ActionBarSherlock-Preference.iml" />
       <module fileurl="file://$PROJECT_DIR$/lib/AndroidBilling/AndroidBillingLibrary/AndroidBilling.iml" filepath="$PROJECT_DIR$/lib/AndroidBilling/AndroidBillingLibrary/AndroidBilling.iml" />
       <module fileurl="file://$PROJECT_DIR$/DualBattery.iml" filepath="$PROJECT_DIR$/DualBattery.iml" />
       <module fileurl="file://$PROJECT_DIR$/lib/MixPanel/MixPanel.iml" filepath="$PROJECT_DIR$/lib/MixPanel/MixPanel.iml" />

diff --git a/project.properties b/project.properties
@@ -8,9 +8,8 @@
 # project structure.
 
 # Project target.
-target=android-13
+target=android-15
 android.library.reference.1=lib/ActionBarSherlock/library
-android.library.reference.2=lib/ActionBarSherlock/plugins/preference
-android.library.reference.3=lib/AndroidBilling/AndroidBillingLibrary
-android.library.reference.4=lib/AChartEngine
-android.library.reference.5=lib/MixPanel
+android.library.reference.2=lib/AndroidBilling/AndroidBillingLibrary
+android.library.reference.3=lib/AChartEngine
+android.library.reference.4=lib/MixPanel
diff --git a/src/org/flexlabs/widgets/dualbattery/widgetsettings/BatteryInfoViewManager.java b/src/org/flexlabs/widgets/dualbattery/widgetsettings/BatteryInfoViewManager.java
@@ -28,10 +28,10 @@
 import android.os.BatteryManager;
 import android.os.Build;
 import android.util.Log;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.*;
+import com.actionbarsherlock.view.MenuItem;
 import net.robotmedia.billing.BillingController;
 import net.robotmedia.billing.BillingRequest;
 import net.robotmedia.billing.helper.AbstractBillingObserver;

diff --git a/src/org/flexlabs/widgets/dualbattery/widgetsettings/WidgetActivity.java b/src/org/flexlabs/widgets/dualbattery/widgetsettings/WidgetActivity.java
@@ -16,23 +16,21 @@
 
 package org.flexlabs.widgets.dualbattery.widgetsettings;
 
-import android.app.Dialog;
 import android.appwidget.AppWidgetManager;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.res.Configuration;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.view.Menu;
-import android.support.v4.view.MenuItem;
 import android.view.View;
-import android.view.MenuInflater;
 import android.widget.Button;
-import org.flexlabs.widgets.dualbattery.Constants;
+import com.actionbarsherlock.app.SherlockFragmentActivity;
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuInflater;
+import com.actionbarsherlock.view.MenuItem;
 import org.flexlabs.widgets.dualbattery.R;
 
-public class WidgetActivity extends FragmentActivity {
+public class WidgetActivity extends SherlockFragmentActivity {
     private int appWidgetId;
     private IntentFilter intentFilter;
     private BatteryInfoViewManager batteryInfoViewManager = new BatteryInfoViewManager();
@@ -93,7 +91,7 @@ protected void onResume() {
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        MenuInflater inflater = getMenuInflater();
+        MenuInflater inflater = getSupportMenuInflater();
         inflater.inflate(R.menu.widget_batteryinfo, menu);
         inflater.inflate(R.menu.widget, menu);
         return true;

diff --git a/src/org/flexlabs/widgets/dualbattery/widgetsettings/WidgetSettingsActivity.java b/src/org/flexlabs/widgets/dualbattery/widgetsettings/WidgetSettingsActivity.java
@@ -18,7 +18,7 @@
 
 import android.appwidget.AppWidgetManager;
 import android.os.Bundle;
-import android.support.v4.app.SherlockPreferenceActivity;
+import com.actionbarsherlock.app.SherlockPreferenceActivity;
 import org.flexlabs.widgets.dualbattery.BatteryWidgetUpdater;
 import org.flexlabs.widgets.dualbattery.Constants;
 import org.flexlabs.widgets.dualbattery.R;

diff --git a/src/org/flexlabs/widgets/dualbattery/widgetsettings/WidgetTabbedActivity.java b/src/org/flexlabs/widgets/dualbattery/widgetsettings/WidgetTabbedActivity.java
@@ -16,23 +16,22 @@
 
 package org.flexlabs.widgets.dualbattery.widgetsettings;
 
-import android.app.Dialog;
 import android.appwidget.AppWidgetManager;
 import android.os.Build;
 import android.os.Bundle;
-import android.preference.PreferenceActivity;
 import android.preference.PreferenceFragment;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
+import com.actionbarsherlock.app.SherlockPreferenceActivity;
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuInflater;
+import com.actionbarsherlock.view.MenuItem;
 import org.flexlabs.widgets.dualbattery.BatteryLevel;
 import org.flexlabs.widgets.dualbattery.BatteryWidgetUpdater;
 import org.flexlabs.widgets.dualbattery.Constants;
 import org.flexlabs.widgets.dualbattery.R;
 
 import java.util.List;
 
-public class WidgetTabbedActivity extends PreferenceActivity {
+public class WidgetTabbedActivity extends SherlockPreferenceActivity {
     public int appWidgetId;
     public BatteryInfoViewManager batteryInfoViewManager = new BatteryInfoViewManager();
 
@@ -80,7 +79,7 @@ protected void onStop() {
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        MenuInflater inflater = getMenuInflater();
+        MenuInflater inflater = getSupportMenuInflater();
         inflater.inflate(R.menu.widget, menu);
         return true;
     }