|
@@ -40,6 +40,7 @@ import android.view.View;
|
|
import android.view.View.OnClickListener;
|
|
import android.view.View.OnClickListener;
|
|
import android.view.Window;
|
|
import android.view.Window;
|
|
import android.widget.Button;
|
|
import android.widget.Button;
|
|
|
|
+import android.widget.ProgressBar;
|
|
import android.widget.Toast;
|
|
import android.widget.Toast;
|
|
|
|
|
|
import com.owncloud.android.R;
|
|
import com.owncloud.android.R;
|
|
@@ -80,12 +81,12 @@ public class FolderPickerActivity extends FileActivity implements FileFragment.C
|
|
|
|
|
|
protected Button mCancelBtn;
|
|
protected Button mCancelBtn;
|
|
protected Button mChooseBtn;
|
|
protected Button mChooseBtn;
|
|
|
|
+ private ProgressBar mProgressBar;
|
|
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
protected void onCreate(Bundle savedInstanceState) {
|
|
protected void onCreate(Bundle savedInstanceState) {
|
|
Log_OC.d(TAG, "onCreate() start");
|
|
Log_OC.d(TAG, "onCreate() start");
|
|
- requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
|
|
|
|
|
|
|
|
super.onCreate(savedInstanceState);
|
|
super.onCreate(savedInstanceState);
|
|
|
|
|
|
@@ -102,14 +103,18 @@ public class FolderPickerActivity extends FileActivity implements FileFragment.C
|
|
ActionBar actionBar = getSupportActionBar();
|
|
ActionBar actionBar = getSupportActionBar();
|
|
actionBar.setDisplayShowTitleEnabled(true);
|
|
actionBar.setDisplayShowTitleEnabled(true);
|
|
actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
|
|
actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
|
|
- setSupportProgressBarIndeterminateVisibility(mSyncInProgress);
|
|
|
|
- // always AFTER setContentView(...) ; to work around bug in its implementation
|
|
|
|
|
|
+
|
|
|
|
+ mProgressBar = (ProgressBar) findViewById(R.id.progressBar);
|
|
|
|
+ mProgressBar.setIndeterminateDrawable(
|
|
|
|
+ getResources().getDrawable(
|
|
|
|
+ R.drawable.actionbar_progress_indeterminate_horizontal));
|
|
|
|
+ mProgressBar.setIndeterminate(mSyncInProgress);
|
|
|
|
+ // always AFTER setContentView(...) ; to work around bug in its implementation
|
|
|
|
|
|
// sets message for empty list of folders
|
|
// sets message for empty list of folders
|
|
setBackgroundText();
|
|
setBackgroundText();
|
|
|
|
|
|
Log_OC.d(TAG, "onCreate() end");
|
|
Log_OC.d(TAG, "onCreate() end");
|
|
-
|
|
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -215,8 +220,8 @@ public class FolderPickerActivity extends FileActivity implements FileFragment.C
|
|
getApplicationContext()
|
|
getApplicationContext()
|
|
);
|
|
);
|
|
synchFolderOp.execute(getAccount(), this, null, null);
|
|
synchFolderOp.execute(getAccount(), this, null, null);
|
|
-
|
|
|
|
- setSupportProgressBarIndeterminateVisibility(true);
|
|
|
|
|
|
+
|
|
|
|
+ mProgressBar.setIndeterminate(true);
|
|
|
|
|
|
setBackgroundText();
|
|
setBackgroundText();
|
|
}
|
|
}
|
|
@@ -520,10 +525,10 @@ public class FolderPickerActivity extends FileActivity implements FileFragment.C
|
|
}
|
|
}
|
|
removeStickyBroadcast(intent);
|
|
removeStickyBroadcast(intent);
|
|
Log_OC.d(TAG, "Setting progress visibility to " + mSyncInProgress);
|
|
Log_OC.d(TAG, "Setting progress visibility to " + mSyncInProgress);
|
|
- setSupportProgressBarIndeterminateVisibility(mSyncInProgress /*|| mRefreshSharesInProgress*/);
|
|
|
|
|
|
+
|
|
|
|
+ mProgressBar.setIndeterminate(mSyncInProgress);
|
|
|
|
|
|
setBackgroundText();
|
|
setBackgroundText();
|
|
-
|
|
|
|
}
|
|
}
|
|
|
|
|
|
} catch (RuntimeException e) {
|
|
} catch (RuntimeException e) {
|