diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2012-05-30 07:52:09 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2012-05-30 07:52:09 +0200 |
| commit | d4ec992933decf68e5148317ebd04a8f10566a1e (patch) | |
| tree | 8a0beb4f230953d1df424ec256233fdb0f2be7f8 /main/res/layout | |
| parent | c70465825b4a96a2488b60f178ef14fbb2f42cc1 (diff) | |
| parent | 67da8b62ff0f414eb5dbde10fddb78a9ae4c208e (diff) | |
| download | cgeo-d4ec992933decf68e5148317ebd04a8f10566a1e.zip cgeo-d4ec992933decf68e5148317ebd04a8f10566a1e.tar.gz cgeo-d4ec992933decf68e5148317ebd04a8f10566a1e.tar.bz2 | |
Merge branch 'version-updater' into upstream
Diffstat (limited to 'main/res/layout')
| -rw-r--r-- | main/res/layout/main.xml | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/main/res/layout/main.xml b/main/res/layout/main.xml index 2f0b1d8..eedcc8a 100644 --- a/main/res/layout/main.xml +++ b/main/res/layout/main.xml @@ -17,6 +17,32 @@ android:src="@drawable/actionbar_manual" android:onClick="goManual" /> </LinearLayout> + <RelativeLayout android:id="@+id/status" + android:visibility="gone" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_alignParentTop="true" + android:layout_marginLeft="16dip" + android:layout_marginRight="16dip" + android:layout_marginTop="60dip" + android:background="@drawable/helper_bcg" > + <ImageView android:id="@+id/status_icon" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_centerVertical="true" + android:layout_margin="4dip" /> + <TextView android:id="@+id/status_message" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_toRightOf="@id/status_icon" + android:layout_centerVertical="true" + android:gravity="center" + android:padding="4dip" + android:textSize="14dip" + android:textColor="@color/text_icon" /> + </RelativeLayout> +<!-- ** --> <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" |