diff options
| author | Camil Staps | 2015-06-10 13:16:16 +0200 |
|---|---|---|
| committer | Camil Staps | 2015-06-10 13:16:16 +0200 |
| commit | dd9c36491ab017795a71bdc4624281b65dcabd11 (patch) | |
| tree | a99376c8d15be4f1bb6b66aa80600c5011c74a18 /app/src/main/res/layout | |
| parent | IT WORKS (diff) | |
| parent | Aligned (EDIT) to the right (diff) | |
Merge branch 'master' of github:camilstaps/RSSin
Conflicts:
app/src/main/java/org/rssin/android/FeedSorterTrainer.java
app/src/main/java/org/rssin/neurons/FeedSorter.java
app/src/main/java/org/rssin/neurons/MultiNeuralNetwork.java
app/src/main/java/org/rssin/neurons/NeuralNetwork.java
app/src/main/java/org/rssin/rssin/SortedFeedItemContainer.java
Diffstat (limited to 'app/src/main/res/layout')
| -rwxr-xr-x | app/src/main/res/layout/separator_navigation_drawer.xml | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/app/src/main/res/layout/separator_navigation_drawer.xml b/app/src/main/res/layout/separator_navigation_drawer.xml index 81a9d0a..a3031a0 100755 --- a/app/src/main/res/layout/separator_navigation_drawer.xml +++ b/app/src/main/res/layout/separator_navigation_drawer.xml @@ -10,7 +10,7 @@ android:layout_marginTop="0dp" android:background="#252525"
>
- <LinearLayout
+ <RelativeLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:minHeight="35dp"
@@ -24,7 +24,19 @@ android:background="#252525" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#FFFFFF"
/>
- </LinearLayout>
+
+ <TextView
+ android:id="@+id/separator_navigation_drawer_edit"
+ android:layout_alignParentRight="true"
+ android:layout_gravity="right"
+ android:layout_marginRight="8dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_margin="4dp"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="#FFFFFF"
+ />
+ </RelativeLayout>
<View
android:layout_width="match_parent"
|