projects
/
pub
/
Android
/
ownCloud.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Crash in Android < 3 fixed: getSupportActionBar() instead of getActionBar()
[pub/Android/ownCloud.git]
/
src
/
com
/
owncloud
/
android
/
ui
/
activity
/
Uploader.java
diff --git
a/src/com/owncloud/android/ui/activity/Uploader.java
b/src/com/owncloud/android/ui/activity/Uploader.java
index
ebc5f37
..
cdbcb97
100644
(file)
--- a/
src/com/owncloud/android/ui/activity/Uploader.java
+++ b/
src/com/owncloud/android/ui/activity/Uploader.java
@@
-112,7
+112,7
@@
public class Uploader extends SherlockListActivity implements OnItemClickListene
super.onCreate(savedInstanceState);
mParents = new Stack<String>();
super.onCreate(savedInstanceState);
mParents = new Stack<String>();
- ActionBar actionBar = getS
herlock().ge
tActionBar();
+ ActionBar actionBar = getS
uppor
tActionBar();
actionBar.setIcon(DisplayUtils.getSeasonalIconId());
if (prepareStreamsToUpload()) {
actionBar.setIcon(DisplayUtils.getSeasonalIconId());
if (prepareStreamsToUpload()) {
@@
-332,10
+332,10
@@
public class Uploader extends SherlockListActivity implements OnItemClickListene
String current_dir = mParents.peek();
if(current_dir.equals("")){
String current_dir = mParents.peek();
if(current_dir.equals("")){
- getActionBar().setTitle(getString(R.string.default_display_name_for_root_folder));
+ get
Support
ActionBar().setTitle(getString(R.string.default_display_name_for_root_folder));
}
else{
}
else{
- getActionBar().setTitle(current_dir);
+ get
Support
ActionBar().setTitle(current_dir);
}
String full_path = generatePath(mParents);
}
String full_path = generatePath(mParents);