MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-07-23 15:22:12 +02:00
Code Releases Wiki Activity

Revert unnecessary changes

Browse Source 
This reverts commit c19da6c6d8.
This commit is contained in:
Felix Konstantin Maurer 2018-01-08 11:32:28 +01:00 committed by Carsten Pfeiffer
parent 1477235fa2
commit 65c83c404c
2 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/res/layout/activity_db_management.xml
View File

@ -1,5 +1,4 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:grid="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -10,7 +9,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<android.support.v7.widget.GridLayout
<android.support.v7.widget.GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:grid="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="@dimen/activity_vertical_margin"
@ -29,8 +29,8 @@
<Button
android:id="@+id/importDBButton"
android:text="Import DB"
grid:layout_column="1"
grid:layout_gravity="center" />
grid:layout_gravity="center"
grid:layout_column="1" />
<TextView
@ -50,13 +50,6 @@
grid:layout_columnSpan="2"
grid:layout_columnWeight="1" />
<Button
android:id="@+id/chooseDirectory"
android:text="Choose Directory"
grid:layout_columnSpan="2"
grid:layout_columnWeight="1"
grid:layout_gravity="center" />
<TextView
android:id="@+id/mergeOldActivityDataTitle"

7
app/src/main/res/xml/preferences.xml
View File

@ -101,13 +101,6 @@
android:defaultValue="true"
android:key="charts_allow_swipe"
android:title="@string/pref_title_charts_swipe" />
<ListPreference
android:defaultValue="metric"
android:entries="@array/pref_entries_unit_system"
android:entryValues="@array/pref_values_unit_system"
android:key="measurement_system"
android:summary="%s"
android:title="@string/pref_title_unit_system" />
</PreferenceCategory>
<PreferenceCategory
android:key="pref_key_datetime"