Upgrade project's build-time dependencies

braille/brailledisplay/build.gradle

@@ -10,3 +10,5 @@ dependencies {
     implementation project(':brailletranslate')
     implementation project(':braillecommon')
 }
+
+android.namespace 'com.google.android.accessibility.braille.brailledisplay'

braille/brailledisplay/src/main/AndroidManifest.xml

@@ -1,4 +1,2 @@
 <?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.braille.brailledisplay" />
+<manifest />

braille/brailledisplay/src/phone/AndroidManifest.xml

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.android.accessibility.braille.brailledisplay">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <uses-sdk android:targetSdkVersion="31" />
 
-  <uses-sdk
-      android:minSdkVersion="26"
-      android:targetSdkVersion="31" />
   <uses-permission android:name="android.permission.WAKE_LOCK" />
   <!-- If you need access to FINE location, you must request both ACCESS_FINE_LOCATION and ACCESS_COARSE_LOCATION. -->
   <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"  android:maxSdkVersion="30" />

braille/brailledisplay/src/phone/java/com/google/android/accessibility/braille/brailledisplay/OverlayDisplay.java

@@ -256,7 +256,7 @@ protected void handleMessage(Message msg, OverlayDisplay parent) {
       new OnSharedPreferenceChangeListener() {
         @Override
         public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-          if (context.getString(R.string.pref_braille_overlay_key).equals(key)) {
+          if (context.getString(com.google.android.accessibility.braille.common.R.string.pref_braille_overlay_key).equals(key)) {
             displayThreadHandler.reportPreferenceChange();
           }
         }

braille/brailledisplay/src/phone/java/com/google/android/accessibility/braille/brailledisplay/controller/AutoScrollManager.java

@@ -173,12 +173,12 @@ private int getDuration() {
 
   private final OnSharedPreferenceChangeListener onSharedPreferenceChangeListener =
       (SharedPreferences sharedPreferences, String key) -> {
-        if (key.equals(context.getString(R.string.pref_bd_auto_scroll_duration_key))) {
+        if (key.equals(context.getString(com.google.android.accessibility.braille.common.R.string.pref_bd_auto_scroll_duration_key))) {
           handler.removeCallbacksAndMessages(/* token= */ null);
           duration = BrailleUserPreferences.readAutoScrollDuration(context);
           handler.postDelayed(runnable, getDuration());
         } else if (key.equals(
-            context.getString(R.string.pref_bd_auto_adjust_duration_enable_key))) {
+            context.getString(com.google.android.accessibility.braille.common.R.string.pref_bd_auto_adjust_duration_enable_key))) {
           autoAdjustDurationEnabled = BrailleUserPreferences.readAutoAdjustDurationEnable(context);
         }
       };

braille/brailledisplay/src/phone/java/com/google/android/accessibility/braille/brailledisplay/controller/TranslatorManager.java

@@ -20,7 +20,6 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import com.google.android.accessibility.braille.brailledisplay.R;
 import com.google.android.accessibility.braille.common.BrailleUserPreferences;
 import com.google.android.accessibility.braille.common.translate.BrailleLanguages.Code;
 import com.google.android.accessibility.braille.translate.BrailleTranslator;
@@ -118,11 +117,11 @@ public BrailleTranslator getInputTranslator() {
 
   @Override
   public void onSharedPreferenceChanged(SharedPreferences prefs, String key) {
-    if (context.getString(R.string.pref_bd_output_code).equals(key)) {
+    if (context.getString(com.google.android.accessibility.braille.common.R.string.pref_bd_output_code).equals(key)) {
       updateOutputTranslators();
-    } else if (context.getString(R.string.pref_brailleime_translator_code).equals(key)) {
+    } else if (context.getString(com.google.android.accessibility.braille.common.R.string.pref_brailleime_translator_code).equals(key)) {
       updateInputTranslator();
-    } else if (context.getString(R.string.pref_braille_contracted_mode).equals(key)) {
+    } else if (context.getString(com.google.android.accessibility.braille.common.R.string.pref_braille_contracted_mode).equals(key)) {
       updateOutputTranslators();
       updateInputTranslator();
     }

braille/brailledisplay/src/phone/java/com/google/android/accessibility/braille/brailledisplay/controller/utils/BrailleKeyBindingUtils.java

@@ -100,7 +100,7 @@ public static String getFriendlyKeyNamesForCommand(
   private static String getDotsDescription(Resources resources, BrailleCharacter brailleCharacter) {
     String dotsString = changeToSentence(resources, brailleCharacter.toLocaleString().split(""));
     return resources.getQuantityString(
-        R.plurals.braille_dots, brailleCharacter.getOnCount(), dotsString);
+            com.google.android.accessibility.braille.common.R.plurals.braille_dots, brailleCharacter.getOnCount(), dotsString);
   }
 
   /** Compose words to a sentence. Example: "abcd" -> "a, b, c and d". */
@@ -109,7 +109,7 @@ private static String changeToSentence(Resources resources, String[] words) {
       StringBuilder sentence = new StringBuilder();
       sentence.append(words[0]);
       for (int i = 1; i < words.length - 1; i++) {
-        sentence.append(resources.getString(R.string.split_comma, words[i]));
+        sentence.append(resources.getString(com.google.android.accessibility.braille.common.R.string.split_comma, words[i]));
       }
       return resources.getString(R.string.bd_commands_delimiter, sentence, words[words.length - 1]);
     } else {

braille/brailledisplay/src/phone/java/com/google/android/accessibility/braille/brailledisplay/settings/AdvancedSettingsActivity.java

@@ -40,9 +40,9 @@ public void onCreatePreferences(Bundle bundle, String rootKey) {
       PreferenceSettingsUtils.addPreferencesFromResource(
           this, R.xml.bd_advanced_settings_preferences);
       timedMessageDurationPreference =
-          findPreference(getString(R.string.pref_bd_timed_message_duration_fraction_key));
+          findPreference(getString(com.google.android.accessibility.braille.common.R.string.pref_bd_timed_message_duration_fraction_key));
       blinkingIntervalPreference =
-          findPreference(getString(R.string.pref_bd_blinking_interval_key));
+          findPreference(getString(com.google.android.accessibility.braille.common.R.string.pref_bd_blinking_interval_key));
       getPreferenceManager()
           .getSharedPreferences()
           .registerOnSharedPreferenceChangeListener(onSharedPreferenceChangeListener);
@@ -93,14 +93,14 @@ private int getQuantity(float number) {
 
     private final OnSharedPreferenceChangeListener onSharedPreferenceChangeListener =
         (sharedPreferences, key) -> {
-          if (key.equals(getString(R.string.pref_bd_blinking_interval_key))) {
+          if (key.equals(getString(com.google.android.accessibility.braille.common.R.string.pref_bd_blinking_interval_key))) {
             BrailleDisplayAnalytics.getInstance(getContext())
                 .logBlinkRate(BrailleUserPreferences.readBlinkingIntervalMs(getContext()));
-          } else if (key.equals(getString(R.string.pref_bd_reverse_panning_buttons))) {
+          } else if (key.equals(getString(com.google.android.accessibility.braille.common.R.string.pref_bd_reverse_panning_buttons))) {
             BrailleDisplayAnalytics.getInstance(getContext())
                 .logReversePanningKey(
                     BrailleUserPreferences.readReversePanningButtons(getContext()));
-          } else if (key.equals(getString(R.string.pref_bd_timed_message_duration_fraction_key))) {
+          } else if (key.equals(getString(com.google.android.accessibility.braille.common.R.string.pref_bd_timed_message_duration_fraction_key))) {
             int durationMs =
                 Math.round(
                     Float.parseFloat(

braille/brailledisplay/src/phone/java/com/google/android/accessibility/braille/brailledisplay/settings/AutoScrollActivity.java

@@ -57,7 +57,7 @@ public void onPause() {
 
     private final OnSharedPreferenceChangeListener onSharedPreferenceChangeListener =
         (SharedPreferences sharedPreferences, String key) -> {
-          if (key.equals(getString(R.string.pref_bd_auto_scroll_duration_key))) {
+          if (key.equals(getString(com.google.android.accessibility.braille.common.R.string.pref_bd_auto_scroll_duration_key))) {
             refresh();
           }
         };

braille/brailledisplay/src/phone/java/com/google/android/accessibility/braille/brailledisplay/settings/BrailleDisplaySettingsFragment.java

@@ -151,13 +151,13 @@ public boolean onPreferenceClick(Preference preference) {
         findPreference(getString(R.string.pref_key_bd_connection_category));
 
     preferredCodesPreference =
-        findPreference(getString(R.string.pref_brailleime_translator_codes_preferred));
+        findPreference(getString(com.google.android.accessibility.braille.common.R.string.pref_brailleime_translator_codes_preferred));
     preferredCodesPreference.setIntent(new Intent(getContext(), BrailleLanguagesActivity.class));
 
-    currentActiveOutputCodePreference = findPreference(getString(R.string.pref_bd_output_code));
+    currentActiveOutputCodePreference = findPreference(getString(com.google.android.accessibility.braille.common.R.string.pref_bd_output_code));
     currentActiveInputCodePreference =
-        findPreference(getString(R.string.pref_brailleime_translator_code));
-    brailleGradePreference = findPreference(getString(R.string.pref_braille_contracted_mode));
+        findPreference(getString(com.google.android.accessibility.braille.common.R.string.pref_brailleime_translator_code));
+    brailleGradePreference = findPreference(getString(com.google.android.accessibility.braille.common.R.string.pref_braille_contracted_mode));
     brailleGradePreference.setIntent(new Intent(getContext(), BrailleGradeActivity.class));
 
     keyBindingsPreference = findPreference(getString(R.string.pref_key_bindings_key));
@@ -798,12 +798,12 @@ public void onOutputCodeChanged() {
       new OnSharedPreferenceChangeListener() {
         @Override
         public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-          if (key.equals(getString(R.string.pref_bd_output_code))) {
+          if (key.equals(getString(com.google.android.accessibility.braille.common.R.string.pref_bd_output_code))) {
             BrailleDisplayAnalytics.getInstance(getContext())
                 .logBrailleOutputCodeSetting(
                     BrailleUserPreferences.readCurrentActiveOutputCodeAndCorrect(getContext()),
                     BrailleUserPreferences.readContractedMode(getContext()));
-          } else if (key.equals(getString(R.string.pref_brailleime_translator_code))) {
+          } else if (key.equals(getString(com.google.android.accessibility.braille.common.R.string.pref_brailleime_translator_code))) {
             BrailleDisplayAnalytics.getInstance(getContext())
                 .logBrailleInputCodeSetting(
                     BrailleUserPreferences.readCurrentActiveInputCodeAndCorrect(getContext()),
@@ -814,7 +814,7 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
           } else if (key.equals(getString(R.string.pref_key_bd_enabler))) {
             BrailleDisplayAnalytics.getInstance(getContext())
                 .logEnablerSetting(PersistentStorage.isConnectionEnabledByUser(getContext()));
-          } else if (key.equals(getString(R.string.pref_braille_contracted_mode))) {
+          } else if (key.equals(getString(com.google.android.accessibility.braille.common.R.string.pref_braille_contracted_mode))) {
             updateBrailleGradeSummary();
           }
         }

braille/brailledisplay/src/phone/java/com/google/android/accessibility/braille/brailledisplay/settings/BrailleGradeActivity.java

@@ -96,7 +96,7 @@ private void onModelChanged() {
         new OnSharedPreferenceChangeListener() {
           @Override
           public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-            if (key.equals(getString(R.string.pref_braille_contracted_mode))) {
+            if (key.equals(getString(com.google.android.accessibility.braille.common.R.string.pref_braille_contracted_mode))) {
               onModelChanged();
             }
           }

braille/brailledisplayanalytics/build.gradle

@@ -4,3 +4,5 @@ apply from: "../../shared.gradle"
 dependencies {
     implementation project(':braillecommon')
 }
+
+android.namespace 'com.google.android.accessibility.braille.brailledisplay.analytics'

braille/brailledisplayanalytics/src/main/AndroidManifest.xml

@@ -1,4 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.android.accessibility.braille.brailledisplay.analytics">
-</manifest>
+<manifest />

braille/brailleime/build.gradle

@@ -8,3 +8,5 @@ dependencies {
     implementation project(':brailleimeanalytics')
     implementation project(':brailletranslate')
 }
+
+android.namespace 'com.google.android.accessibility.brailleime'

braille/brailleime/src/main/AndroidManifest.xml

@@ -1,4 +1,2 @@
 <?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.brailleime" />
+<manifest />

braille/brailleime/src/phone/AndroidManifest.xml

@@ -1,11 +1,8 @@
 <?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.brailleime">
+    xmlns:tools="http://schemas.android.com/tools">
 
-  <uses-sdk
-      android:minSdkVersion="26"
-      android:targetSdkVersion="31" />
+  <uses-sdk android:targetSdkVersion="31" />
 
   <!-- Required for haptic feedback. -->
   <uses-permission android:name="android.permission.VIBRATE" />

braille/brailleime/src/phone/java/com/google/android/accessibility/brailleime/BrailleIme.java

@@ -759,7 +759,7 @@ private void updateNavigationBarColor() {
                 this,
                 brailleDisplayConnectedAndNotSuspended
                     ? R.color.braille_keyboard_background
-                    : R.color.google_transparent));
+                    : com.google.android.accessibility.utils.R.color.google_transparent));
   }
 
   private boolean isEightDotsBraille() {
@@ -1455,7 +1455,7 @@ private ImeConnection getImeConnection() {
       new OnSharedPreferenceChangeListener() {
         @Override
         public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-          if (key.equals(getString(R.string.pref_brailleime_translator_code))) {
+          if (key.equals(getString(com.google.android.accessibility.braille.common.R.string.pref_brailleime_translator_code))) {
             Code newCode =
                 BrailleUserPreferences.readCurrentActiveInputCodeAndCorrect(BrailleIme.this);
             if (!brailleDisplayConnectedAndNotSuspended) {
@@ -1471,7 +1471,7 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
               keyboardView.refreshInputView();
             }
             refreshEditBufferAndBrailleDisplay();
-          } else if (key.equals(getString(R.string.pref_braille_contracted_mode))) {
+          } else if (key.equals(getString(com.google.android.accessibility.braille.common.R.string.pref_braille_contracted_mode))) {
             boolean contractedMode = BrailleUserPreferences.readContractedMode(BrailleIme.this);
             if (BrailleUserPreferences.readCurrentActiveInputCodeAndCorrect(BrailleIme.this)
                 .isSupportsContracted(BrailleIme.this)) {

braille/brailleime/src/phone/java/com/google/android/accessibility/brailleime/input/BrailleInputPlane.java

@@ -192,7 +192,7 @@ interface CustomOnGestureListener {
     dotNumberPaint = new Paint();
     dotNumberPaint.setTextAlign(Paint.Align.CENTER);
     dotNumberPaint.setTypeface(
-        Typeface.create(context.getString(R.string.accessibility_font), Typeface.NORMAL));
+        Typeface.create(context.getString(com.google.android.accessibility.utils.R.string.accessibility_font), Typeface.NORMAL));
     float scaleFactor =
         Utils.getResourcesFloat(resources, R.dimen.input_plane_dot_number_size_multiplier);
     dotNumberPaint.setTextSize(scaleFactor * dotRadius);

braille/brailleime/src/phone/java/com/google/android/accessibility/brailleime/input/BrailleInputView.java

@@ -502,7 +502,7 @@ private InputViewCaption(String text) {
       textPaint.setTextSize(resources.getDimensionPixelSize(R.dimen.input_view_caption_text_size));
       textPaint.setStyle(Paint.Style.FILL_AND_STROKE);
       textPaint.setTypeface(
-          Typeface.create(getContext().getString(R.string.accessibility_font), Typeface.NORMAL));
+          Typeface.create(getContext().getString(com.google.android.accessibility.utils.R.string.accessibility_font), Typeface.NORMAL));
       captionBottomMarginInPixels =
           resources.getDimensionPixelOffset(R.dimen.input_view_caption_bottom_margin);
     }

braille/brailleime/src/phone/java/com/google/android/accessibility/brailleime/settings/BrailleImeGestureCommandActivity.java

@@ -71,10 +71,10 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
           Preference preference = new Preference(getContext());
           preference.setTitle(action.getDescriptionRes(getResources()));
           if (action.hasIcon()) {
-            preference.setLayoutResource(R.layout.braille_common_text_with_icon);
+            preference.setLayoutResource(com.google.android.accessibility.braille.common.R.layout.braille_common_text_with_icon);
             preference.setIcon(action.getIconRes(getContext()));
           } else {
-            preference.setLayoutResource(R.layout.braille_common_text);
+            preference.setLayoutResource(com.google.android.accessibility.braille.common.R.layout.braille_common_text);
           }
           preference.setSelectable(false);
           if (preferenceCategory != null) {