diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2013-05-19 18:45:40 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2013-05-19 18:45:40 +0200 |
| commit | 1eba3b589fb265c3832d76d4ce51952e8a67c62e (patch) | |
| tree | 0c80315a4e9e6d6cc65d6582854f9913c38f9faf /main/res | |
| parent | f6b2099d8f8b4edc3eccab4ac396d983b05f9862 (diff) | |
| parent | a09d414466028179ac4c7737dd0336a6d38bc00d (diff) | |
| download | cgeo-1eba3b589fb265c3832d76d4ce51952e8a67c62e.zip cgeo-1eba3b589fb265c3832d76d4ce51952e8a67c62e.tar.gz cgeo-1eba3b589fb265c3832d76d4ce51952e8a67c62e.tar.bz2 | |
Merge branch 'fix-2733' into upstream
Conflicts:
main/res/values/strings_not_translatable.xml
Diffstat (limited to 'main/res')
| -rw-r--r-- | main/res/layout/caches_item.xml | 34 | ||||
| -rw-r--r-- | main/res/values/strings_not_translatable.xml | 3 |
2 files changed, 14 insertions, 23 deletions
diff --git a/main/res/layout/caches_item.xml b/main/res/layout/caches_item.xml index d4e7b27..1105f91 100644 --- a/main/res/layout/caches_item.xml +++ b/main/res/layout/caches_item.xml @@ -75,15 +75,13 @@ <!-- real text based direction and distance --> <RelativeLayout - android:id="@+id/direction_layout" android:layout_width="78dip" android:layout_height="wrap_content" android:layout_alignParentRight="true" android:layout_centerVertical="true" android:layout_marginBottom="1dip" android:layout_marginRight="30dip" - android:layout_marginTop="1dip" - android:visibility="gone" > + android:layout_marginTop="1dip" > <view android:id="@+id/distance" @@ -111,31 +109,21 @@ android:gravity="center" android:minHeight="28px" android:minWidth="28px" - cc:skin="?compass" /> - </RelativeLayout> - - <!-- image based direction and distance --> - - <RelativeLayout - android:id="@+id/dirimg_layout" - android:layout_width="78dip" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_centerVertical="true" - android:layout_marginBottom="1dip" - android:layout_marginRight="30dip" - android:layout_marginTop="1dip" - android:visibility="gone" > + cc:skin="?compass" + android:visibility="gone" /> <ImageView android:id="@+id/dirimg" - android:layout_width="55dip" - android:layout_height="30dip" - android:layout_centerInParent="true" + android:layout_width="78dip" + android:layout_height="28px" + android:layout_centerHorizontal="true" android:layout_gravity="center" + android:layout_marginTop="21dip" android:gravity="center" - android:scaleType="fitXY" - android:src="@null" /> + android:minHeight="28px" + android:minWidth="28px" + android:src="@null" + android:visibility="gone" /> </RelativeLayout> <!-- inventory and favorites --> diff --git a/main/res/values/strings_not_translatable.xml b/main/res/values/strings_not_translatable.xml index 8466627..8d70e14 100644 --- a/main/res/values/strings_not_translatable.xml +++ b/main/res/values/strings_not_translatable.xml @@ -97,6 +97,9 @@ <!-- changelog -->
<string name="changelog" translatable="false">\n
<b>Next release</b>\n\n
+ <b>Next bugfix release</b>\n
+ <b>Bugfixing:</b>\n
+ ยท Correction for compatability issue with tablet devices\n
\n
\n
<b>2013.05.16</b>\n
|