diff options
author | calderwoodra <calderwoodra@google.com> | 2017-08-22 17:14:49 -0700 |
---|---|---|
committer | Eric Erfanian <erfanian@google.com> | 2017-08-30 21:28:14 +0000 |
commit | e851821a851b9b97a846a1c8babca5c7e114fc88 (patch) | |
tree | 5b098f6a2586e1db0dd41a07536ca55537a1fb59 /java/com/android/incallui/incall/impl/InCallFragment.java | |
parent | cf531214d1c8a671d2097e31bb69cc8a9f54c8f6 (diff) |
Created FakeInCallActivity for making EC w/ images.
video (slow/3g): https://drive.google.com/open?id=0B2Hce9qilHmvMnZZbE90TTlNSTQ
video (average): https://drive.google.com/open?id=0B2Hce9qilHmvazZNeVJjbU5Db0k
video (cancelling): https://drive.google.com/open?id=0B2Hce9qilHmvRi1JUXQ3OHZOYXM
Future CLs or updates to this CL will include activity transition improvements
and testing.
Bug: 38189742
Test: CallComposerActivityIntegrationTest
PiperOrigin-RevId: 166137133
Change-Id: Iada3e96c83495fd9a1554b4556be968670513163
Diffstat (limited to 'java/com/android/incallui/incall/impl/InCallFragment.java')
-rw-r--r-- | java/com/android/incallui/incall/impl/InCallFragment.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/java/com/android/incallui/incall/impl/InCallFragment.java b/java/com/android/incallui/incall/impl/InCallFragment.java index 7e39ceb40..f9abf2044 100644 --- a/java/com/android/incallui/incall/impl/InCallFragment.java +++ b/java/com/android/incallui/incall/impl/InCallFragment.java @@ -241,7 +241,7 @@ public class InCallFragment extends Fragment @Override public void setPrimary(@NonNull PrimaryInfo primaryInfo) { LogUtil.i("InCallFragment.setPrimary", primaryInfo.toString()); - setAdapterMedia(primaryInfo.multimediaData); + setAdapterMedia(primaryInfo.multimediaData, primaryInfo.showInCallButtonGrid); contactGridManager.setPrimary(primaryInfo); if (primaryInfo.shouldShowLocation) { @@ -267,9 +267,10 @@ public class InCallFragment extends Fragment } } - private void setAdapterMedia(MultimediaData multimediaData) { + private void setAdapterMedia(MultimediaData multimediaData, boolean showInCallButtonGrid) { if (adapter == null) { - adapter = new InCallPagerAdapter(getChildFragmentManager(), multimediaData); + adapter = + new InCallPagerAdapter(getChildFragmentManager(), multimediaData, showInCallButtonGrid); pager.setAdapter(adapter); } else { adapter.setAttachments(multimediaData); |