Skip to content

Commit 7bb10cc

Browse files
committed
Hide the progress spinner properly on pre honeycomb devices
1 parent 726d2ef commit 7bb10cc

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

src/com/noshufou/android/su/HomeActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ protected void onCreate(Bundle savedInstanceState) {
5353

5454
requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
5555
setContentView(R.layout.activity_home);
56-
setProgressBarIndeterminateVisibility(false);
56+
setSupportProgressBarIndeterminateVisibility(false);
5757
Log.d(TAG, "after setContentView()");
5858

5959
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
@@ -102,7 +102,7 @@ protected void onCreate(Bundle savedInstanceState) {
102102
public boolean onCreateOptionsMenu(Menu menu) {
103103
mElite = Util.elitePresent(this, false, 0);
104104
menu.add(Menu.NONE, MenuId.ELITE,
105-
MenuId.ELITE, mElite?R.string.menu_extras:R.string.pref_get_elite_title)
105+
MenuId.ELITE, mElite?R.string.menu_extras:R.string.menu_get_elite)
106106
.setIcon(R.drawable.ic_action_extras)
107107
.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
108108

src/com/noshufou/android/su/InfoFragment.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import android.net.Uri;
1212
import android.os.AsyncTask;
1313
import android.os.Bundle;
14-
import android.os.Handler;
1514
import android.preference.PreferenceManager;
1615
import android.util.Log;
1716
import android.view.LayoutInflater;
@@ -126,7 +125,7 @@ private class UpdateInfo extends AsyncTask<Void, Object, Void> {
126125

127126
@Override
128127
protected void onPreExecute() {
129-
getSherlockActivity().setProgressBarIndeterminateVisibility(true);
128+
getSherlockActivity().setSupportProgressBarIndeterminateVisibility(true);
130129
}
131130

132131
@Override
@@ -228,7 +227,7 @@ protected void onProgressUpdate(Object... values) {
228227

229228
@Override
230229
protected void onPostExecute(Void result) {
231-
getSherlockActivity().setProgressBarIndeterminateVisibility(false);
230+
getSherlockActivity().setSupportProgressBarIndeterminateVisibility(false);
232231
}
233232
}
234233

@@ -241,7 +240,7 @@ public ToggleSuOption(String key) {
241240

242241
@Override
243242
protected void onPreExecute() {
244-
getSherlockActivity().setProgressBarIndeterminateVisibility(true);
243+
getSherlockActivity().setSupportProgressBarIndeterminateVisibility(true);
245244
mTempUnroot.setEnabled(false);
246245
mOtaSurvival.setEnabled(false);
247246
}
@@ -265,7 +264,7 @@ protected Boolean doInBackground(Void... params) {
265264

266265
@Override
267266
protected void onPostExecute(Boolean result) {
268-
getSherlockActivity().setProgressBarIndeterminateVisibility(false);
267+
getSherlockActivity().setSupportProgressBarIndeterminateVisibility(false);
269268
new UpdateInfo().execute();
270269
}
271270
}

src/com/noshufou/android/su/UpdaterFragment.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
import android.content.ServiceConnection;
77
import android.os.Bundle;
88
import android.os.IBinder;
9-
import android.support.v4.app.ListFragment;
109
import android.view.LayoutInflater;
1110
import android.view.View;
1211
import android.view.ViewGroup;
1312
import android.widget.Button;
1413

14+
import com.actionbarsherlock.app.SherlockListFragment;
1515
import com.noshufou.android.su.service.UpdaterService;
1616
import com.noshufou.android.su.service.UpdaterService.Step;
1717
import com.noshufou.android.su.service.UpdaterService.UpdaterBinder;
1818
import com.noshufou.android.su.widget.ConsoleAdapter;
1919

20-
public class UpdaterFragment extends ListFragment
20+
public class UpdaterFragment extends SherlockListFragment
2121
implements UpdaterService.UpdaterListener, View.OnClickListener {
2222
private static final String TAG = "UpdaterFragment";
2323

@@ -64,7 +64,7 @@ public void onActivityCreated(Bundle savedInstanceState) {
6464
getActivity().bindService(intent, mConnection, Context.BIND_AUTO_CREATE);
6565
}
6666

67-
getActivity().getActionBar().setTitle(R.string.updater_title);
67+
getSherlockActivity().getSupportActionBar().setTitle(R.string.updater_title);
6868
}
6969

7070
@Override

0 commit comments

Comments
 (0)