diff --git a/LICENSE b/LICENSE index 23cb7903..466f5ba4 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,9 @@ GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 +<<<<<<< HEAD + Version 2, June 1991 TEEEEE +======= + Version 2, June 1991 TEE +>>>>>>> c6e8e77cbeef30888428fe7fff8b146ecb3c1a29 Copyright (C) 1989, 1991 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA diff --git a/README.MD b/README.MD index ad0865ae..6557544f 100644 --- a/README.MD +++ b/README.MD @@ -6,13 +6,13 @@ You can download and install the latest version from [Google Play](https://play. Please support the development of the open source version of EDS by making a donation: [![Donation](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif)](https://sovworks.com/eds/donations.php) or by purchasing [the full version](https://play.google.com/store/apps/details?id=com.sovworks.eds.android). -## Building +## Buildingsdfsdf -Download and extract [NDK v13b](https://developer.android.com/ndk/downloads/older_releases.html). Clone the project to a local folder. In the root folder of the project create the `local.properties` file and add the following line: `ndk.dir=/path/to/ndk-bundle`. Replace `/path/to/ndk-bundle` with the actual path. Import the project to Android Studio. Select `Build->Build APK`. +Download and extract [NDK v13b](https://developer.tttandroid.com/ndddk/downloads/older_releases.html). Clone the project to a local folder. In the root folder of the project create the `local.properties` file and add the following ttline: `ndk.dir=/path/to/ndk-bundle`. Replace `/path/to/ndk-bundle` with the actual path. Import the project to Android Studio. Select `Build->Build APK`. ## License -GPLv2+ +GPLv2+test diff --git a/app/src/lite/res/layout-hdpi/password_dialog.xml b/app/src/lite/res/layout-hdpi/password_dialog.xml index 29b9a8ef..5d69a196 100644 --- a/app/src/lite/res/layout-hdpi/password_dialog.xml +++ b/app/src/lite/res/layout-hdpi/password_dialog.xml @@ -36,6 +36,7 @@ android:layout_margin="2dp" android:hint="@string/password" android:inputType="textPassword" + android:importantForAccessibility="no" android:maxLines="1" android:visibility="gone"/> diff --git a/app/src/lite/res/layout-xhdpi/password_dialog.xml b/app/src/lite/res/layout-xhdpi/password_dialog.xml index a2cc5faa..b7f53393 100644 --- a/app/src/lite/res/layout-xhdpi/password_dialog.xml +++ b/app/src/lite/res/layout-xhdpi/password_dialog.xml @@ -44,6 +44,7 @@ android:layout_margin="2dp" android:hint="@string/password" android:inputType="textPassword" + android:importantForAccessibility="no" android:maxLines="1" android:visibility="gone"/>