diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-03-10 23:03:19 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-03-10 23:03:19 +0100 |
| commit | 8585231be2844ab794cfa63454b1013bae8502f6 (patch) | |
| tree | 65126dbebd698c0358b2d499be9e16c3ae8d8f5f /src/main/res | |
| parent | 07c2aba59b0ec0fd492621406d08ce33e23ad7ad (diff) | |
| parent | 27c9c0aa21e3ec1a5801f6c3279caf0cd4fe9248 (diff) | |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Conflicts:
src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java
Diffstat (limited to 'src/main/res')
| -rw-r--r-- | src/main/res/layout/dialog_userdecision.xml | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/main/res/layout/dialog_userdecision.xml b/src/main/res/layout/dialog_userdecision.xml index 4c5a53cc..55f28a0b 100644 --- a/src/main/res/layout/dialog_userdecision.xml +++ b/src/main/res/layout/dialog_userdecision.xml @@ -4,14 +4,6 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <TextView - android:layout_width="match_parent" - android:layout_height="32dp" - android:textAppearance="?android:attr/textAppearanceMedium" - android:text="Medium Text" - android:id="@+id/dlgUserDecQuestion" - android:layout_marginLeft="8dp" /> - <CheckBox android:layout_width="match_parent" android:layout_height="wrap_content" |