diff options
| author | Bananeweizen <bananeweizen@gmx.de> | 2014-05-30 19:06:12 +0200 |
|---|---|---|
| committer | Bananeweizen <bananeweizen@gmx.de> | 2014-05-30 19:06:12 +0200 |
| commit | 4fd880046034efcb6934f10cc7ed587549c42779 (patch) | |
| tree | 24ed84374280eedfc3d64fa3bd290478130e23d7 /main/res | |
| parent | f4319d587dced0107dbf115b708f2bd3e7b66aea (diff) | |
| download | cgeo-4fd880046034efcb6934f10cc7ed587549c42779.zip cgeo-4fd880046034efcb6934f10cc7ed587549c42779.tar.gz cgeo-4fd880046034efcb6934f10cc7ed587549c42779.tar.bz2 | |
#3903: move offline log buttons to action bar
Diffstat (limited to 'main/res')
| -rw-r--r-- | main/res/layout/logcache_activity.xml | 29 | ||||
| -rw-r--r-- | main/res/menu/abstract_logging_activity.xml | 20 |
2 files changed, 17 insertions, 32 deletions
diff --git a/main/res/layout/logcache_activity.xml b/main/res/layout/logcache_activity.xml index b00a70a..5445285 100644 --- a/main/res/layout/logcache_activity.xml +++ b/main/res/layout/logcache_activity.xml @@ -119,35 +119,6 @@ android:textColor="?text_color" android:textSize="14sp" /> </LinearLayout> - - <RelativeLayout style="@style/separator_horizontal_layout" > - - <View style="@style/separator_horizontal" /> - - <TextView - style="@style/separator_horizontal_headline" - android:text="@string/cache_log_offline" /> - </RelativeLayout> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > - - <Button - android:id="@+id/save" - style="@style/button_full" - android:layout_width="0dip" - android:layout_weight="1" - android:text="@string/log_save" /> - - <Button - android:id="@+id/clear" - style="@style/button_full" - android:layout_width="0dip" - android:layout_weight="1" - android:text="@string/log_clear" /> - </LinearLayout> </LinearLayout> <LinearLayout diff --git a/main/res/menu/abstract_logging_activity.xml b/main/res/menu/abstract_logging_activity.xml index 8ef0cf1..586b93e 100644 --- a/main/res/menu/abstract_logging_activity.xml +++ b/main/res/menu/abstract_logging_activity.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="utf-8"?> <menu xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:cgeo="http://schemas.android.com/apk/res-auto"> + xmlns:cgeo="http://schemas.android.com/apk/res-auto" > <item android:id="@+id/menu_send" + android:enabled="true" android:icon="@drawable/ic_menu_send" android:title="@string/send" - android:enabled="true" - cgeo:showAsAction="ifRoom|withText"> <!-- enabled=true, we show a message if logging is not possible --> + cgeo:showAsAction="ifRoom|withText"> <!-- enabled=true, we show a message if logging is not possible --> </item> <item android:id="@+id/menu_templates" @@ -31,5 +31,19 @@ cgeo:showAsAction="ifRoom|withText"> <menu /> <!-- filled dynamically --> </item> + <item + android:id="@+id/save" + android:icon="@drawable/ic_menu_save" + android:title="@string/log_save" + android:visible="false" + cgeo:showAsAction="ifRoom|withText"> + </item> + <item + android:id="@+id/clear" + android:icon="@drawable/ic_menu_delete" + android:title="@string/log_clear" + android:visible="false" + cgeo:showAsAction="ifRoom|withText"> + </item> </menu>
\ No newline at end of file |