diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2014-11-19 16:11:40 +0100 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2014-11-19 16:11:40 +0100 |
| commit | 8888f24e537a5922b8b1a7a68a6b9af69e2aeb12 (patch) | |
| tree | 1cf5fe90e9d71ec75af239ecd105aebc38afbc02 | |
| parent | 8dc10e8717e22fb2484507da3bdf9e0ea83e3205 (diff) | |
Fix attribute name clash should I ever use compat21
--HG--
extra : rebase_source : d82801f2bf6a3e323e345180eba233920836834d
| -rw-r--r-- | main/src/main/java/de/blinkt/openvpn/views/FileSelectLayout.java | 2 | ||||
| -rw-r--r-- | main/src/main/res/layout/basic_settings.xml | 8 | ||||
| -rw-r--r-- | main/src/main/res/values/attrs.xml | 13 |
3 files changed, 11 insertions, 12 deletions
diff --git a/main/src/main/java/de/blinkt/openvpn/views/FileSelectLayout.java b/main/src/main/java/de/blinkt/openvpn/views/FileSelectLayout.java index 60cbff2b..1addd831 100644 --- a/main/src/main/java/de/blinkt/openvpn/views/FileSelectLayout.java +++ b/main/src/main/java/de/blinkt/openvpn/views/FileSelectLayout.java @@ -76,7 +76,7 @@ public class FileSelectLayout extends LinearLayout implements OnClickListener { TypedArray ta = context.obtainStyledAttributes(attrset, R.styleable.FileSelectLayout); - setupViews(ta.getString(R.styleable.FileSelectLayout_title), ta.getBoolean(R.styleable.FileSelectLayout_certificate, true), + setupViews(ta.getString(R.styleable.FileSelectLayout_fileTitle), ta.getBoolean(R.styleable.FileSelectLayout_certificate, true), ta.getBoolean(R.styleable.FileSelectLayout_showClear,false)); ta.recycle(); diff --git a/main/src/main/res/layout/basic_settings.xml b/main/src/main/res/layout/basic_settings.xml index b9ff6a98..60d6957c 100644 --- a/main/src/main/res/layout/basic_settings.xml +++ b/main/src/main/res/layout/basic_settings.xml @@ -76,7 +76,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" blinkt:showClear="true" - blinkt:title="@string/ca_title" /> + blinkt:fileTitle="@string/ca_title" /> </LinearLayout> @@ -91,14 +91,14 @@ android:id="@+id/certselect" android:layout_width="match_parent" android:layout_height="wrap_content" - blinkt:title="@string/client_certificate_title" /> + blinkt:fileTitle="@string/client_certificate_title" /> <de.blinkt.openvpn.views.FileSelectLayout android:id="@+id/keyselect" android:layout_width="match_parent" android:layout_height="wrap_content" blinkt:certificate="false" - blinkt:title="@string/client_key_title" /> + blinkt:fileTitle="@string/client_key_title" /> <LinearLayout android:id="@+id/key_password_layout" @@ -136,7 +136,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" blinkt:certificate="false" - blinkt:title="@string/client_pkcs12_title" /> + blinkt:fileTitle="@string/client_pkcs12_title" /> <TextView style="@style/item" diff --git a/main/src/main/res/values/attrs.xml b/main/src/main/res/values/attrs.xml index c2e12f3c..7d1ba357 100644 --- a/main/src/main/res/values/attrs.xml +++ b/main/src/main/res/values/attrs.xml @@ -6,12 +6,12 @@ --> <resources> - <declare-styleable name="FileSelectLayout"> - <attr name="title" format="string|reference" /> - <attr name="certificate" format="boolean" /> - <!-- <attr name="taskid" format="integer" /> --> - <attr name="showClear" format="boolean" /> - </declare-styleable> + <declare-styleable name="FileSelectLayout"> + <attr name="fileTitle" format="string|reference" /> + <attr name="certificate" format="boolean" /> +<!-- <attr name="taskid" format="integer" /> --> + <attr name="showClear" format="boolean" /> + </declare-styleable> <declare-styleable name="PagerSlidingTabStrip"> <attr name="pstsIndicatorColor" format="color" /> @@ -40,5 +40,4 @@ <attr name="pstsTextAlpha" format="float" /> <attr name="pstsTextSelectedAlpha" format="float" /> </declare-styleable> - </resources> |