Build changes

.github/dependabot.yml

@@ -0,0 +1,12 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: "/"
+    schedule:
+      interval: daily
+    target-branch: main
+  - package-ecosystem: gradle
+    directory: "/"
+    schedule:
+      interval: daily
+    target-branch: main

.github/workflows/build.yml

@@ -0,0 +1,21 @@
+name: Build application
+
+on:
+  pull_request:
+  push:
+    branches: [main]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 17
+        uses: actions/[email protected]
+        with:
+          distribution: 'temurin'
+          java-version: 17
+          cache: gradle
+      - name: Build with Gradle
+        run: ./gradlew build --no-daemon

.github/workflows/validate-gradle-wrapper.yml

@@ -0,0 +1,10 @@
+name: "Validate Gradle Wrapper"
+on: [push, pull_request]
+
+jobs:
+  validation:
+    name: "Validation"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: gradle/wrapper-validation-action@v1

brailleime/src/main/AndroidManifest.xml

@@ -4,8 +4,8 @@
     package="com.google.android.accessibility.brailleime">
 
   <uses-sdk
-      android:minSdkVersion="23"
-      android:targetSdkVersion="30" />
+      android:minSdkVersion="26"
+      android:targetSdkVersion="31" />
 
   <!-- Required for haptic feedback. -->
   <uses-permission android:name="android.permission.VIBRATE" />
@@ -16,7 +16,8 @@
         android:label="@string/braille_ime_service_name"
         android:enabled="false"
         android:directBootAware="true"
-        android:permission="android.permission.BIND_INPUT_METHOD">
+        android:permission="android.permission.BIND_INPUT_METHOD"
+        android:exported="true">
       <intent-filter>
         <action android:name="android.view.InputMethod" />
       </intent-filter>

build.gradle

@@ -12,30 +12,30 @@ dependencies {
 
 buildscript {
     repositories {
-        jcenter()
+        mavenCentral()
         google()
     }
     dependencies {
-        classpath 'org.aspectj:aspectjtools:1.8.1'
-        classpath 'com.android.tools.build:gradle:3.5.4'
+        classpath 'org.aspectj:aspectjtools:1.9.7'
+        classpath 'com.android.tools.build:gradle:7.0.3'
     }
 }
 
 allprojects {
     repositories {
-        jcenter()
+        mavenCentral()
         google()
     }
 }
 
 android {
-    buildToolsVersion '29.0.0'
+    buildToolsVersion '31.0.0'
     defaultConfig {
         applicationId talkbackApplicationId
         versionName talkbackVersionName
         manifestPlaceholders = [talkbackMainPermission:talkbackMainPermission]
         minSdkVersion 26
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 370044210
         versionName "2021-04-23"
         testInstrumentationRunner 'android.test.InstrumentationTestRunner'

gradle.properties

@@ -1,3 +1,3 @@
-android.useAndroidX = true
-android.enableJetifier = true
-org.gradle.jvmargs=-Xms512M -Xmx8G
+android.useAndroidX=true
+android.enableJetifier=true
+org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
+distributionSha256Sum=de8f52ad49bdc759164f72439a3bf56ddb1589c4cde802d3cec7d6ad0e0ee410
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

proguard/build.gradle

@@ -1 +1,4 @@
 apply plugin: 'java-library'
+
+sourceCompatibility = 11
+targetCompatibility = 11

shared.gradle

@@ -6,40 +6,43 @@ ext {
 }
 
 android {
-    compileSdkVersion 'android-30'
+    compileSdkVersion 'android-31'
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
     defaultConfig {
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled true
-        minSdkVersion 23
+        minSdkVersion 26
+    }
+    lintOptions {
+        abortOnError false
     }
 }
 
 dependencies {
 
     // Google common
-    implementation 'com.google.guava:guava:22.0'
-    implementation 'com.google.android.material:material:1.1.0'
+    implementation 'com.google.guava:guava:31.0.1-jre'
+    implementation 'com.google.android.material:material:1.4.0'
 
     // Support library
-    implementation 'androidx.annotation:annotation:1.1.0'
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.annotation:annotation:1.3.0'
+    implementation 'androidx.appcompat:appcompat:1.4.0'
     implementation 'androidx.collection:collection:1.1.0'
-    implementation 'androidx.core:core:1.5.0-alpha01'
-    implementation 'androidx.fragment:fragment:1.2.0-rc03'
+    implementation 'androidx.core:core:1.7.0'
+    implementation 'androidx.fragment:fragment:1.4.0'
     implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
-    implementation 'androidx.preference:preference:1.1.0'
-    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'androidx.preference:preference:1.1.1'
+    implementation 'androidx.recyclerview:recyclerview:1.2.0'
     implementation 'androidx.viewpager2:viewpager2:1.0.0'
 
     // Nullable
-    implementation 'org.checkerframework:checker-qual:2.5.8'
+    implementation 'org.checkerframework:checker-qual:3.19.0'
 
     // Auto-value
-    api 'com.google.auto.value:auto-value-annotations:1.7'
-    annotationProcessor 'com.google.auto.value:auto-value:1.7'
+    api 'com.google.auto.value:auto-value-annotations:1.8.2'
+    annotationProcessor 'com.google.auto.value:auto-value:1.8.2'
     implementation 'javax.annotation:javax.annotation-api:1.3.2'
 }

talkback/src/main/AndroidManifest.xml

@@ -76,6 +76,7 @@
         android:required="false" />
 
     <application
+        android:label="@string/app_name"
         android:supportsRtl="true">
 
         <receiver android:name="com.google.android.accessibility.talkback.BootReceiver"

talkback/src/main/java/com/google/android/accessibility/talkback/gesture/GestureHistory.java

@@ -114,7 +114,7 @@ private static class FileUtil {
     private static final String FILE_FOLDER_NAME = "Gesture";
     private static final String FILE_NAME = "gesture.log";
     private static final String FILE_AUTHORITY =
-        BuildConfig.APPLICATION_ID + ".providers.FileProvider";
+        BuildConfig.LIBRARY_PACKAGE_NAME + ".providers.FileProvider";
 
     /** Writes gesture data into a file and return the file uri. */
     public static Uri writeFile(Context context, Deque<GestureInfo> gestureInfos) {

talkback/src/main/java/com/google/android/accessibility/talkback/labeling/CustomLabelManager.java

@@ -76,7 +76,7 @@ public class CustomLabelManager implements LabelManager, AccessibilityEventListe
   public static final String EXTRA_STRING_ARRAY_PACKAGES = "EXTRA_STRING_ARRAY_PACKAGES";
 
   @VisibleForTesting
-  static final String AUTHORITY = BuildConfig.APPLICATION_ID + ".providers.LabelProvider";
+  static final String AUTHORITY = BuildConfig.LIBRARY_PACKAGE_NAME + ".providers.LabelProvider";
 
   /**
    * The substring separating a label's package and view ID name in a fully-qualified resource

talkback/src/main/java/com/google/android/accessibility/talkback/labeling/LabelManagerSummaryActivity.java

@@ -59,7 +59,7 @@ public class LabelManagerSummaryActivity extends AppCompatActivity implements On
 
   /** File provider for custom label share intent. */
   private static final String FILE_AUTHORITY =
-      BuildConfig.APPLICATION_ID + ".providers.FileProvider";
+      BuildConfig.LIBRARY_PACKAGE_NAME + ".providers.FileProvider";
 
   private LabelProviderClient labelProviderClient;
   private ListView packageList;

talkback/src/main/java/com/google/android/accessibility/talkback/labeling/LabelProvider.java

@@ -47,7 +47,7 @@ public class LabelProvider extends ContentProvider {
 
   private static final String TAG = "LabelProvider";
 
-  public static final String AUTHORITY = BuildConfig.APPLICATION_ID + ".providers.LabelProvider";
+  public static final String AUTHORITY = BuildConfig.LIBRARY_PACKAGE_NAME + ".providers.LabelProvider";
   static final String LABELS_PATH = "labels";
   static final Uri LABELS_CONTENT_URI =
       new Uri.Builder().scheme("content").authority(AUTHORITY).path(LABELS_PATH).build();

talkback/src/main/res/values/strings.xml

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <!-- To aid tooling, any string-containing xml file in this project should have a filename beginning with "strings" -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name">TalkBack</string>
 
     <!--The human-readable name of this service. Do not translate. -->
-    <string name="talkback_title" translatable="false">TalkBack_TfP</string>
+    <string name="talkback_title" translatable="false">TalkBack</string>
 
     <!--
       Source: A brief description of TalkBack.

utils/src/main/java/com/google/android/libraries/accessibility/utils/screencapture/AndroidManifest.xml

@@ -4,8 +4,8 @@
     android:versionName="1.0.0" >
 
     <uses-sdk
-        android:minSdkVersion="22"
-        android:targetSdkVersion="22" />
+        android:minSdkVersion="26"
+        android:targetSdkVersion="31" />
 
     <application>