projects
/
pub
/
Android
/
ownCloud.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #453 from owncloud/improve_action_bar_pr_392_with_develop
[pub/Android/ownCloud.git]
/
src
/
com
/
owncloud
/
android
/
ui
/
activity
/
GenericExplanationActivity.java
diff --git
a/src/com/owncloud/android/ui/activity/GenericExplanationActivity.java
b/src/com/owncloud/android/ui/activity/GenericExplanationActivity.java
index
b971c40
..
901434e
100644
(file)
--- a/
src/com/owncloud/android/ui/activity/GenericExplanationActivity.java
+++ b/
src/com/owncloud/android/ui/activity/GenericExplanationActivity.java
@@
-30,8
+30,10
@@
import android.widget.ListAdapter;
import android.widget.ListView;
import android.widget.TextView;
import android.widget.ListView;
import android.widget.TextView;
+import com.actionbarsherlock.app.ActionBar;
import com.actionbarsherlock.app.SherlockFragmentActivity;
import com.owncloud.android.R;
import com.actionbarsherlock.app.SherlockFragmentActivity;
import com.owncloud.android.R;
+import com.owncloud.android.utils.DisplayUtils;
/**
/**
@@
-74,6
+76,9
@@
public class GenericExplanationActivity extends SherlockFragmentActivity {
} else {
listView.setVisibility(View.GONE);
}
} else {
listView.setVisibility(View.GONE);
}
+
+ ActionBar actionBar = getSupportActionBar();
+ actionBar.setIcon(DisplayUtils.getSeasonalIconId());
}
public class ExplanationListAdapterView extends ArrayAdapter<String> {
}
public class ExplanationListAdapterView extends ArrayAdapter<String> {