From 329ab18962431938463f965877effdfed62efe9d Mon Sep 17 00:00:00 2001
From: Kyle Falconer <kyle_falconer@vuzix.com>
Date: Wed, 28 Sep 2022 11:50:19 -0700
Subject: [PATCH 1/2] update gradle and add gitignore

---
 .gitignore                     | 40 ++++++++++++++++++++++++++++++++++
 braille/translate/build.gradle |  4 ++--
 build.gradle                   |  9 ++++----
 gradle.properties              |  2 +-
 4 files changed, 47 insertions(+), 8 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..fe9572a84
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,40 @@
+# Gradle files
+.gradle/
+gradle/ 
+build/
+ndkBuild/
+gradlew*
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Log/OS Files
+*.log
+
+# Android Studio generated files and folders
+captures/
+.externalNativeBuild/
+.cxx/
+*.apk
+output.json
+
+# IntelliJ
+*.iml
+.idea/
+misc.xml
+deploymentTargetDropDown.xml
+render.experimental.xml
+
+# Keystore files
+*.jks
+*.keystore
+
+# Google Services (e.g. APIs or Firebase)
+google-services.json
+
+# Android Profiling
+*.hprof
+
+# build output files
+*.zip
+*.jar
\ No newline at end of file
diff --git a/braille/translate/build.gradle b/braille/translate/build.gradle
index 7844d16e3..fed128a98 100644
--- a/braille/translate/build.gradle
+++ b/braille/translate/build.gradle
@@ -16,8 +16,8 @@ dependencies {
 }
 
 task createTranslationTablesZip(type: Zip){
-    archiveName="translationtables.zip"
-    destinationDir = file('src/phone/res/raw/')
+    archiveFileName = "translationtables.zip"
+    destinationDirectory = file('src/phone/res/raw/')
     from fileTree('./src/phone/tables/')
     into('liblouis/tables')
 }
diff --git a/build.gradle b/build.gradle
index ea65ec830..a1d99bf4e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,30 +14,29 @@ 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:4.2.2'
     }
 }
 
 allprojects {
     repositories {
-        jcenter()
+        mavenCentral()
         google()
     }
 }
 
 android {
-    buildToolsVersion '29.0.0'
     defaultConfig {
         applicationId talkbackApplicationId
         versionName talkbackVersionName + "-" + BUILD_TIMESTAMP
         manifestPlaceholders = [talkbackMainPermission:talkbackMainPermission]
         minSdkVersion 26
-        targetSdkVersion 30
+        targetSdkVersion 33
         testInstrumentationRunner 'android.test.InstrumentationTestRunner'
         multiDexEnabled true
     }
diff --git a/gradle.properties b/gradle.properties
index 4545319f7..6e49cbd7b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,4 +3,4 @@ android.enableJetifier = true
 org.gradle.jvmargs=-Xms512M -Xmx8G
 
 ## Prevents "Execution failed for JetifyTransform, failed to transform"
-android.jetifier.blacklist=proguard.jar
+android.jetifier.ignorelist=proguard.jar

From 60075d863363e8d361d0c58d6671d5db31dd2baf Mon Sep 17 00:00:00 2001
From: Kyle Falconer <kyle_falconer@vuzix.com>
Date: Wed, 28 Sep 2022 12:25:03 -0700
Subject: [PATCH 2/2] Upgrade AGP to 7.3.0

---
 build.gradle                                                  | 3 ++-
 compositor/build.gradle                                       | 4 ++++
 compositor/src/main/AndroidManifest.xml                       | 2 +-
 src/main/AndroidManifest.xml                                  | 4 +---
 talkback/build.gradle                                         | 2 ++
 talkback/src/main/AndroidManifest.xml                         | 3 +--
 .../accessibility/talkback/gesture/GestureHistory.java        | 2 +-
 .../accessibility/talkback/labeling/CustomLabelManager.java   | 2 +-
 .../talkback/labeling/LabelManagerSummaryActivity.java        | 2 +-
 .../accessibility/talkback/labeling/LabelProvider.java        | 2 +-
 talkback/src/wear/AndroidManifest.xml                         | 3 +--
 uiunderstanding/build.gradle                                  | 3 +++
 uiunderstanding/src/main/AndroidManifest.xml                  | 2 +-
 utils/build.gradle                                            | 2 ++
 utils/src/main/AndroidManifest.xml                            | 2 +-
 15 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/build.gradle b/build.gradle
index a1d99bf4e..e74034e74 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,7 +19,7 @@ buildscript {
     }
     dependencies {
         classpath 'org.aspectj:aspectjtools:1.8.1'
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.3.0'
     }
 }
 
@@ -48,6 +48,7 @@ android {
         checkReleaseBuilds false
         abortOnError false
     }
+    namespace 'com.android.talkback'
     productFlavors {
         phone {
             dimension "target"
diff --git a/compositor/build.gradle b/compositor/build.gradle
index d7e5d148d..a0ca38d5b 100644
--- a/compositor/build.gradle
+++ b/compositor/build.gradle
@@ -1,6 +1,10 @@
 apply plugin: 'com.android.library'
 apply from: "../shared.gradle"
 
+android {
+    namespace 'com.google.android.accessibility.compositor'
+}
+
 dependencies {
     implementation project(':proguard')
     implementation project(':uiunderstanding')
diff --git a/compositor/src/main/AndroidManifest.xml b/compositor/src/main/AndroidManifest.xml
index 19994ed64..8072ee00d 100644
--- a/compositor/src/main/AndroidManifest.xml
+++ b/compositor/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.google.android.accessibility.compositor" />
+<manifest />
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 1a1c1e28a..c737ef801 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-  <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.talkback"
-    >
+  <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
   <!-- Strings with the format ${foo}, such as ${applicationId}, are called
   placeholders, and they get replaced by the build system with the appropriate
diff --git a/talkback/build.gradle b/talkback/build.gradle
index 3c1625beb..0d7fb511f 100644
--- a/talkback/build.gradle
+++ b/talkback/build.gradle
@@ -14,6 +14,8 @@ dependencies {
 def talkbackMainPermission = '"com.android.talkback.permission.TALKBACK"'
 
 android {
+
+    namespace 'com.google.android.accessibility.talkback'
     defaultConfig {
         buildConfigField("String", "TALKBACK_MAIN_PERMISSION", talkbackMainPermission)
     }
diff --git a/talkback/src/main/AndroidManifest.xml b/talkback/src/main/AndroidManifest.xml
index cd55c327d..916981f19 100644
--- a/talkback/src/main/AndroidManifest.xml
+++ b/talkback/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.google.android.accessibility.talkback">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <!-- Strings with the format ${foo}, such as ${applicationId}, are called
     placeholders, and they get replaced by the build system with the appropriate
diff --git a/talkback/src/main/java/com/google/android/accessibility/talkback/gesture/GestureHistory.java b/talkback/src/main/java/com/google/android/accessibility/talkback/gesture/GestureHistory.java
index a2c490136..3ec68bdb7 100644
--- a/talkback/src/main/java/com/google/android/accessibility/talkback/gesture/GestureHistory.java
+++ b/talkback/src/main/java/com/google/android/accessibility/talkback/gesture/GestureHistory.java
@@ -104,7 +104,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) {
diff --git a/talkback/src/main/java/com/google/android/accessibility/talkback/labeling/CustomLabelManager.java b/talkback/src/main/java/com/google/android/accessibility/talkback/labeling/CustomLabelManager.java
index a737eada9..23c43441f 100644
--- a/talkback/src/main/java/com/google/android/accessibility/talkback/labeling/CustomLabelManager.java
+++ b/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
diff --git a/talkback/src/main/java/com/google/android/accessibility/talkback/labeling/LabelManagerSummaryActivity.java b/talkback/src/main/java/com/google/android/accessibility/talkback/labeling/LabelManagerSummaryActivity.java
index 3c0e300bb..885ecea06 100644
--- a/talkback/src/main/java/com/google/android/accessibility/talkback/labeling/LabelManagerSummaryActivity.java
+++ b/talkback/src/main/java/com/google/android/accessibility/talkback/labeling/LabelManagerSummaryActivity.java
@@ -60,7 +60,7 @@ public class LabelManagerSummaryActivity extends BasePreferencesActivity
 
   /** 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 RecyclerView packageList;
   private PackageLabelInfoAdapter packageLabelInfoAdapter;
diff --git a/talkback/src/main/java/com/google/android/accessibility/talkback/labeling/LabelProvider.java b/talkback/src/main/java/com/google/android/accessibility/talkback/labeling/LabelProvider.java
index bf4662ed5..98856a436 100644
--- a/talkback/src/main/java/com/google/android/accessibility/talkback/labeling/LabelProvider.java
+++ b/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();
diff --git a/talkback/src/wear/AndroidManifest.xml b/talkback/src/wear/AndroidManifest.xml
index 6eb778be7..6b4e4103b 100644
--- a/talkback/src/wear/AndroidManifest.xml
+++ b/talkback/src/wear/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.google.android.accessibility.talkback">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-sdk
         android:minSdkVersion="28"/>
diff --git a/uiunderstanding/build.gradle b/uiunderstanding/build.gradle
index 7c963ba30..8bb216654 100644
--- a/uiunderstanding/build.gradle
+++ b/uiunderstanding/build.gradle
@@ -1,3 +1,6 @@
 apply plugin: 'com.android.library'
 apply from: "../shared.gradle"
 
+android {
+    namespace 'com.google.android.accessibility.uiunderstanding'
+}
\ No newline at end of file
diff --git a/uiunderstanding/src/main/AndroidManifest.xml b/uiunderstanding/src/main/AndroidManifest.xml
index ceb82e4e5..8072ee00d 100644
--- a/uiunderstanding/src/main/AndroidManifest.xml
+++ b/uiunderstanding/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.google.android.accessibility.uiunderstanding" />
+<manifest />
diff --git a/utils/build.gradle b/utils/build.gradle
index 36511e261..5be981357 100644
--- a/utils/build.gradle
+++ b/utils/build.gradle
@@ -8,6 +8,8 @@ dependencies {
 }
 
 android {
+
+    namespace 'com.google.android.accessibility.utils'
     defaultConfig {
         buildConfigField("String", "TALKBACK_APPLICATION_ID", '"' + talkbackApplicationId + '"')
     }
diff --git a/utils/src/main/AndroidManifest.xml b/utils/src/main/AndroidManifest.xml
index 93dae81ac..8072ee00d 100644
--- a/utils/src/main/AndroidManifest.xml
+++ b/utils/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.google.android.accessibility.utils" />
+<manifest />