Added warning icon

Some more work on settings
Configuration dialog finished
This commit is contained in:
Ziver Koc 2014-07-29 09:40:58 +02:00
parent 1aec61f810
commit ba153f5708
17 changed files with 187 additions and 77 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 954 B

View file

@ -44,7 +44,7 @@
android:layout_toEndOf="@+id/draggable"/>
<!-- Rightend Arrow -->
<!-- Rightend -->
<ProgressBar
android:id="@+id/active"
style="?android:attr/progressBarStyleSmall"
@ -55,6 +55,17 @@
android:layout_marginRight="10dp"
android:visibility="invisible" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/warning"
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
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent"

View file

@ -6,4 +6,6 @@
<!-- 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

@ -13,8 +13,6 @@
<string name="action_export">Export</string>
<string name="action_settings">Settings</string>
<string name="pref_exec_title">Execution Settings</string>
<string name="pref_simulate">Simulate</string>
<string name="pref_simulate_summ">The execution will be simulated, no actual data will be transferred.</string>
<string name="pref_other_title">Other Settings</string>
<string name="title_activity_edit">Edit</string>
<string name="action_add">Add</string>
@ -22,4 +20,11 @@
<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

@ -5,20 +5,27 @@
android:key="pref_key_storage_settings">
<CheckBoxPreference
android:key="simulation"
android:title="@string/pref_simulate"
android:summary="@string/pref_simulate_summ"
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">
<CheckBoxPreference
android:key="simulation"
android:title="@string/pref_simulate"
android:summary="@string/pref_simulate_summ"
android:defaultValue="false" />
<PreferenceScreen
android:key="about"
android:title="@string/pref_about"
android:defaultValue="false">
<intent android:targetClass="com.ericsson.uecontrol.gui.AboutActivity" />
</PreferenceScreen>
</PreferenceCategory>
</PreferenceScreen>