caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

cleanup after merge

Browse source
This commit is contained in:
AdrianLxM 2017-01-19 21:15:08 +01:00
parent 6c3a07cc62
commit 0c11f78ed3
6 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.idea/misc.xml
View file

@ -37,7 +37,7 @@
<ConfirmationsSetting value="0" id="Add" /> <ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" /> <ConfirmationsSetting value="0" id="Remove" />
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">

1
app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
View file

@ -636,7 +636,6 @@ public class OverviewFragment extends Fragment {
treatmentButton.setVisibility(View.VISIBLE); treatmentButton.setVisibility(View.VISIBLE);
} }
String units = profile.getUnits();
// QuickWizard button // QuickWizard button
QuickWizard.QuickWizardEntry quickWizardEntry = getPlugin().quickWizard.getActive(); QuickWizard.QuickWizardEntry quickWizardEntry = getPlugin().quickWizard.getActive();

2
app/src/main/res/layout/actions_fragment.xml
View file

@ -32,7 +32,7 @@
android:layout_marginRight="10dp" android:layout_marginRight="10dp"
android:layout_marginTop="3dp" android:layout_marginTop="3dp"
android:layout_weight="0.5" android:layout_weight="0.5"
android:text="@string/careportal_temptarget" android:text="@string/careportal_temporarytarget"
android:textColor="@color/colorWizardButton" /> android:textColor="@color/colorWizardButton" />
<Button <Button

1
app/src/main/res/layout/overview_fragment.xml
View file

@ -32,7 +32,6 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="10dp" android:layout_marginLeft="10dp"
android:layout_marginRight="10dp" android:layout_marginRight="10dp"
android:layout_weight="0.2"
android:background="@drawable/loopmodeborder" android:background="@drawable/loopmodeborder"
android:gravity="center_vertical|center_horizontal" android:gravity="center_vertical|center_horizontal"
android:paddingLeft="10dp" android:paddingLeft="10dp"

1
app/src/main/res/values-cs/strings.xml
View file

@ -387,7 +387,6 @@
<string name="localprofile">Místní profil</string> <string name="localprofile">Místní profil</string>
<string name="activity">Aktivita</string> <string name="activity">Aktivita</string>
<string name="array_of_elements">Pole %d prvků. Aktuální hodnota:</string> <string name="array_of_elements">Pole %d prvků. Aktuální hodnota:</string>
<string name="careportal_temptarget"></string>
<string name="eatingsoon">Před jídlem</string> <string name="eatingsoon">Před jídlem</string>
<string name="el_lang">Řečtina</string> <string name="el_lang">Řečtina</string>
<string name="initializing">Inicializuji ...</string> <string name="initializing">Inicializuji ...</string>

1
app/src/main/res/values/strings.xml
View file

@ -413,4 +413,5 @@
<string name="activity">Activity</string> <string name="activity">Activity</string>
<string name="removerecord">Remove record:</string> <string name="removerecord">Remove record:</string>
<string name="initializing">Initializing ...</string> <string name="initializing">Initializing ...</string>
<string name="careportal_temptarget">Temporary Target</string>
</resources> </resources>