Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7afd131 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix a few things with the loadtest app."

parents 4e04edf5 c6f2fa27
Loading
Loading
Loading
Loading
+6 −14
Original line number Diff line number Diff line
@@ -64,15 +64,11 @@
                android:layout_height="wrap_content"
                android:layout_width="wrap_content"
                android:text="@string/bucket_label" />
            <EditText
                android:id="@+id/bucket"
                android:inputType="number"
                android:layout_weight="1"
                android:layout_width="match_parent"
             <Spinner
                 android:id="@+id/bucket_spinner"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                android:maxLength="3"
                android:text="@integer/bucket_default"
                android:textSize="30dp"/>
                 android:prompt="@string/bucket_label"/>
        </LinearLayout>

        <LinearLayout
@@ -145,6 +141,7 @@
            android:checked="false" />

        <LinearLayout
            android:gravity="center"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:orientation="horizontal">
@@ -166,11 +163,6 @@
                android:layout_height="wrap_content"
                android:text="@string/event"
                android:checked="true"/>
        </LinearLayout>
        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:orientation="horizontal">
            <CheckBox
                android:id="@+id/include_value"
                android:layout_width="wrap_content"
+10 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>

<TextView
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:textSize="30dp"
    android:gravity="left"
    android:padding="5dip"
    />
+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@
*/
-->
<resources>
    <integer name="bucket_default">10</integer>
    <integer name="burst_default">1</integer>
    <integer name="period_default">2</integer>
    <integer name="replication_default">1</integer>
+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@
    <string name="app_name">Statsd Loadtest</string>
    <string name="bucket_label">bucket size (mins):&#160;</string>
    <string name="burst_label">burst:&#160;</string>
    <string name="bucket_default">FIVE_MINUTES</string>
    <string name="placebo">placebo</string>
    <string name="period_label">logging period (secs):&#160;</string>
    <string name="replication_label">metric replication:&#160;</string>
Loading