diff options
author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2016-10-21 16:58:40 +0200 |
---|---|---|
committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2016-10-21 17:05:00 +0200 |
commit | cddb7409b543949d537ce740a03c5dcd598f1e17 (patch) | |
tree | c1a19430b5abaae63a8ad741b403078610e96006 | |
parent | 9abe9cac2c92212f50e8df5a49330f950cfc3846 (diff) |
android:singleLine is deprecated: Use maxLines="1" instead
Change-Id: I3d6db8a808305ac61ae25d9c1ca70f9ce2e8c625
3 files changed, 4 insertions, 34 deletions
diff --git a/android/sdremote/mobile/src/main/res/layout/activity_computer_creation.xml b/android/sdremote/mobile/src/main/res/layout/activity_computer_creation.xml index ff88d57..ab2172a 100644 --- a/android/sdremote/mobile/src/main/res/layout/activity_computer_creation.xml +++ b/android/sdremote/mobile/src/main/res/layout/activity_computer_creation.xml @@ -5,16 +5,6 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <android.support.v7.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android" @@ -30,7 +20,7 @@ <EditText android:id="@+id/edit_ip_address" - android:singleLine="true" + android:maxLines="1" android:inputType="phone" android:hint="@string/hint_ip_address" android:layout_width="match_parent" @@ -44,7 +34,7 @@ <EditText android:id="@+id/edit_name" - android:singleLine="true" + android:maxLines="1" android:inputType="text|textCapSentences" android:hint="@string/hint_name" android:paddingTop="@dimen/padding_vertical_edit" diff --git a/android/sdremote/mobile/src/main/res/layout/list_item.xml b/android/sdremote/mobile/src/main/res/layout/list_item.xml index 496bc50..0c5d08e 100644 --- a/android/sdremote/mobile/src/main/res/layout/list_item.xml +++ b/android/sdremote/mobile/src/main/res/layout/list_item.xml @@ -5,19 +5,9 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <TextView xmlns:android="http://schemas.android.com/apk/res/android" - android:singleLine="true" + android:maxLines="1" android:textSize="@dimen/text_size_list_item" android:gravity="center_vertical" android:padding="@dimen/padding_horizontal_list_item" diff --git a/android/sdremote/mobile/src/main/res/layout/view_grid_slide.xml b/android/sdremote/mobile/src/main/res/layout/view_grid_slide.xml index 30a1f12..4b2abc2 100644 --- a/android/sdremote/mobile/src/main/res/layout/view_grid_slide.xml +++ b/android/sdremote/mobile/src/main/res/layout/view_grid_slide.xml @@ -5,16 +5,6 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:padding="@dimen/padding_slide" @@ -34,7 +24,7 @@ android:id="@+id/text_slide_index" android:background="@color/background_grid_slide_index_inactive" android:textColor="@android:color/white" - android:singleLine="true" + android:maxLines="1" android:layout_alignParentBottom="true" android:layout_width="wrap_content" android:minEms="2" |