Commiting stuff the IDE did not

This commit is contained in:
Ziver Koc 2014-07-31 15:01:44 +02:00
parent 73a3de5eb8
commit ff7138bf9d
52 changed files with 3887 additions and 3887 deletions

View file

@ -1,16 +1,16 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="com.ericsson.uecontrol.gui.EditActivity">
<!--<com.ericsson.uecontrol.gui.util.TouchInterceptor
android:id="@android:id/list"
android:layout_width="match_parent"
android:layout_height="match_parent" /> -->
<com.ericsson.uecontrol.gui.util.DynamicListView
android:id="@android:id/list"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</RelativeLayout>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="com.ericsson.uecontrol.gui.EditActivity">
<!--<com.ericsson.uecontrol.gui.util.TouchInterceptor
android:id="@android:id/list"
android:layout_width="match_parent"
android:layout_height="match_parent" /> -->
<com.ericsson.uecontrol.gui.util.DynamicListView
android:id="@android:id/list"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</RelativeLayout>

View file

@ -1,45 +1,45 @@
<!-- A DrawerLayout is intended to be used as the top-level content view using match_parent for both width and height to consume the full space available. -->
<android.support.v4.widget.DrawerLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".MainActivity">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<fragment android:id="@+id/status_fragment"
android:layout_width="match_parent"
android:layout_height="150dp"
android:name="com.ericsson.uecontrol.gui.fragments.StatusFragment"
tools:layout="@layout/fragment_status" />
<!-- As the main content view, the view below consumes the entire
space available using match_parent in both dimensions. -->
<FrameLayout
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>
<!-- android:layout_gravity="start" tells DrawerLayout to treat
this as a sliding drawer on the left side for left-to-right
languages and on the right side for right-to-left languages.
If you're not building against API 17 or higher, use
android:layout_gravity="left" instead. -->
<!-- The drawer is given a fixed width in dp and extends the full height of
the container. -->
<!--
<fragment android:id="@+id/navigation_drawer"
android:layout_width="@dimen/navigation_drawer_width"
android:layout_height="match_parent"
android:layout_gravity="start"
android:name="com.ericsson.uecontrol.gui.fragments.NavigationDrawerFragment"
tools:layout="@layout/fragment_navigation_drawer" />
-->
</android.support.v4.widget.DrawerLayout>
<!-- A DrawerLayout is intended to be used as the top-level content view using match_parent for both width and height to consume the full space available. -->
<android.support.v4.widget.DrawerLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".MainActivity">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<fragment android:id="@+id/status_fragment"
android:layout_width="match_parent"
android:layout_height="150dp"
android:name="com.ericsson.uecontrol.gui.fragments.StatusFragment"
tools:layout="@layout/fragment_status" />
<!-- As the main content view, the view below consumes the entire
space available using match_parent in both dimensions. -->
<FrameLayout
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>
<!-- android:layout_gravity="start" tells DrawerLayout to treat
this as a sliding drawer on the left side for left-to-right
languages and on the right side for right-to-left languages.
If you're not building against API 17 or higher, use
android:layout_gravity="left" instead. -->
<!-- The drawer is given a fixed width in dp and extends the full height of
the container. -->
<!--
<fragment android:id="@+id/navigation_drawer"
android:layout_width="@dimen/navigation_drawer_width"
android:layout_height="match_parent"
android:layout_gravity="start"
android:name="com.ericsson.uecontrol.gui.fragments.NavigationDrawerFragment"
tools:layout="@layout/fragment_navigation_drawer" />
-->
</android.support.v4.widget.DrawerLayout>

View file

@ -1,77 +1,77 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingLeft="5dp"
android:paddingTop="5dp"
android:paddingRight="5dp">
<ImageView
android:id="@+id/draggable"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:src="@drawable/draggable"
android:layout_marginRight="5dp"
android:layout_centerVertical="true"
android:visibility="gone" />
<!-- Behaviour name-->
<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Title"
android:textColor="#040404"
android:typeface="sans"
android:textSize="17dip"
android:textStyle="bold"
android:layout_alignParentTop="true"
android:layout_toRightOf="@+id/draggable" />
<!-- Behaviour description -->
<TextView
android:id="@+id/description"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:textColor="#343434"
android:textSize="12dip"
android:text="Description"
android:layout_below="@+id/title"
android:layout_toRightOf="@+id/draggable" />
<!-- Rightend -->
<ProgressBar
android:id="@+id/active"
style="?android:attr/progressBarStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="10dp"
android:visibility="invisible" />
<ImageView
android:id="@+id/warning"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:src="@drawable/warning"
android:layout_marginRight="5dp"
android:layout_centerVertical="true"
android:visibility="invisible"
android:layout_toLeftOf="@+id/active" />
<ProgressBar
android:id="@+id/progress"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/description"
android:visibility="invisible" />
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingLeft="5dp"
android:paddingTop="5dp"
android:paddingRight="5dp">
<ImageView
android:id="@+id/draggable"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:src="@drawable/draggable"
android:layout_marginRight="5dp"
android:layout_centerVertical="true"
android:visibility="gone" />
<!-- Behaviour name-->
<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Title"
android:textColor="#040404"
android:typeface="sans"
android:textSize="17dip"
android:textStyle="bold"
android:layout_alignParentTop="true"
android:layout_toRightOf="@+id/draggable" />
<!-- Behaviour description -->
<TextView
android:id="@+id/description"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:textColor="#343434"
android:textSize="12dip"
android:text="Description"
android:layout_below="@+id/title"
android:layout_toRightOf="@+id/draggable" />
<!-- Rightend -->
<ProgressBar
android:id="@+id/active"
style="?android:attr/progressBarStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="10dp"
android:visibility="invisible" />
<ImageView
android:id="@+id/warning"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:src="@drawable/warning"
android:layout_marginRight="5dp"
android:layout_centerVertical="true"
android:visibility="invisible"
android:layout_toLeftOf="@+id/active" />
<ProgressBar
android:id="@+id/progress"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/description"
android:visibility="invisible" />
</RelativeLayout>

View file

@ -1,9 +1,9 @@
<ListView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:choiceMode="singleChoice"
android:divider="@android:color/transparent"
android:dividerHeight="0dp"
android:background="#cccc"
tools:context=".NavigationDrawerFragment" />
<ListView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:choiceMode="singleChoice"
android:divider="@android:color/transparent"
android:dividerHeight="0dp"
android:background="#cccc"
tools:context=".NavigationDrawerFragment" />

View file

@ -1,66 +1,66 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/background_dark">
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:weightSum="1"
android:paddingLeft="10dp"
android:paddingTop="10dp"
android:paddingRight="10dp">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/imageView2"
android:src="@android:drawable/stat_sys_download" />
<TextView
android:layout_width="160dp"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="0 Mbits"
android:id="@+id/down_speed"
android:textColor="#ffffffff"
android:typeface="sans"
android:layout_weight="0" />
<Space
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0.08" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/imageView3"
android:src="@android:drawable/stat_sys_upload" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="0 Mbits"
android:id="@+id/up_speed"
android:textColor="#ffffffff"
android:typeface="sans"
android:layout_weight="0.45" />
</LinearLayout>
<LinearLayout
android:id="@+id/graph"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal" >
</LinearLayout>
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/background_dark">
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:weightSum="1"
android:paddingLeft="10dp"
android:paddingTop="10dp"
android:paddingRight="10dp">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/imageView2"
android:src="@android:drawable/stat_sys_download" />
<TextView
android:layout_width="160dp"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="0 Mbits"
android:id="@+id/down_speed"
android:textColor="#ffffffff"
android:typeface="sans"
android:layout_weight="0" />
<Space
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0.08" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/imageView3"
android:src="@android:drawable/stat_sys_upload" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="0 Mbits"
android:id="@+id/up_speed"
android:textColor="#ffffffff"
android:typeface="sans"
android:layout_weight="0.45" />
</LinearLayout>
<LinearLayout
android:id="@+id/graph"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal" >
</LinearLayout>
</LinearLayout>

View file

@ -1,9 +1,9 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
tools:context="com.ericsson.uecontrol.gui.EditActivity" >
<item android:id="@+id/action_add"
android:title="@string/action_add"
android:showAsAction="withText|ifRoom" />
</menu>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
tools:context="com.ericsson.uecontrol.gui.EditActivity" >
<item android:id="@+id/action_add"
android:title="@string/action_add"
android:showAsAction="withText|ifRoom" />
</menu>

View file

@ -1,6 +1,6 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/action_settings"
android:title="@string/action_settings"
android:orderInCategory="100"
android:showAsAction="never" />
</menu>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/action_settings"
android:title="@string/action_settings"
android:orderInCategory="100"
android:showAsAction="never" />
</menu>

View file

@ -1,25 +1,25 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
tools:context=".MainActivity" >
<item android:id="@+id/action_execute"
android:title="@string/action_run"
android:showAsAction="withText|ifRoom" />
<item android:id="@+id/action_edit"
android:title="@string/action_edit"
android:orderInCategory="50"
android:showAsAction="never" />
<item android:id="@+id/action_import"
android:title="@string/action_import"
android:orderInCategory="100"
android:showAsAction="never" />
<item android:id="@+id/action_export"
android:title="@string/action_export"
android:orderInCategory="100"
android:showAsAction="never" />
<item android:id="@+id/action_settings"
android:title="@string/action_settings"
android:orderInCategory="100"
android:showAsAction="never" />
</menu>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
tools:context=".MainActivity" >
<item android:id="@+id/action_execute"
android:title="@string/action_run"
android:showAsAction="withText|ifRoom" />
<item android:id="@+id/action_edit"
android:title="@string/action_edit"
android:orderInCategory="50"
android:showAsAction="never" />
<item android:id="@+id/action_import"
android:title="@string/action_import"
android:orderInCategory="100"
android:showAsAction="never" />
<item android:id="@+id/action_export"
android:title="@string/action_export"
android:orderInCategory="100"
android:showAsAction="never" />
<item android:id="@+id/action_settings"
android:title="@string/action_settings"
android:orderInCategory="100"
android:showAsAction="never" />
</menu>

View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string-array name="behaviours" >
<item>com.ericsson.uecontrol.core.behaviour.UeBehaviourFtp</item>
<item>com.ericsson.uecontrol.core.behaviour.UeBehaviourSleep</item>
<item>com.ericsson.uecontrol.core.behaviour.UeBehaviourSurfing</item>
</string-array>
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string-array name="behaviours" >
<item>com.ericsson.uecontrol.core.behaviour.UeBehaviourFtp</item>
<item>com.ericsson.uecontrol.core.behaviour.UeBehaviourSleep</item>
<item>com.ericsson.uecontrol.core.behaviour.UeBehaviourSurfing</item>
</string-array>
</resources>

View file

@ -1,11 +1,11 @@
<resources>
<!-- Default screen margins, per the Android Design guidelines. -->
<dimen name="activity_horizontal_margin">16dp</dimen>
<dimen name="activity_vertical_margin">16dp</dimen>
<!-- Per the design guidelines, navigation drawers should be between 240dp and 320dp:
https://developer.android.com/design/patterns/navigation-drawer.html -->
<dimen name="navigation_drawer_width">240dp</dimen>
<dimen name="standard_padding">10dp</dimen>
</resources>
<resources>
<!-- Default screen margins, per the Android Design guidelines. -->
<dimen name="activity_horizontal_margin">16dp</dimen>
<dimen name="activity_vertical_margin">16dp</dimen>
<!-- Per the design guidelines, navigation drawers should be between 240dp and 320dp:
https://developer.android.com/design/patterns/navigation-drawer.html -->
<dimen name="navigation_drawer_width">240dp</dimen>
<dimen name="standard_padding">10dp</dimen>
</resources>

View file

@ -1,12 +1,12 @@
<resources>
<!--
Layout alias to replace the single-pane version of the layout with a
two-pane version on Large screens.
For more on layout aliases, see:
http://developer.android.com/training/multiscreen/screensizes.html#TaskUseAliasFilters
-->
<item name="fragment_item" type="layout">@layout/fragment_list</item>
<resources>
<!--
Layout alias to replace the single-pane version of the layout with a
two-pane version on Large screens.
For more on layout aliases, see:
http://developer.android.com/training/multiscreen/screensizes.html#TaskUseAliasFilters
-->
<item name="fragment_item" type="layout">@layout/fragment_list</item>
</resources>

View file

@ -1,30 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">UeControl</string>
<string name="title_section1">Section 1</string>
<string name="title_section2">Section 2</string>
<string name="title_section3">Section 3</string>
<string name="navigation_drawer_open">Open navigation drawer</string>
<string name="navigation_drawer_close">Close navigation drawer</string>
<string name="action_run">Run</string>
<string name="action_stop">Stop</string>
<string name="action_edit">Edit</string>
<string name="action_import">Import</string>
<string name="action_export">Export</string>
<string name="action_settings">Settings</string>
<string name="pref_exec_title">Execution Settings</string>
<string name="pref_other_title">Other Settings</string>
<string name="title_activity_edit">Edit</string>
<string name="action_add">Add</string>
<string name="select_behaviour">Select Behaviour</string>
<string name="configure_behaviour">Configure Behaviour</string>
<string name="action_save">Save</string>
<string name="action_cancel">Cancel</string>
<string name="pref_about">About</string>
<string name="pref_logging">Logging</string>
<string name="pref_logging_summ">Enable logging of throughput and other attributes to a csv file</string>
<string name="pref_logging_path">Log Path</string>
<string name="pref_logging_path_summ">Folder where log file will be stored</string>
<string name="title_activity_about">About</string>
</resources>
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">UeControl</string>
<string name="title_section1">Section 1</string>
<string name="title_section2">Section 2</string>
<string name="title_section3">Section 3</string>
<string name="navigation_drawer_open">Open navigation drawer</string>
<string name="navigation_drawer_close">Close navigation drawer</string>
<string name="action_run">Run</string>
<string name="action_stop">Stop</string>
<string name="action_edit">Edit</string>
<string name="action_import">Import</string>
<string name="action_export">Export</string>
<string name="action_settings">Settings</string>
<string name="pref_exec_title">Execution Settings</string>
<string name="pref_other_title">Other Settings</string>
<string name="title_activity_edit">Edit</string>
<string name="action_add">Add</string>
<string name="select_behaviour">Select Behaviour</string>
<string name="configure_behaviour">Configure Behaviour</string>
<string name="action_save">Save</string>
<string name="action_cancel">Cancel</string>
<string name="pref_about">About</string>
<string name="pref_logging">Logging</string>
<string name="pref_logging_summ">Enable logging of throughput and other attributes to a csv file</string>
<string name="pref_logging_path">Log Path</string>
<string name="pref_logging_path_summ">Folder where log file will be stored</string>
<string name="title_activity_about">About</string>
</resources>

View file

@ -1,8 +1,8 @@
<resources>
<!-- Base application theme. -->
<style name="AppTheme" parent="android:Theme.Holo.Light.DarkActionBar">
<!-- Customize your theme here. -->
</style>
</resources>
<resources>
<!-- Base application theme. -->
<style name="AppTheme" parent="android:Theme.Holo.Light.DarkActionBar">
<!-- Customize your theme here. -->
</style>
</resources>

View file

@ -1,30 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceCategory
android:title="@string/pref_exec_title"
android:key="pref_key_storage_settings">
<CheckBoxPreference
android:key="logging"
android:title="@string/pref_logging"
android:summary="@string/pref_logging_summ"
android:defaultValue="false" />
<EditTextPreference
android:key="logging_path"
android:title="@string/pref_logging_path"
android:summary="@string/pref_logging_path_summ"
android:defaultValue="/sdcard/uecontrol/" />
</PreferenceCategory>
<PreferenceCategory
android:title="@string/pref_other_title"
android:key="pref_key_storage_settings">
<Preference
android:key="about"
android:title="@string/pref_about"
android:defaultValue="false">
</Preference>
</PreferenceCategory>
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceCategory
android:title="@string/pref_exec_title"
android:key="pref_key_storage_settings">
<CheckBoxPreference
android:key="logging"
android:title="@string/pref_logging"
android:summary="@string/pref_logging_summ"
android:defaultValue="false" />
<EditTextPreference
android:key="logging_path"
android:title="@string/pref_logging_path"
android:summary="@string/pref_logging_path_summ"
android:defaultValue="/sdcard/uecontrol/" />
</PreferenceCategory>
<PreferenceCategory
android:title="@string/pref_other_title"
android:key="pref_key_storage_settings">
<Preference
android:key="about"
android:title="@string/pref_about"
android:defaultValue="false">
</Preference>
</PreferenceCategory>
</PreferenceScreen>