From 646e2ec7b868920f71c29243d2bbeb13deb811e3 Mon Sep 17 00:00:00 2001 From: Fup Duck Date: Tue, 23 Jan 2018 14:08:26 +0100 Subject: add tablet design for ConfigWizard based upon !28 I could not check this - starting emulator freezes my system and I have no tablet. --- app/build.gradle | 1 + 1 file changed, 1 insertion(+) (limited to 'app/build.gradle') diff --git a/app/build.gradle b/app/build.gradle index b28d9f35..4a99ad98 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -93,6 +93,7 @@ dependencies { compile 'com.android.support:appcompat-v7:26.1.0' compile 'com.android.support:design:26.1.0' compile 'com.android.support:support-fragment:26.1.0' + compile 'com.android.support.constraint:constraint-layout:1.0.2' } // Ensure the no-op dependency is always used in JVM tests. -- cgit v1.2.3 From 966b74e46c6723093dfb93cce64528d79441e70e Mon Sep 17 00:00:00 2001 From: cyBerta Date: Wed, 7 Feb 2018 15:10:03 +0100 Subject: move xml file references to correct copy task --- app/build.gradle | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'app/build.gradle') diff --git a/app/build.gradle b/app/build.gradle index c909b70f..e613cb35 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -153,11 +153,6 @@ task copyIcsOpenVPNClasses( type: Copy ) { include '**/LogWindow.java' include '**/LogFragment.java' include '**/SeekBarTicks.java' - include '**/log_window.xml' - include '**/log_fragment.xml' - include '**/log_silders.xml' - include '**/vpnstatus.xml' - include '**/logmenu.xml' include '**/core/**.java' include '**/activities/BaseActivity.java' include '**/APIVpnProfile.java' @@ -181,6 +176,11 @@ task copyIcsOpenVPNClasses( type: Copy ) { task copyIcsOpenVPNXml( type: Copy ) { println "copyIcsOpenVPNXml" from ('../ics-openvpn/main/') { + include '**/log_window.xml' + include '**/log_fragment.xml' + include '**/log_silders.xml' + include '**/vpnstatus.xml' + include '**/logmenu.xml' include '**/strings.xml' include '**/log_*.xml' include '**/vpnstatus.xml' -- cgit v1.2.3 From 6cd010c331cfd98078e657bb8d1107651daca49e Mon Sep 17 00:00:00 2001 From: cyBerta Date: Wed, 7 Feb 2018 23:44:14 +0100 Subject: #8841 fixes multidex issue on Android devices with API < 20 --- app/build.gradle | 1 + 1 file changed, 1 insertion(+) (limited to 'app/build.gradle') diff --git a/app/build.gradle b/app/build.gradle index c909b70f..30575ee7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -118,6 +118,7 @@ dependencies { implementation 'com.android.support:design:27.0.2' implementation 'com.android.support:support-fragment:27.0.2' implementation 'com.android.support.constraint:constraint-layout:1.0.2' + implementation 'com.android.support:multidex:1.0.2' } // Ensure the no-op dependency is always used in JVM tests. -- cgit v1.2.3