diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 000000000..26d33521a --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 000000000..b589d56e9 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 000000000..a7c6f5e7e --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,27 @@ + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 000000000..e34606ccd --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 000000000..0ad17cbd3 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 000000000..35eb1ddfb --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/braille/brailledisplay/build.gradle b/braille/brailledisplay/build.gradle index a4974f054..020070084 100644 --- a/braille/brailledisplay/build.gradle +++ b/braille/brailledisplay/build.gradle @@ -2,5 +2,5 @@ apply plugin: 'com.android.library' apply from: "../../shared.gradle" dependencies { - implementation project(':brailleinterfaces') + //implementation project(':brailleinterfaces') } diff --git a/braille/brailledisplayanalytics/build.gradle b/braille/brailledisplayanalytics/build.gradle index 62a888635..fd93cc8e9 100644 --- a/braille/brailledisplayanalytics/build.gradle +++ b/braille/brailledisplayanalytics/build.gradle @@ -2,5 +2,5 @@ apply plugin: 'com.android.library' apply from: "../../shared.gradle" dependencies { - implementation project(':braillecommon') + //implementation project(':braillecommon') } diff --git a/braille/brailleime/build.gradle b/braille/brailleime/build.gradle index fb84d7cb7..0771a443b 100644 --- a/braille/brailleime/build.gradle +++ b/braille/brailleime/build.gradle @@ -3,8 +3,8 @@ apply from: "../../shared.gradle" dependencies { implementation project(':utils') - implementation project(':braillecommon') - implementation project(':brailleinterfaces') - implementation project(':brailleimeanalytics') - implementation project(':brailletranslate') + //implementation project(':braillecommon') + //implementation project(':brailleinterfaces') + //implementation project(':brailleimeanalytics') + //implementation project(':brailletranslate') } diff --git a/braille/brailleimeanalytics/build.gradle b/braille/brailleimeanalytics/build.gradle index 5932a84df..8969448c5 100644 --- a/braille/brailleimeanalytics/build.gradle +++ b/braille/brailleimeanalytics/build.gradle @@ -3,6 +3,6 @@ apply from: "../../shared.gradle" dependencies { implementation project(':utils') - implementation project(':braillecommon') - implementation project(':brailleinterfaces') + //implementation project(':braillecommon') + //implementation project(':brailleinterfaces') } diff --git a/braille/common/build.gradle b/braille/common/build.gradle index 5ed33e129..93bfb1857 100644 --- a/braille/common/build.gradle +++ b/braille/common/build.gradle @@ -2,8 +2,8 @@ apply plugin: 'com.android.library' apply from: "../../shared.gradle" dependencies { - implementation project(':brailleinterfaces') - implementation project(':brailletranslate') - implementation project(':proguard') - implementation project(':utils') + //implementation project(':brailleinterfaces') + //implementation project(':brailletranslate') + //implementation project(':proguard') + //implementation project(':utils') } diff --git a/build.gradle b/build.gradle index 53105a71f..5145db2ef 100644 --- a/build.gradle +++ b/build.gradle @@ -14,18 +14,18 @@ dependencies { buildscript { repositories { - jcenter() + mavenCentral() google() } dependencies { classpath 'org.aspectj:aspectjtools:1.8.1' - classpath 'com.android.tools.build:gradle:3.5.4' + classpath 'com.android.tools.build:gradle:3.6.4' } } allprojects { repositories { - jcenter() + mavenCentral() google() } } @@ -36,7 +36,8 @@ android { applicationId talkbackApplicationId versionName talkbackVersionName + "-" + BUILD_TIMESTAMP minSdkVersion 26 - targetSdkVersion 30 + targetSdk 33 + //noinspection ExpiredTargetSdkVersion testInstrumentationRunner 'android.test.InstrumentationTestRunner' multiDexEnabled true } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 000000000..41d9927a4 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..41dfb8790 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 000000000..1b6c78733 --- /dev/null +++ b/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 000000000..107acd32c --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle index 4ba1a344e..aa031581c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -12,8 +12,8 @@ include ':brailleime' project(':brailleime').projectDir = new File('braille/brailleime') include 'brailleimeanalytics' project(':brailleimeanalytics').projectDir = new File('braille/brailleimeanalytics') -include 'brailletranslate' -project(':brailletranslate').projectDir = new File('braille/translate') +//include 'brailletranslate' +//project(':brailletranslate').projectDir = new File('braille/translate') include 'brailledisplay' project(':brailledisplay').projectDir = new File('braille/brailledisplay') include 'brailledisplayanalytics' diff --git a/shared.gradle b/shared.gradle index 1cdba1a15..320d1b23a 100644 --- a/shared.gradle +++ b/shared.gradle @@ -30,32 +30,33 @@ dependencies { // Google common implementation 'com.google.guava:guava:31.0-jre' - implementation 'com.google.android.gms:play-services-mlkit-text-recognition:17.0.1' - implementation 'com.google.android.material:material:1.5.0' + implementation 'com.google.android.gms:play-services-mlkit-text-recognition:18.0.2' + implementation 'com.google.android.material:material:1.8.0' implementation 'com.google.android.play:core:1.10.3' // Support library - implementation 'androidx.annotation:annotation:1.2.0' - implementation 'androidx.appcompat:appcompat:1.3.1' - implementation 'androidx.collection:collection:1.1.0' - implementation 'androidx.core:core:1.6.0-alpha03' - implementation 'androidx.fragment:fragment:1.4.0-alpha08' - implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0' - implementation 'androidx.preference:preference:1.1.1' - implementation 'androidx.recyclerview:recyclerview:1.2.1' + implementation 'androidx.annotation:annotation:1.6.0' + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'androidx.collection:collection:1.2.0' + implementation 'androidx.core:core:1.12.0-alpha03' + implementation 'androidx.fragment:fragment:1.6.0-beta01' + implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0' + implementation 'androidx.preference:preference:1.2.0' + implementation 'androidx.recyclerview:recyclerview:1.3.0' implementation 'androidx.viewpager2:viewpager2:1.0.0' // Nullable - implementation 'org.checkerframework:checker-qual:2.8.1' + implementation 'org.checkerframework:checker-qual:3.13.0' // Auto-value implementation 'com.google.auto.value:auto-value-annotations:1.8.2' - annotationProcessor 'com.google.auto.value:auto-value:1.8.2' + annotationProcessor 'com.google.auto.value:auto-value:1.10.1' implementation 'javax.annotation:javax.annotation-api:1.3.2' - implementation 'androidx.wear:wear:1.2.0-rc01' + implementation 'androidx.wear:wear:1.3.0-alpha05' + //noinspection GradleCompatible implementation 'com.google.android.support:wearable:2.8.1' // UI understanding - implementation 'joda-time:joda-time:2.9.9' + implementation 'joda-time:joda-time:2.12.5' } diff --git a/uiunderstanding/src/main/java/com/google/android/accessibility/uiunderstanding/Event.java b/uiunderstanding/src/main/java/com/google/android/accessibility/uiunderstanding/Event.java index 30b983a69..1a4d8525c 100644 --- a/uiunderstanding/src/main/java/com/google/android/accessibility/uiunderstanding/Event.java +++ b/uiunderstanding/src/main/java/com/google/android/accessibility/uiunderstanding/Event.java @@ -56,6 +56,7 @@ public boolean equals(Object otherObj) { public int hashCode() { return Objects.hash(className, uptimeMillisec); } + //note: this is where I think that override begins @Override public String toString() {