generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adding setting screen to AppRTCDemo.

Browse Source 
- Move server URL from connection screen
to the setting screen.
- Add setting for local video resolution.
- Auto save last entered room number.
- Use full screen mode in video renderer and fix
texture offsets recalculation when rendering type is
dynamically changed.

BUG=3935,3953
R=kjellander@webrtc.org, pbos@webrtc.org, pthatcher@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/30769004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7534 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
glaznev@webrtc.org
2014-10-27 17:22:15 +00:00
parent 068b529f46
commit 243eb8e9af
12 changed files with 297 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
talk/examples/android/res/layout/activity_connect.xml
View File

@@ -10,19 +10,7 @@
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/apprtc_url"/>
<EditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/url_edittext"
android:inputType="textWebEmailAddress"
android:text="https://apprtc.appspot.com"
android:imeOptions="actionNext"/>
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_marginTop="15dp"
android:lines="1"
android:maxLines="1"
android:textAppearance="?android:attr/textAppearanceMedium"
@@ -37,7 +25,7 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_margin="5dp"
android:layout_margin="15dp"
android:text="@string/room_description"/>
<CheckBox
android:id="@+id/check_loopback"

8
talk/examples/android/res/menu/connect_menu.xml Normal file
View File

@@ -0,0 +1,8 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:id="@+id/action_settings"
android:orderInCategory="100"
android:icon="@android:drawable/ic_menu_preferences"
android:showAsAction="ifRoom"
android:title="@string/action_settings"/>
</menu>

15
talk/examples/android/res/values/arrays.xml Normal file
View File

@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string-array name="videoResolutions">
<item>Default</item>
<item>HD (1280 x 720)</item>
<item>VGA (640 x 480)</item>
<item>QVGA (320 x 240)</item>
</string-array>
<string-array name="videoResolutionsValues">
<item>Default</item>
<item>1280 x 720</item>
<item>640 x 480</item>
<item>320 x 240</item>
</string-array>
</resources>

18
talk/examples/android/res/values/strings.xml
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name" translatable="no">AppRTC</string>
<string name="settings_name" translatable="no">AppRTC Settings</string>
<string name="disconnect_call">Disconnect Call</string>
<string name="apprtc_url">URL:</string>
<string name="room_name">Room name:</string>
<string name="room_description">
Please enter a room name. Room names are shared with everyone, so think
@@ -16,4 +16,20 @@
<string name="connecting_to">Connecting to: %1$s</string>
<string name="missing_url">FATAL ERROR: Missing URL to connect to.</string>
<string name="ok">OK</string>
<string name="action_settings">Settings</string>
<!-- Settings strings. -->
<string name="pref_room_key">room_preference</string>
<string name="pref_url_key">url_preference</string>
<string name="pref_url_title">Connection URL:</string>
<string name="pref_url_summary">AppRTC connection server URL.</string>
<string name="pref_url_dlg">Enter AppRTC connection server URL.</string>
<string name="pref_url_default">https://apprtc.appspot.com</string>
<string name="pref_resolution_key">resolution_preference</string>
<string name="pref_resolution_title">Video resolution.</string>
<string name="pref_resolution_summary">Video resolution.</string>
<string name="pref_resolution_dlg">Enter AppRTC local video resolution.</string>
<string name="pref_resolution_default">Default</string>
</resources>

18
talk/examples/android/res/xml/preferences.xml Normal file
View File

@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<EditTextPreference
android:key="@string/pref_url_key"
android:title="@string/pref_url_title"
android:summary="@string/pref_url_summary"
android:defaultValue="@string/pref_url_default"
android:inputType="textWebEmailAddress"
android:dialogTitle="@string/pref_url_dlg" />
<ListPreference
android:key="@string/pref_resolution_key"
android:title="@string/pref_resolution_title"
android:summary="@string/pref_resolution_summary"
android:defaultValue="@string/pref_resolution_default"
android:dialogTitle="@string/pref_resolution_dlg"
android:entries="@array/videoResolutions"
android:entryValues="@array/videoResolutionsValues" />
</PreferenceScreen>