Skip to content

Commit bc6d91a

Browse files
jozuasijsling-ingjozuasijsling-ing
committed
Upgraded Gradle to 8.7.
Upgraded AGP (Android Gradle Plugin) to 8.4.0. Removed unused aspectjtools plugin declaration.
1 parent dcddedd commit bc6d91a

File tree

68 files changed

+521
-208
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+521
-208
lines changed

‎braille/brailledisplay/build.gradle‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,5 @@ dependencies {
1010
implementation project(':brailletranslate')
1111
implementation project(':braillecommon')
1212
}
13+
14+
android.namespace 'com.google.android.accessibility.braille.brailledisplay'

‎braille/brailledisplay/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:tools="http://schemas.android.com/tools"
4-
package="com.google.android.accessibility.braille.brailledisplay" />
2+
<manifest />

‎braille/brailledisplay/src/phone/AndroidManifest.xml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.google.android.accessibility.braille.brailledisplay">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
3+
4+
<uses-sdk android:targetSdkVersion="31" />
45

5-
<uses-sdk
6-
android:minSdkVersion="26"
7-
android:targetSdkVersion="31" />
86
<uses-permission android:name="android.permission.WAKE_LOCK" />
97
<!-- If you need access to FINE location, you must request both ACCESS_FINE_LOCATION and ACCESS_COARSE_LOCATION. -->
108
<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‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ protected void handleMessage(Message msg, OverlayDisplay parent) {
256256
new OnSharedPreferenceChangeListener() {
257257
@Override
258258
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
259-
if (context.getString(R.string.pref_braille_overlay_key).equals(key)) {
259+
if (context.getString(com.google.android.accessibility.braille.common.R.string.pref_braille_overlay_key).equals(key)) {
260260
displayThreadHandler.reportPreferenceChange();
261261
}
262262
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,12 +173,12 @@ private int getDuration() {
173173

174174
private final OnSharedPreferenceChangeListener onSharedPreferenceChangeListener =
175175
(SharedPreferences sharedPreferences, String key) -> {
176-
if (key.equals(context.getString(R.string.pref_bd_auto_scroll_duration_key))) {
176+
if (key.equals(context.getString(com.google.android.accessibility.braille.common.R.string.pref_bd_auto_scroll_duration_key))) {
177177
handler.removeCallbacksAndMessages(/* token= */ null);
178178
duration = BrailleUserPreferences.readAutoScrollDuration(context);
179179
handler.postDelayed(runnable, getDuration());
180180
} else if (key.equals(
181-
context.getString(R.string.pref_bd_auto_adjust_duration_enable_key))) {
181+
context.getString(com.google.android.accessibility.braille.common.R.string.pref_bd_auto_adjust_duration_enable_key))) {
182182
autoAdjustDurationEnabled = BrailleUserPreferences.readAutoAdjustDurationEnable(context);
183183
}
184184
};

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
import android.content.Context;
2222
import android.content.SharedPreferences;
23-
import com.google.android.accessibility.braille.brailledisplay.R;
2423
import com.google.android.accessibility.braille.common.BrailleUserPreferences;
2524
import com.google.android.accessibility.braille.common.translate.BrailleLanguages.Code;
2625
import com.google.android.accessibility.braille.translate.BrailleTranslator;
@@ -118,11 +117,11 @@ public BrailleTranslator getInputTranslator() {
118117

119118
@Override
120119
public void onSharedPreferenceChanged(SharedPreferences prefs, String key) {
121-
if (context.getString(R.string.pref_bd_output_code).equals(key)) {
120+
if (context.getString(com.google.android.accessibility.braille.common.R.string.pref_bd_output_code).equals(key)) {
122121
updateOutputTranslators();
123-
} else if (context.getString(R.string.pref_brailleime_translator_code).equals(key)) {
122+
} else if (context.getString(com.google.android.accessibility.braille.common.R.string.pref_brailleime_translator_code).equals(key)) {
124123
updateInputTranslator();
125-
} else if (context.getString(R.string.pref_braille_contracted_mode).equals(key)) {
124+
} else if (context.getString(com.google.android.accessibility.braille.common.R.string.pref_braille_contracted_mode).equals(key)) {
126125
updateOutputTranslators();
127126
updateInputTranslator();
128127
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public static String getFriendlyKeyNamesForCommand(
100100
private static String getDotsDescription(Resources resources, BrailleCharacter brailleCharacter) {
101101
String dotsString = changeToSentence(resources, brailleCharacter.toLocaleString().split(""));
102102
return resources.getQuantityString(
103-
R.plurals.braille_dots, brailleCharacter.getOnCount(), dotsString);
103+
com.google.android.accessibility.braille.common.R.plurals.braille_dots, brailleCharacter.getOnCount(), dotsString);
104104
}
105105

106106
/** Compose words to a sentence. Example: "abcd" -> "a, b, c and d". */
@@ -109,7 +109,7 @@ private static String changeToSentence(Resources resources, String[] words) {
109109
StringBuilder sentence = new StringBuilder();
110110
sentence.append(words[0]);
111111
for (int i = 1; i < words.length - 1; i++) {
112-
sentence.append(resources.getString(R.string.split_comma, words[i]));
112+
sentence.append(resources.getString(com.google.android.accessibility.braille.common.R.string.split_comma, words[i]));
113113
}
114114
return resources.getString(R.string.bd_commands_delimiter, sentence, words[words.length - 1]);
115115
} else {

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ public void onCreatePreferences(Bundle bundle, String rootKey) {
4040
PreferenceSettingsUtils.addPreferencesFromResource(
4141
this, R.xml.bd_advanced_settings_preferences);
4242
timedMessageDurationPreference =
43-
findPreference(getString(R.string.pref_bd_timed_message_duration_fraction_key));
43+
findPreference(getString(com.google.android.accessibility.braille.common.R.string.pref_bd_timed_message_duration_fraction_key));
4444
blinkingIntervalPreference =
45-
findPreference(getString(R.string.pref_bd_blinking_interval_key));
45+
findPreference(getString(com.google.android.accessibility.braille.common.R.string.pref_bd_blinking_interval_key));
4646
getPreferenceManager()
4747
.getSharedPreferences()
4848
.registerOnSharedPreferenceChangeListener(onSharedPreferenceChangeListener);
@@ -93,14 +93,14 @@ private int getQuantity(float number) {
9393

9494
private final OnSharedPreferenceChangeListener onSharedPreferenceChangeListener =
9595
(sharedPreferences, key) -> {
96-
if (key.equals(getString(R.string.pref_bd_blinking_interval_key))) {
96+
if (key.equals(getString(com.google.android.accessibility.braille.common.R.string.pref_bd_blinking_interval_key))) {
9797
BrailleDisplayAnalytics.getInstance(getContext())
9898
.logBlinkRate(BrailleUserPreferences.readBlinkingIntervalMs(getContext()));
99-
} else if (key.equals(getString(R.string.pref_bd_reverse_panning_buttons))) {
99+
} else if (key.equals(getString(com.google.android.accessibility.braille.common.R.string.pref_bd_reverse_panning_buttons))) {
100100
BrailleDisplayAnalytics.getInstance(getContext())
101101
.logReversePanningKey(
102102
BrailleUserPreferences.readReversePanningButtons(getContext()));
103-
} else if (key.equals(getString(R.string.pref_bd_timed_message_duration_fraction_key))) {
103+
} else if (key.equals(getString(com.google.android.accessibility.braille.common.R.string.pref_bd_timed_message_duration_fraction_key))) {
104104
int durationMs =
105105
Math.round(
106106
Float.parseFloat(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public void onPause() {
5757

5858
private final OnSharedPreferenceChangeListener onSharedPreferenceChangeListener =
5959
(SharedPreferences sharedPreferences, String key) -> {
60-
if (key.equals(getString(R.string.pref_bd_auto_scroll_duration_key))) {
60+
if (key.equals(getString(com.google.android.accessibility.braille.common.R.string.pref_bd_auto_scroll_duration_key))) {
6161
refresh();
6262
}
6363
};

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -151,13 +151,13 @@ public boolean onPreferenceClick(Preference preference) {
151151
findPreference(getString(R.string.pref_key_bd_connection_category));
152152

153153
preferredCodesPreference =
154-
findPreference(getString(R.string.pref_brailleime_translator_codes_preferred));
154+
findPreference(getString(com.google.android.accessibility.braille.common.R.string.pref_brailleime_translator_codes_preferred));
155155
preferredCodesPreference.setIntent(new Intent(getContext(), BrailleLanguagesActivity.class));
156156

157-
currentActiveOutputCodePreference = findPreference(getString(R.string.pref_bd_output_code));
157+
currentActiveOutputCodePreference = findPreference(getString(com.google.android.accessibility.braille.common.R.string.pref_bd_output_code));
158158
currentActiveInputCodePreference =
159-
findPreference(getString(R.string.pref_brailleime_translator_code));
160-
brailleGradePreference = findPreference(getString(R.string.pref_braille_contracted_mode));
159+
findPreference(getString(com.google.android.accessibility.braille.common.R.string.pref_brailleime_translator_code));
160+
brailleGradePreference = findPreference(getString(com.google.android.accessibility.braille.common.R.string.pref_braille_contracted_mode));
161161
brailleGradePreference.setIntent(new Intent(getContext(), BrailleGradeActivity.class));
162162

163163
keyBindingsPreference = findPreference(getString(R.string.pref_key_bindings_key));
@@ -798,12 +798,12 @@ public void onOutputCodeChanged() {
798798
new OnSharedPreferenceChangeListener() {
799799
@Override
800800
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
801-
if (key.equals(getString(R.string.pref_bd_output_code))) {
801+
if (key.equals(getString(com.google.android.accessibility.braille.common.R.string.pref_bd_output_code))) {
802802
BrailleDisplayAnalytics.getInstance(getContext())
803803
.logBrailleOutputCodeSetting(
804804
BrailleUserPreferences.readCurrentActiveOutputCodeAndCorrect(getContext()),
805805
BrailleUserPreferences.readContractedMode(getContext()));
806-
} else if (key.equals(getString(R.string.pref_brailleime_translator_code))) {
806+
} else if (key.equals(getString(com.google.android.accessibility.braille.common.R.string.pref_brailleime_translator_code))) {
807807
BrailleDisplayAnalytics.getInstance(getContext())
808808
.logBrailleInputCodeSetting(
809809
BrailleUserPreferences.readCurrentActiveInputCodeAndCorrect(getContext()),
@@ -814,7 +814,7 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
814814
} else if (key.equals(getString(R.string.pref_key_bd_enabler))) {
815815
BrailleDisplayAnalytics.getInstance(getContext())
816816
.logEnablerSetting(PersistentStorage.isConnectionEnabledByUser(getContext()));
817-
} else if (key.equals(getString(R.string.pref_braille_contracted_mode))) {
817+
} else if (key.equals(getString(com.google.android.accessibility.braille.common.R.string.pref_braille_contracted_mode))) {
818818
updateBrailleGradeSummary();
819819
}
820820
}

0 commit comments

Comments
 (0)