summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Leonard <meanderingcode@aetherislands.net>2013-01-30 23:37:33 -0700
committerSean Leonard <meanderingcode@aetherislands.net>2013-01-30 23:37:33 -0700
commitd21e8390e90437f0d053374f8e304ca3f592beb9 (patch)
tree9ee037575a28998421d991614adb599ed18d8f72
parentb6e47ac59c3e853b23d4392eec33bbeb2f068f17 (diff)
More fun with EIP item entry.
Added parts to expand listing for quick info and settings access
-rw-r--r--res/layout/eip_overview.xml33
-rwxr-xr-xres/values/strings.xml2
-rw-r--r--src/se/leap/leapclient/Dashboard.java5
3 files changed, 40 insertions, 0 deletions
diff --git a/res/layout/eip_overview.xml b/res/layout/eip_overview.xml
index d8defcbc..21d4ae38 100644
--- a/res/layout/eip_overview.xml
+++ b/res/layout/eip_overview.xml
@@ -13,6 +13,8 @@
android:layout_marginBottom="10dp"
android:layout_marginLeft="15dp"
android:layout_toLeftOf="@+id/eipSwitch"
+ android:clickable="false"
+ android:onClick="toggleOverview"
android:text="@string/eip_type_active"
android:textAppearance="?android:attr/textAppearanceLarge" />
@@ -24,4 +26,35 @@
android:layout_alignParentTop="true"
android:layout_marginRight="10dp" />
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentRight="true"
+ android:layout_below="@+id/eipType"
+ android:paddingBottom="10dp"
+ android:paddingLeft="10dp"
+ android:paddingRight="10dp"
+ android:paddingTop="10dp"
+ android:visibility="gone" >
+
+ <ImageView
+ android:id="@+id/eipSettings"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
+ android:layout_alignParentTop="true"
+ android:contentDescription="@string/eip_settings_button_description"
+ android:src="@drawable/ic_sysbar_quicksettings" />
+
+ <TextView
+ android:id="@+id/eipStatus"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_centerVertical="true"
+ android:text="@string/eip_status" />
+
+ </RelativeLayout>
+
</RelativeLayout> \ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f18c9920..09252355 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -257,6 +257,8 @@
<string name="title_activity_dashboard">LEAP Dashboard</string>
<string name="provider_label">Provider:</string>
<string name="provider_label_none">No provider configured</string>
+ <string name="eip_settings_button_description">Access EIP connection settings</string>
+ <string name="eip_status">Status unknown</string>
<string name="eip_type_active">EIP</string>
</resources> \ No newline at end of file
diff --git a/src/se/leap/leapclient/Dashboard.java b/src/se/leap/leapclient/Dashboard.java
index 5835acb8..7d0b5e0f 100644
--- a/src/se/leap/leapclient/Dashboard.java
+++ b/src/se/leap/leapclient/Dashboard.java
@@ -163,4 +163,9 @@ public class Dashboard extends Activity {
}
+ @SuppressWarnings("unused")
+ private void toggleOverview() {
+ // TODO Expand the one line overview item to show some details
+ }
+
}