diff options
Diffstat (limited to 'android')
| -rw-r--r-- | android/Makefile | 1 | ||||
| -rw-r--r-- | android/build.gradle | 4 | ||||
| -rw-r--r-- | android/xscreensaver/.idea/caches/build_file_checksums.ser | bin | 521 -> 521 bytes | |||
| -rw-r--r-- | android/xscreensaver/.idea/misc.xml | 2 | ||||
| -rw-r--r-- | android/xscreensaver/.idea/workspace.xml | 236 | ||||
| -rw-r--r-- | android/xscreensaver/build.gradle | 8 | ||||
| -rw-r--r-- | android/xscreensaver/jni/Android.mk | 1 | ||||
| -rw-r--r-- | android/xscreensaver/jni/Application.mk | 4 | ||||
| -rw-r--r-- | android/xscreensaver/xscreensaver.iml | 16 |
9 files changed, 136 insertions, 136 deletions
diff --git a/android/Makefile b/android/Makefile index f0d5da0..ed65edf 100644 --- a/android/Makefile +++ b/android/Makefile @@ -128,6 +128,7 @@ export ANDROID_HACKS= \ grav \ greynetic \ halo \ + handsy \ helix \ hexadrop \ hexstrut \ diff --git a/android/build.gradle b/android/build.gradle index 648cc32..978b94c 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,8 +1,8 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { repositories { - jcenter() google() + jcenter() } dependencies { classpath 'com.android.tools.build:gradle:3.1.2' @@ -12,9 +12,9 @@ buildscript { allprojects { repositories { + google() maven { url 'https://maven.google.com' } jcenter() - google() } } diff --git a/android/xscreensaver/.idea/caches/build_file_checksums.ser b/android/xscreensaver/.idea/caches/build_file_checksums.ser Binary files differindex bc8f00c..c2ab27f 100644 --- a/android/xscreensaver/.idea/caches/build_file_checksums.ser +++ b/android/xscreensaver/.idea/caches/build_file_checksums.ser diff --git a/android/xscreensaver/.idea/misc.xml b/android/xscreensaver/.idea/misc.xml index c0f68ed..99202cc 100644 --- a/android/xscreensaver/.idea/misc.xml +++ b/android/xscreensaver/.idea/misc.xml @@ -25,7 +25,7 @@ </value> </option> </component> - <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK"> + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <output url="file://$PROJECT_DIR$/build/classes" /> </component> <component name="ProjectType"> diff --git a/android/xscreensaver/.idea/workspace.xml b/android/xscreensaver/.idea/workspace.xml index 1dedd64..9f2ef73 100644 --- a/android/xscreensaver/.idea/workspace.xml +++ b/android/xscreensaver/.idea/workspace.xml @@ -1,5 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> + <component name="CMakeSettings"> + <configurations> + <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" /> + </configurations> + </component> <component name="ChangeListManager"> <list default="true" id="41008724-035d-4e24-92b6-6dfb9231c83c" name="Default" comment="" /> <ignored path="xscreensaver.iws" /> @@ -35,8 +40,7 @@ <entry file="file://$PROJECT_DIR$/../gradle/wrapper/gradle-wrapper.properties"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="90"> - <caret line="6" column="0" lean-forward="false" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" /> - <folding /> + <caret line="6" selection-start-line="6" selection-end-line="6" /> </state> </provider> </entry> @@ -1659,7 +1663,7 @@ <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/gradle-api/3.1.2/427e25639a55911cadcf70657c9b2ded2ad6af2b/gradle-api-3.1.2.jar" /> <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.databinding/compilerCommon/3.1.2/be65c11ded4242932046f23ecfa5c7ccb0e98f46/compilerCommon-3.1.2.jar" /> <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jre8/1.2.0/505f55b9619bbc5f5e26c77427dd24a6a441eef1/kotlin-stdlib-jre8-1.2.0.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/transform-api/2.0.0-deprecated-use-gradle-api/85bee1acea9e27152b920746c68133b30b11431/transform-api-2.0.0-deprecated-use-gradle-api.jar" /> + <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/transform-api/2.0.0-deprecated-use-gradle-api/47f6c56527c42425742fa9b56ffd3fd80763fe03/transform-api-2.0.0-deprecated-use-gradle-api.jar" /> <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm/5.1/5ef31c4fe953b1fd00b8a88fa1d6820e8785bb45/asm-5.1.jar" /> <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm-analysis/5.1/6d1bf8989fc7901f868bee3863c44f21aa63d110/asm-analysis-5.1.jar" /> <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm-commons/5.1/25d8a575034dd9cfcb375a39b5334f0ba9c8474e/asm-commons-5.1.jar" /> @@ -1742,7 +1746,7 @@ <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/gradle-api/3.1.2/427e25639a55911cadcf70657c9b2ded2ad6af2b/gradle-api-3.1.2.jar" /> <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.databinding/compilerCommon/3.1.2/be65c11ded4242932046f23ecfa5c7ccb0e98f46/compilerCommon-3.1.2.jar" /> <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jre8/1.2.0/505f55b9619bbc5f5e26c77427dd24a6a441eef1/kotlin-stdlib-jre8-1.2.0.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/transform-api/2.0.0-deprecated-use-gradle-api/85bee1acea9e27152b920746c68133b30b11431/transform-api-2.0.0-deprecated-use-gradle-api.jar" /> + <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/transform-api/2.0.0-deprecated-use-gradle-api/47f6c56527c42425742fa9b56ffd3fd80763fe03/transform-api-2.0.0-deprecated-use-gradle-api.jar" /> <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm/5.1/5ef31c4fe953b1fd00b8a88fa1d6820e8785bb45/asm-5.1.jar" /> <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm-analysis/5.1/6d1bf8989fc7901f868bee3863c44f21aa63d110/asm-analysis-5.1.jar" /> <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm-commons/5.1/25d8a575034dd9cfcb375a39b5334f0ba9c8474e/asm-commons-5.1.jar" /> @@ -1826,44 +1830,18 @@ </entry> </map> </option> - <option name="externalProjectsViewState"> - <projects_view /> - </option> </component> <component name="ProjectFrameBounds"> - <option name="x" value="90" /> - <option name="y" value="24" /> + <option name="x" value="105" /> + <option name="y" value="23" /> <option name="width" value="1339" /> <option name="height" value="859" /> </component> <component name="ProjectView"> <navigator currentView="Scope" currentSubView="Project Files" proportions="" version="1"> - <flattenPackages /> - <showMembers /> - <showModules /> - <showLibraryContents /> - <hideEmptyPackages /> - <abbreviatePackageNames /> - <autoscrollToSource /> - <autoscrollFromSource /> - <sortByType /> - <manualOrder /> <foldersAlwaysOnTop value="true" /> </navigator> <panes> - <pane id="AndroidView"> - <subPane> - <expand> - <path> - <item name="xscreensaver" type="1abcf292:AndroidViewProjectNode" /> - <item name="Gradle Scripts" type="ae0cef3a:AndroidBuildScriptsGroupNode" /> - </path> - </expand> - <select /> - </subPane> - </pane> - <pane id="PackagesPane" /> - <pane id="Scratches" /> <pane id="ProjectPane" /> <pane id="Scope"> <subPane subId="Project Files"> @@ -1887,6 +1865,18 @@ <select /> </subPane> </pane> + <pane id="AndroidView"> + <subPane> + <expand> + <path> + <item name="xscreensaver" type="1abcf292:AndroidViewProjectNode" /> + <item name="Gradle Scripts" type="ae0cef3a:AndroidBuildScriptsGroupNode" /> + </path> + </expand> + <select /> + </subPane> + </pane> + <pane id="PackagesPane" /> </panes> </component> <component name="PropertiesComponent"> @@ -1901,8 +1891,9 @@ <property name="SearchEverywhereHistoryKey" value="sdk manager	ACTION	WelcomeScreen.RunAndroidSdkManager" /> <property name="last_opened_file_path" value="$PROJECT_DIR$" /> <property name="show.do.not.ask.upgrade.gradle.plugin" value="2.1.0" /> - <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1533959035566" /> + <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1545885427557" /> <property name="device.picker.selection" value="Nexus_5_8.1" /> + <property name="sync.plugin.last.upgrade.timestamp" value="1538463643381" /> </component> <component name="RunDashboard"> <option name="ruleStates"> @@ -1918,8 +1909,6 @@ </component> <component name="RunManager"> <configuration default="true" type="AndroidJUnit" factoryName="Android JUnit"> - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> - <module name="" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="ALTERNATIVE_JRE_PATH" /> <option name="PACKAGE_NAME" /> @@ -1929,22 +1918,22 @@ <option name="VM_PARAMETERS" /> <option name="PARAMETERS" /> <option name="WORKING_DIRECTORY" value="file://$MODULE_DIR$" /> - <option name="ENV_VARIABLES" /> <option name="PASS_PARENT_ENVS" value="true" /> <option name="TEST_SEARCH_SCOPE"> <value defaultName="singleModule" /> </option> - <envs /> <patterns /> <method> + <option name="Make" enabled="false" /> <option name="Android.Gradle.BeforeRunTask" enabled="true" /> </method> </configuration> <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android App"> - <module name="" /> <option name="DEPLOY" value="true" /> + <option name="DEPLOY_APK_FROM_BUNDLE" value="false" /> <option name="ARTIFACT_NAME" value="" /> <option name="PM_INSTALL_OPTIONS" value="" /> + <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="" /> <option name="ACTIVITY_EXTRA_FLAGS" value="" /> <option name="MODE" value="default_activity" /> <option name="CLEAR_LOGCAT" value="false" /> @@ -1981,19 +1970,22 @@ </Native> <Profilers> <option name="ADVANCED_PROFILING_ENABLED" value="false" /> + <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" /> + <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sampled (Java)" /> </Profilers> <option name="DEEP_LINK" value="" /> <option name="ACTIVITY_CLASS" value="" /> <method> <option name="Android.Gradle.BeforeRunTask" enabled="true" /> - <option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" /> </method> </configuration> <configuration name="xscreensaver" type="AndroidRunConfigurationType" factoryName="Android App"> <module name="xscreensaver" /> <option name="DEPLOY" value="true" /> + <option name="DEPLOY_APK_FROM_BUNDLE" value="false" /> <option name="ARTIFACT_NAME" value="" /> <option name="PM_INSTALL_OPTIONS" value="" /> + <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="" /> <option name="ACTIVITY_EXTRA_FLAGS" value="" /> <option name="MODE" value="default_activity" /> <option name="CLEAR_LOGCAT" value="false" /> @@ -2030,37 +2022,16 @@ </Native> <Profilers> <option name="ADVANCED_PROFILING_ENABLED" value="false" /> + <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" /> + <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sampled (Java)" /> </Profilers> <option name="DEEP_LINK" value="" /> <option name="ACTIVITY_CLASS" value="" /> - <method> - <option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" /> - </method> </configuration> <configuration default="true" type="Application" factoryName="Application"> - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> - <option name="MAIN_CLASS_NAME" /> - <option name="VM_PARAMETERS" /> - <option name="PROGRAM_PARAMETERS" /> <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - <option name="ENABLE_SWING_INSPECTOR" value="false" /> - <option name="ENV_VARIABLES" /> - <option name="PASS_PARENT_ENVS" value="true" /> - <module name="" /> - <envs /> - </configuration> - <configuration default="true" type="Remote" factoryName="Remote"> - <option name="USE_SOCKET_TRANSPORT" value="true" /> - <option name="SERVER_MODE" value="false" /> - <option name="SHMEM_ADDRESS" value="javadebug" /> - <option name="HOST" value="localhost" /> - <option name="PORT" value="5005" /> </configuration> <configuration default="true" type="TestNG" factoryName="TestNG"> - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> - <module name="" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="ALTERNATIVE_JRE_PATH" /> <option name="SUITE_NAME" /> @@ -2073,15 +2044,12 @@ <option name="PARAMETERS" /> <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" /> <option name="OUTPUT_DIRECTORY" /> - <option name="ANNOTATION_TYPE" /> - <option name="ENV_VARIABLES" /> <option name="PASS_PARENT_ENVS" value="true" /> <option name="TEST_SEARCH_SCOPE"> <value defaultName="singleModule" /> </option> <option name="USE_DEFAULT_REPORTERS" value="false" /> <option name="PROPERTIES_FILE" /> - <envs /> <properties /> <listeners /> </configuration> @@ -2098,9 +2066,6 @@ <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" /> </configuration> </component> - <component name="ShelveChangesManager" show_recycled="false"> - <option name="remove_strategy" value="false" /> - </component> <component name="SvnConfiguration"> <configuration /> </component> @@ -2115,43 +2080,44 @@ <servers /> </component> <component name="ToolWindowManager"> - <frame x="90" y="24" width="1339" height="859" extended-state="0" /> + <frame x="105" y="23" width="1339" height="859" extended-state="0" /> <layout> - <window_info id="Android Profiler" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> - <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> - <window_info id="Palette	" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> - <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> - <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" /> - <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> - <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32928476" sideWeight="0.5312259" order="7" side_tool="true" content_ui="tabs" /> - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> - <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> - <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> - <window_info id="Logcat" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> - <window_info id="Captures" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> - <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> - <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> - <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2544333" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> - <window_info id="Build" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32928476" sideWeight="0.47185814" order="8" side_tool="false" content_ui="tabs" /> - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32928476" sideWeight="0.49421743" order="1" side_tool="false" content_ui="tabs" /> - <window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> - <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> - <window_info id="Device File Explorer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" /> - <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> - <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" /> - <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> - <window_info id="Nl-Palette" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> - <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> - <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> - <window_info id="Android Monitor" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> - <window_info id="Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> - <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> - <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> - <window_info id="Android Model" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" /> - <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32839838" sideWeight="0.49730146" order="7" side_tool="false" content_ui="tabs" /> - <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> - <window_info id="Gradle Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> + <window_info anchor="bottom" id="Android Profiler" order="7" show_stripe_button="false" /> + <window_info anchor="bottom" id="TODO" order="6" /> + <window_info anchor="right" id="Palette	" order="3" /> + <window_info id="Image Layers" order="3" /> + <window_info id="Build Variants" order="3" side_tool="true" /> + <window_info anchor="right" id="Capture Analysis" order="3" /> + <window_info active="true" anchor="bottom" id="Event Log" order="7" sideWeight="0.5188897" side_tool="true" visible="true" weight="0.32882273" /> + <window_info anchor="bottom" id="Run" order="2" /> + <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" /> + <window_info anchor="bottom" id="Terminal" order="7" /> + <window_info anchor="bottom" id="Logcat" order="7" /> + <window_info id="Captures" order="2" weight="0.25" /> + <window_info id="Capture Tool" order="3" /> + <window_info id="Designer" order="3" /> + <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2544333" /> + <window_info anchor="right" id="Assistant" visible="true" weight="0.3299923" /> + <window_info anchor="bottom" id="Build" order="8" sideWeight="0.47185814" weight="0.32928476" /> + <window_info anchor="bottom" id="Find" order="1" sideWeight="0.48111024" visible="true" weight="0.32882273" /> + <window_info anchor="right" id="Gradle" order="3" /> + <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> + <window_info anchor="right" id="Device File Explorer" order="3" side_tool="true" /> + <window_info anchor="right" id="Theme Preview" order="3" /> + <window_info anchor="bottom" id="Debug" order="3" weight="0.4" /> + <window_info id="Favorites" order="3" side_tool="true" /> + <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> + <window_info anchor="bottom" id="Messages" order="7" sideWeight="0.49730146" visible="true" weight="0.32839838" /> + <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> + <window_info anchor="right" id="Android Model" order="3" side_tool="true" /> + <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> + <window_info id="Nl-Palette" order="3" /> + <window_info anchor="right" id="Properties" order="3" /> + <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> + <window_info anchor="bottom" id="Message" order="0" /> + <window_info anchor="bottom" id="Gradle Console" order="7" side_tool="true" /> + <window_info anchor="bottom" id="Android Monitor" order="7" /> + <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> </layout> </component> <component name="Vcs.Log.UiProperties"> @@ -2170,56 +2136,68 @@ <path value="$PROJECT_DIR$/../.." /> </ignored-roots> </component> - <component name="XDebuggerManager"> - <breakpoint-manager /> - <watches-manager /> - </component> <component name="editorHistoryManager"> <entry file="file://$PROJECT_DIR$/../gradle/wrapper/gradle-wrapper.properties"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="0"> - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - <folding /> + <state relative-caret-position="90"> + <caret line="6" selection-start-line="6" selection-end-line="6" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/../gradle/wrapper/gradle-wrapper.properties"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="0"> - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - <folding /> - </state> + <state /> </provider> </entry> <entry file="file://$PROJECT_DIR$/../gradle/wrapper/gradle-wrapper.properties"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="0"> - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - <folding /> - </state> + <state /> </provider> </entry> <entry file="file://$PROJECT_DIR$/../gradle/wrapper/gradle-wrapper.properties"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="0"> - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - <folding /> - </state> + <state /> </provider> </entry> <entry file="file://$PROJECT_DIR$/../gradle/wrapper/gradle-wrapper.properties"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="0"> - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - <folding /> - </state> + <state /> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/../gradle/wrapper/gradle-wrapper.properties"> + <provider selected="true" editor-type-id="text-editor"> + <state /> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/../gradle/wrapper/gradle-wrapper.properties"> + <provider selected="true" editor-type-id="text-editor"> + <state /> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/../gradle/wrapper/gradle-wrapper.properties"> + <provider selected="true" editor-type-id="text-editor"> + <state /> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/../gradle/wrapper/gradle-wrapper.properties"> + <provider selected="true" editor-type-id="text-editor"> + <state /> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/../gradle/wrapper/gradle-wrapper.properties"> + <provider selected="true" editor-type-id="text-editor"> + <state /> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/../gradle/wrapper/gradle-wrapper.properties"> + <provider selected="true" editor-type-id="text-editor"> + <state /> </provider> </entry> <entry file="file://$PROJECT_DIR$/../gradle/wrapper/gradle-wrapper.properties"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="90"> - <caret line="6" column="0" lean-forward="false" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" /> - <folding /> + <caret line="6" selection-start-line="6" selection-end-line="6" /> </state> </provider> </entry> diff --git a/android/xscreensaver/build.gradle b/android/xscreensaver/build.gradle index f0ff9a3..038e613 100644 --- a/android/xscreensaver/build.gradle +++ b/android/xscreensaver/build.gradle @@ -1,8 +1,8 @@ apply plugin: 'android' dependencies { - compile fileTree(include: '*.jar', dir: 'libs') - compile "com.android.support:support-v4:27.1.1" + implementation fileTree(include: '*.jar', dir: 'libs') + implementation "com.android.support:support-v4:27.1.1" } android { @@ -96,6 +96,10 @@ android { defaultConfig { + // Previous applicationId was "org.jwz.xscreensaver" but I had + // to change it because I managed to lose the signing key... + // Note that the Java class tree is still "org.jwz.xscreensaver". + applicationId "org.jwz.android.xscreensaver" minSdkVersion 15 targetSdkVersion 27 } diff --git a/android/xscreensaver/jni/Android.mk b/android/xscreensaver/jni/Android.mk index 1e20a83..3396bd9 100644 --- a/android/xscreensaver/jni/Android.mk +++ b/android/xscreensaver/jni/Android.mk @@ -73,6 +73,7 @@ LOCAL_SRC_FILES += \ hacks/glx/gllist.c \ hacks/glx/glschool_alg.c \ hacks/glx/glschool_gl.c \ + hacks/glx/handsy_model.c \ hacks/glx/involute.c \ hacks/glx/lament_model.c \ hacks/glx/pipeobjs.c \ diff --git a/android/xscreensaver/jni/Application.mk b/android/xscreensaver/jni/Application.mk index d3f5436..311946d 100644 --- a/android/xscreensaver/jni/Application.mk +++ b/android/xscreensaver/jni/Application.mk @@ -1,7 +1,7 @@ # Get this value from android/Makefile APP_ABI := $(shell echo $$APP_ABI) -APP_STL := stlport_static -APP_PLATFORM := android-14 +APP_STL := c++_static +APP_PLATFORM := android-16 # ^^ APP_PLATFORM is minimum API version supported # https://android.googlesource.com/platform/ndk/+/master/docs/user/common_problems.md#target-api-set-higher-than-device-api diff --git a/android/xscreensaver/xscreensaver.iml b/android/xscreensaver/xscreensaver.iml index dd9566c..18e9fb0 100644 --- a/android/xscreensaver/xscreensaver.iml +++ b/android/xscreensaver/xscreensaver.iml @@ -79,7 +79,23 @@ <sourceFolder url="file://$MODULE_DIR$/tests/java" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/tests/rs" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/tests/shaders" isTestSource="true" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" /> <excludeFolder url="file://$MODULE_DIR$/build/outputs" /> + <excludeFolder url="file://$MODULE_DIR$/build/reports" /> <excludeFolder url="file://$MODULE_DIR$/build/tmp" /> </content> <orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" /> |