diff options
author | Chih-hung Hsieh <chh@google.com> | 2015-12-01 17:07:48 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2015-12-01 17:07:48 +0000 |
commit | a4acd9d6bc9b3b033d7d274316e75ee067df8d20 (patch) | |
tree | 672a185b294789cf991f385c3e395dd63bea9063 /webrtc/examples/android/media_demo/res/layout/mainmenu.xml | |
parent | 3681b90ba4fe7a27232dd3e27897d5d7ed9d651c (diff) | |
parent | fe8b4a657979b49e1701bd92f6d5814a99e0b2be (diff) | |
download | webrtc-a4acd9d6bc9b3b033d7d274316e75ee067df8d20.tar.gz |
Merge changes I7bbf776e,I1b827825
am: fe8b4a6579
* commit 'fe8b4a657979b49e1701bd92f6d5814a99e0b2be': (7237 commits)
WIP: Changes after merge commit 'cb3f9bd'
Make the nonlinear beamformer steerable
Utilize bitrate above codec max to protect video.
Enable VP9 internal resize by default.
Filter overlapping RTP header extensions.
Make VCMEncodedFrameCallback const.
MediaCodecVideoEncoder: Add number of quality resolution downscales to Encoded callback.
Remove redudant encoder rate calls.
Create isolate files for nonparallel tests.
Register header extensions in RtpRtcpObserver to avoid log spam.
Make an enum class out of NetEqDecoder, and hide the neteq_decoders_ table
ACM: Move NACK functionality inside NetEq
Fix chromium-style warnings in webrtc/sound/.
Create a 'webrtc_nonparallel_tests' target.
Update scalability structure data according to updates in the RTP payload profile.
audio_coding: rename interface -> include
Rewrote perform_action_on_all_files to be parallell.
Update reference indices according to updates in the RTP payload profile.
Disable P2PTransport...TestFailoverControlledSide on Memcheck
pass clangcl compile options to ignore warnings in gflags.cc
...
Diffstat (limited to 'webrtc/examples/android/media_demo/res/layout/mainmenu.xml')
-rw-r--r-- | webrtc/examples/android/media_demo/res/layout/mainmenu.xml | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/webrtc/examples/android/media_demo/res/layout/mainmenu.xml b/webrtc/examples/android/media_demo/res/layout/mainmenu.xml new file mode 100644 index 0000000000..89f5399df7 --- /dev/null +++ b/webrtc/examples/android/media_demo/res/layout/mainmenu.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="horizontal" + android:layout_width="fill_parent" + android:layout_height="fill_parent"> + <LinearLayout + android:orientation="vertical" + android:layout_width="120dip" + android:layout_height="fill_parent"> + <TextView android:id="@+id/tvStats" + android:layout_width="fill_parent" + android:layout_height="60dip" + android:textSize="6sp" + android:text=""/> + <Button android:id="@+id/btStats" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_gravity="bottom" + android:text="@string/stats"/> + <Button android:id="@+id/btStartStopCall" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_gravity="bottom"/> + </LinearLayout> +</LinearLayout>
\ No newline at end of file |