iamthefij/tt-rss-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

video views: disable transitions

Browse Source
This commit is contained in:
Andrew Dolgov 2015-07-12 23:11:11 +03:00
parent 8c51de35ae
commit 1c9dbba4f5
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
View File

@ -313,22 +313,22 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
@Override @Override
public void onCreateContextMenu(ContextMenu menu, View v, public void onCreateContextMenu(ContextMenu menu, View v,
ContextMenuInfo menuInfo) { ContextMenuInfo menuInfo) {
getActivity().getMenuInflater().inflate(R.menu.context_headlines, menu); getActivity().getMenuInflater().inflate(R.menu.context_headlines, menu);
if (getSelectedArticles().size() > 0) { if (getSelectedArticles().size() > 0) {
menu.setHeaderTitle(R.string.headline_context_multiple); menu.setHeaderTitle(R.string.headline_context_multiple);
menu.setGroupVisible(R.id.menu_group_single_article, false); menu.setGroupVisible(R.id.menu_group_single_article, false);
} else { } else {
AdapterContextMenuInfo info = (AdapterContextMenuInfo)menuInfo; AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;
Article article = getArticleAtPosition(info.position); Article article = getArticleAtPosition(info.position);
menu.setHeaderTitle(Html.fromHtml(article.title)); menu.setHeaderTitle(Html.fromHtml(article.title));
menu.setGroupVisible(R.id.menu_group_single_article, true); menu.setGroupVisible(R.id.menu_group_single_article, true);
} }
menu.findItem(R.id.set_labels).setEnabled(m_activity.getApiLevel() >= 1); menu.findItem(R.id.set_labels).setEnabled(m_activity.getApiLevel() >= 1);
menu.findItem(R.id.article_set_note).setEnabled(m_activity.getApiLevel() >= 1); menu.findItem(R.id.article_set_note).setEnabled(m_activity.getApiLevel() >= 1);
super.onCreateContextMenu(menu, v, menuInfo); super.onCreateContextMenu(menu, v, menuInfo);
@ -1198,7 +1198,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
holder.flavorVideoKindView.setImageResource(R.drawable.ic_play_circle); holder.flavorVideoKindView.setImageResource(R.drawable.ic_play_circle);
ViewCompat.setTransitionName(holder.flavorImageView, "TRANSITION:ARTICLE_VIDEO_PLAYER"); //ViewCompat.setTransitionName(holder.flavorImageView, "TRANSITION:ARTICLE_VIDEO_PLAYER");
holder.flavorImageView.setOnClickListener(new OnClickListener() { holder.flavorImageView.setOnClickListener(new OnClickListener() {
@Override @Override
@ -1208,12 +1208,14 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
intent.putExtra("streamUri", streamUri); intent.putExtra("streamUri", streamUri);
intent.putExtra("title", article.title); intent.putExtra("title", article.title);
ActivityOptionsCompat options = /*ActivityOptionsCompat options =
ActivityOptionsCompat.makeSceneTransitionAnimation(m_activity, ActivityOptionsCompat.makeSceneTransitionAnimation(m_activity,
holder.flavorImageView, // The view which starts the transition holder.flavorImageView, // The view which starts the transition
"TRANSITION:ARTICLE_VIDEO_PLAYER" // The transitionName of the view we’re transitioning to "TRANSITION:ARTICLE_VIDEO_PLAYER" // The transitionName of the view we’re transitioning to
); );
ActivityCompat.startActivity(m_activity, intent, options.toBundle()); ActivityCompat.startActivity(m_activity, intent, options.toBundle());*/
startActivity(intent);
} }
}); });