Build changes for v3.1
- Provide a gradle wrapper
- Update dependency versions
- Move resources directly beneath src/main/res/
diff --git a/build.gradle b/build.gradle
index a79bb7b..27c9b7c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,9 +4,9 @@
google()
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.4.0'
- classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.8'
- classpath 'digital.wup:android-maven-publish:3.6.2'
+ classpath 'com.android.tools.build:gradle:3.5.3'
+ classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.11'
+ classpath 'digital.wup:android-maven-publish:3.6.3'
}
}
@@ -19,13 +19,10 @@
}
apply plugin: 'com.android.library'
-apply plugin: 'com.google.protobuf'
-apply plugin: 'digital.wup.android-maven-publish'
-apply plugin: 'maven-publish'
android {
- compileSdkVersion "android-29"
- buildToolsVersion "28.0.3"
+ compileSdkVersion 29
+ buildToolsVersion '29.0.3'
defaultConfig {
minSdkVersion 14
targetSdkVersion 29
@@ -39,9 +36,11 @@
}
}
+apply plugin: 'com.google.protobuf'
+
protobuf {
protoc {
- artifact = 'com.google.protobuf:protoc:3.7.1'
+ artifact = 'com.google.protobuf:protoc:3.11.4'
}
plugins {
javalite {
@@ -81,6 +80,8 @@
classifier "javadoc"
from javadoc
}
+apply plugin: 'digital.wup.android-maven-publish'
+apply plugin: 'maven-publish'
// Creates the artifacts for release to maven central.
publishing {
@@ -124,11 +125,11 @@
dependencies {
implementation 'com.google.protobuf:protobuf-lite:3.0.1'
implementation 'androidx.core:core:1.0.0'
- implementation 'com.google.guava:guava:27.1-android'
- implementation 'org.checkerframework:checker:2.8.0'
- implementation 'org.hamcrest:hamcrest-library:2.1'
- implementation 'org.hamcrest:hamcrest-core:2.1'
- implementation 'org.jsoup:jsoup:1.11.3'
+ implementation 'com.google.guava:guava:28.2-android'
+ implementation 'org.checkerframework:checker:3.1.1'
+ implementation 'org.hamcrest:hamcrest-library:2.2'
+ implementation 'org.hamcrest:hamcrest-core:2.2'
+ implementation 'org.jsoup:jsoup:1.12.2'
}
clean {
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..f6b961f
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..84337ad
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
diff --git a/gradlew b/gradlew
new file mode 100644
index 0000000..cccdd3d
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+## Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$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=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+ echo "$*"
+}
+
+die () {
+ echo
+ echo "$*"
+ echo
+ exit 1
+}
+
+# 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
+ ;;
+ 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" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ $? -eq 0 ] ; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+ ulimit -n $MAX_FD
+ if [ $? -ne 0 ] ; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+ fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+ APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+ CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+ JAVACMD=`cygpath --unix "$JAVACMD"`
+
+ # We build the pattern for arguments to be converted via cygpath
+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+ SEP=""
+ for dir in $ROOTDIRSRAW ; do
+ ROOTDIRS="$ROOTDIRS$SEP$dir"
+ SEP="|"
+ done
+ OURCYGPATTERN="(^($ROOTDIRS))"
+ # Add a user-defined pattern to the cygpath arguments
+ if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+ OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+ fi
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ i=0
+ for arg in "$@" ; do
+ CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+ CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
+
+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
+ eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+ else
+ eval `echo args$i`="\"$arg\""
+ fi
+ i=$((i+1))
+ done
+ case $i in
+ (0) set -- ;;
+ (1) set -- "$args0" ;;
+ (2) set -- "$args0" "$args1" ;;
+ (3) set -- "$args0" "$args1" "$args2" ;;
+ (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ esac
+fi
+
+# Escape application args
+save () {
+ for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+ echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+ cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..f955316
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,84 @@
+@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 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=
+
+@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 init
+
+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 init
+
+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
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+: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 %CMD_LINE_ARGS%
+
+: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/src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
similarity index 100%
rename from src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-ar/strings.xml
rename to src/main/res/values-ar/strings.xml
diff --git a/src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-b+es+419/strings.xml b/src/main/res/values-b+es+419/strings.xml
similarity index 100%
rename from src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-b+es+419/strings.xml
rename to src/main/res/values-b+es+419/strings.xml
diff --git a/src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
similarity index 100%
rename from src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-bg/strings.xml
rename to src/main/res/values-bg/strings.xml
diff --git a/src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
similarity index 100%
rename from src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-ca/strings.xml
rename to src/main/res/values-ca/strings.xml
diff --git a/src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
similarity index 100%
rename from src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-cs/strings.xml
rename to src/main/res/values-cs/strings.xml
diff --git a/src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-da/strings.xml b/src/main/res/values-da/strings.xml
similarity index 100%
rename from src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-da/strings.xml
rename to src/main/res/values-da/strings.xml
diff --git a/src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
similarity index 100%
rename from src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-de/strings.xml
rename to src/main/res/values-de/strings.xml
diff --git a/src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
similarity index 100%
rename from src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-el/strings.xml
rename to src/main/res/values-el/strings.xml
diff --git a/src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-en-rGB/strings.xml b/src/main/res/values-en-rGB/strings.xml
similarity index 100%
rename from src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-en-rGB/strings.xml
rename to src/main/res/values-en-rGB/strings.xml
diff --git a/src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
similarity index 100%
rename from src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-es/strings.xml
rename to src/main/res/values-es/strings.xml
diff --git a/src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-fi/strings.xml b/src/main/res/values-fi/strings.xml
similarity index 100%
rename from src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-fi/strings.xml
rename to src/main/res/values-fi/strings.xml
diff --git a/src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-fil/strings.xml b/src/main/res/values-fil/strings.xml
similarity index 100%
rename from src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-fil/strings.xml
rename to src/main/res/values-fil/strings.xml
diff --git a/src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
similarity index 100%
rename from src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-fr/strings.xml
rename to src/main/res/values-fr/strings.xml
diff --git a/src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-hi/strings.xml b/src/main/res/values-hi/strings.xml
similarity index 100%
rename from src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-hi/strings.xml
rename to src/main/res/values-hi/strings.xml
diff --git a/src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-hr/strings.xml b/src/main/res/values-hr/strings.xml
similarity index 100%
rename from src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-hr/strings.xml
rename to src/main/res/values-hr/strings.xml
diff --git a/src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
similarity index 100%
rename from src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-hu/strings.xml
rename to src/main/res/values-hu/strings.xml
diff --git a/src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-id/strings.xml b/src/main/res/values-id/strings.xml
similarity index 100%
rename from src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-id/strings.xml
rename to src/main/res/values-id/strings.xml
diff --git a/src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
similarity index 100%
rename from src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-it/strings.xml
rename to src/main/res/values-it/strings.xml
diff --git a/src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
similarity index 100%
rename from src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-iw/strings.xml
rename to src/main/res/values-iw/strings.xml
diff --git a/src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
similarity index 100%
rename from src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-ja/strings.xml
rename to src/main/res/values-ja/strings.xml
diff --git a/src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
similarity index 100%
rename from src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-ko/strings.xml
rename to src/main/res/values-ko/strings.xml
diff --git a/src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-lt/strings.xml b/src/main/res/values-lt/strings.xml
similarity index 100%
rename from src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-lt/strings.xml
rename to src/main/res/values-lt/strings.xml
diff --git a/src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-lv/strings.xml b/src/main/res/values-lv/strings.xml
similarity index 100%
rename from src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-lv/strings.xml
rename to src/main/res/values-lv/strings.xml
diff --git a/src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
similarity index 100%
rename from src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-nl/strings.xml
rename to src/main/res/values-nl/strings.xml
diff --git a/src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-no/strings.xml b/src/main/res/values-no/strings.xml
similarity index 100%
rename from src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-no/strings.xml
rename to src/main/res/values-no/strings.xml
diff --git a/src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
similarity index 100%
rename from src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-pl/strings.xml
rename to src/main/res/values-pl/strings.xml
diff --git a/src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
similarity index 100%
rename from src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-pt-rBR/strings.xml
rename to src/main/res/values-pt-rBR/strings.xml
diff --git a/src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-pt-rPT/strings.xml b/src/main/res/values-pt-rPT/strings.xml
similarity index 100%
rename from src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-pt-rPT/strings.xml
rename to src/main/res/values-pt-rPT/strings.xml
diff --git a/src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-ro/strings.xml b/src/main/res/values-ro/strings.xml
similarity index 100%
rename from src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-ro/strings.xml
rename to src/main/res/values-ro/strings.xml
diff --git a/src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
similarity index 100%
rename from src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-ru/strings.xml
rename to src/main/res/values-ru/strings.xml
diff --git a/src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
similarity index 100%
rename from src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-sk/strings.xml
rename to src/main/res/values-sk/strings.xml
diff --git a/src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-sl/strings.xml b/src/main/res/values-sl/strings.xml
similarity index 100%
rename from src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-sl/strings.xml
rename to src/main/res/values-sl/strings.xml
diff --git a/src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
similarity index 100%
rename from src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-sr/strings.xml
rename to src/main/res/values-sr/strings.xml
diff --git a/src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
similarity index 100%
rename from src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-sv/strings.xml
rename to src/main/res/values-sv/strings.xml
diff --git a/src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-th/strings.xml b/src/main/res/values-th/strings.xml
similarity index 100%
rename from src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-th/strings.xml
rename to src/main/res/values-th/strings.xml
diff --git a/src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml
similarity index 100%
rename from src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-tr/strings.xml
rename to src/main/res/values-tr/strings.xml
diff --git a/src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
similarity index 100%
rename from src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-uk/strings.xml
rename to src/main/res/values-uk/strings.xml
diff --git a/src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml
similarity index 100%
rename from src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-vi/strings.xml
rename to src/main/res/values-vi/strings.xml
diff --git a/src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
similarity index 100%
rename from src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-zh-rCN/strings.xml
rename to src/main/res/values-zh-rCN/strings.xml
diff --git a/src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
similarity index 100%
rename from src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values-zh-rTW/strings.xml
rename to src/main/res/values-zh-rTW/strings.xml
diff --git a/src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values/strings.xml b/src/main/res/values/strings.xml
similarity index 100%
rename from src/main/res/com/google/android/apps/common/testing/accessibility/framework/res/values/strings.xml
rename to src/main/res/values/strings.xml
