mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-27 17:46:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into regular_authentication_in_saml_server

Browse source
This commit is contained in:
masensio 2014-03-19 17:57:56 +01:00
commit 432d696432
3 changed files with 60 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
res/xml/preferences.xml
View file

@ -25,8 +25,8 @@
android:title="@string/prefs_select_oc_account"
android:summary="@string/prefs_summary_select_oc_account"
/ -->
<Preference android:title="@string/prefs_manage_accounts" android:key="manage_account" />
<CheckBoxPreference android:title="@string/prefs_pincode" android:key="set_pincode"
<com.owncloud.android.ui.PreferenceMultiline android:title="@string/prefs_manage_accounts" android:key="manage_account" />
<com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:title="@string/prefs_pincode" android:key="set_pincode"
android:summary="@string/prefs_pincode_summary"/>
<com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:key="instant_uploading"
android:title="@string/prefs_instant_upload"

6
src/com/owncloud/android/ui/CheckBoxPreferenceWithLongTitle.java
View file

@ -1,6 +1,5 @@
/* ownCloud Android client application
* Copyright (C) 2011 Bartek Przybylski
* Copyright (C) 2012-2013 ownCloud Inc.
* Copyright (C) 2014 ownCloud Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2,
@ -15,7 +14,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
package com.owncloud.android.ui;
import android.content.Context;
import android.util.AttributeSet;
import android.view.View;
@ -41,5 +42,6 @@ public class CheckBoxPreferenceWithLongTitle extends CheckBoxPreference{
TextView titleView = (TextView) view.findViewById(android.R.id.title);
titleView.setSingleLine(false);
titleView.setMaxLines(3);
titleView.setEllipsize(null);
}
}

53
src/com/owncloud/android/ui/PreferenceMultiline.java Normal file
View file

@ -0,0 +1,53 @@
/* ownCloud Android client application
* Copyright (C) 2014 ownCloud Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2,
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
package com.owncloud.android.ui;
import android.content.Context;
import android.preference.Preference;
import android.util.AttributeSet;
import android.view.View;
import android.widget.TextView;
/**
* Allow multiline titles in preferences
*
* @author masensio
*
*/
public class PreferenceMultiline extends Preference {
public PreferenceMultiline(Context context) {
super(context);
}
public PreferenceMultiline(Context context, AttributeSet attrs) {
super(context, attrs);
}
public PreferenceMultiline(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);
}
@Override
protected void onBindView(View view) {
super.onBindView(view);
TextView titleView = (TextView) view.findViewById(android.R.id.title);
titleView.setSingleLine(false);
titleView.setMaxLines(3);
}
}