Fix conflicts from #1366 fixing lint issues (#1470)

* lint issue #171 - added Locale.getDefault()

* lint issue #171 - added Locale.getDefault()

* lint issue #171 - added %d

* lint issue #171 - Changed version

* lint issue #171 - added singleLine="true"

* lint issue #171 - changed commit to apply

* lint issue #171 - added Locale.getDefault()

* lint issue #171 - added Locale.getDefault()

* Codacy issues #778 - nested if loop

* Codacy issues #778 - nested if loop

* Revert "lint issue #171 - added %d" since we dont edit translated string files

This reverts commit e4917cddcf.
This commit is contained in:
neslihanturan 2018-04-30 14:05:47 +03:00 committed by GitHub
parent f80311d9f6
commit 3c2cc26d3b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 17 additions and 15 deletions

View file

@ -2,7 +2,7 @@
<CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/text1"
style="?android:attr/spinnerDropDownItemStyle"
android:maxLines="1"
android:singleLine="true"
android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight"
android:ellipsize="marquee"