diff --git a/braille/brailledisplay/build.gradle b/braille/brailledisplay/build.gradle index ca3210aba..487dd1b89 100644 --- a/braille/brailledisplay/build.gradle +++ b/braille/brailledisplay/build.gradle @@ -10,3 +10,5 @@ dependencies { implementation project(':brailletranslate') implementation project(':braillecommon') } + +android.namespace 'com.google.android.accessibility.braille.brailledisplay' diff --git a/braille/brailledisplay/src/main/AndroidManifest.xml b/braille/brailledisplay/src/main/AndroidManifest.xml index a3029427f..8072ee00d 100644 --- a/braille/brailledisplay/src/main/AndroidManifest.xml +++ b/braille/brailledisplay/src/main/AndroidManifest.xml @@ -1,4 +1,2 @@ - + diff --git a/braille/brailledisplay/src/phone/AndroidManifest.xml b/braille/brailledisplay/src/phone/AndroidManifest.xml index a9ac5d934..8dfbc9fe8 100644 --- a/braille/brailledisplay/src/phone/AndroidManifest.xml +++ b/braille/brailledisplay/src/phone/AndroidManifest.xml @@ -1,10 +1,8 @@ - + + + - diff --git a/braille/brailledisplay/src/phone/java/com/google/android/accessibility/braille/brailledisplay/OverlayDisplay.java b/braille/brailledisplay/src/phone/java/com/google/android/accessibility/braille/brailledisplay/OverlayDisplay.java index e7f9847c3..c484f6792 100644 --- a/braille/brailledisplay/src/phone/java/com/google/android/accessibility/braille/brailledisplay/OverlayDisplay.java +++ b/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(); } } diff --git a/braille/brailledisplay/src/phone/java/com/google/android/accessibility/braille/brailledisplay/controller/AutoScrollManager.java b/braille/brailledisplay/src/phone/java/com/google/android/accessibility/braille/brailledisplay/controller/AutoScrollManager.java index b225bd343..911a0c126 100644 --- a/braille/brailledisplay/src/phone/java/com/google/android/accessibility/braille/brailledisplay/controller/AutoScrollManager.java +++ b/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); } }; diff --git a/braille/brailledisplay/src/phone/java/com/google/android/accessibility/braille/brailledisplay/controller/TranslatorManager.java b/braille/brailledisplay/src/phone/java/com/google/android/accessibility/braille/brailledisplay/controller/TranslatorManager.java index 498210483..71c915f57 100644 --- a/braille/brailledisplay/src/phone/java/com/google/android/accessibility/braille/brailledisplay/controller/TranslatorManager.java +++ b/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(); } diff --git a/braille/brailledisplay/src/phone/java/com/google/android/accessibility/braille/brailledisplay/controller/utils/BrailleKeyBindingUtils.java b/braille/brailledisplay/src/phone/java/com/google/android/accessibility/braille/brailledisplay/controller/utils/BrailleKeyBindingUtils.java index 37d48d0b5..329313ae7 100644 --- a/braille/brailledisplay/src/phone/java/com/google/android/accessibility/braille/brailledisplay/controller/utils/BrailleKeyBindingUtils.java +++ b/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 { diff --git a/braille/brailledisplay/src/phone/java/com/google/android/accessibility/braille/brailledisplay/settings/AdvancedSettingsActivity.java b/braille/brailledisplay/src/phone/java/com/google/android/accessibility/braille/brailledisplay/settings/AdvancedSettingsActivity.java index 4ac8cd9db..879c7e4fb 100644 --- a/braille/brailledisplay/src/phone/java/com/google/android/accessibility/braille/brailledisplay/settings/AdvancedSettingsActivity.java +++ b/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( diff --git a/braille/brailledisplay/src/phone/java/com/google/android/accessibility/braille/brailledisplay/settings/AutoScrollActivity.java b/braille/brailledisplay/src/phone/java/com/google/android/accessibility/braille/brailledisplay/settings/AutoScrollActivity.java index 49ff1f8c0..d57a285d4 100644 --- a/braille/brailledisplay/src/phone/java/com/google/android/accessibility/braille/brailledisplay/settings/AutoScrollActivity.java +++ b/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(); } }; diff --git a/braille/brailledisplay/src/phone/java/com/google/android/accessibility/braille/brailledisplay/settings/BrailleDisplaySettingsFragment.java b/braille/brailledisplay/src/phone/java/com/google/android/accessibility/braille/brailledisplay/settings/BrailleDisplaySettingsFragment.java index 202be5a61..53c419c64 100644 --- a/braille/brailledisplay/src/phone/java/com/google/android/accessibility/braille/brailledisplay/settings/BrailleDisplaySettingsFragment.java +++ b/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(); } } diff --git a/braille/brailledisplay/src/phone/java/com/google/android/accessibility/braille/brailledisplay/settings/BrailleGradeActivity.java b/braille/brailledisplay/src/phone/java/com/google/android/accessibility/braille/brailledisplay/settings/BrailleGradeActivity.java index a29109ef7..c53fc3ad7 100644 --- a/braille/brailledisplay/src/phone/java/com/google/android/accessibility/braille/brailledisplay/settings/BrailleGradeActivity.java +++ b/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(); } } diff --git a/braille/brailledisplayanalytics/build.gradle b/braille/brailledisplayanalytics/build.gradle index 62a888635..5ef567700 100644 --- a/braille/brailledisplayanalytics/build.gradle +++ b/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' diff --git a/braille/brailledisplayanalytics/src/main/AndroidManifest.xml b/braille/brailledisplayanalytics/src/main/AndroidManifest.xml index 6df0858ad..8072ee00d 100644 --- a/braille/brailledisplayanalytics/src/main/AndroidManifest.xml +++ b/braille/brailledisplayanalytics/src/main/AndroidManifest.xml @@ -1,4 +1,2 @@ - - + diff --git a/braille/brailleime/build.gradle b/braille/brailleime/build.gradle index fb84d7cb7..ecaafb068 100644 --- a/braille/brailleime/build.gradle +++ b/braille/brailleime/build.gradle @@ -8,3 +8,5 @@ dependencies { implementation project(':brailleimeanalytics') implementation project(':brailletranslate') } + +android.namespace 'com.google.android.accessibility.brailleime' diff --git a/braille/brailleime/src/main/AndroidManifest.xml b/braille/brailleime/src/main/AndroidManifest.xml index 2dce9563f..8072ee00d 100644 --- a/braille/brailleime/src/main/AndroidManifest.xml +++ b/braille/brailleime/src/main/AndroidManifest.xml @@ -1,4 +1,2 @@ - + diff --git a/braille/brailleime/src/phone/AndroidManifest.xml b/braille/brailleime/src/phone/AndroidManifest.xml index ccdd28871..cc9191526 100644 --- a/braille/brailleime/src/phone/AndroidManifest.xml +++ b/braille/brailleime/src/phone/AndroidManifest.xml @@ -1,11 +1,8 @@ + xmlns:tools="http://schemas.android.com/tools"> - + diff --git a/braille/brailleime/src/phone/java/com/google/android/accessibility/brailleime/BrailleIme.java b/braille/brailleime/src/phone/java/com/google/android/accessibility/brailleime/BrailleIme.java index a869d6fdd..7ce4e3b1a 100644 --- a/braille/brailleime/src/phone/java/com/google/android/accessibility/brailleime/BrailleIme.java +++ b/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)) { diff --git a/braille/brailleime/src/phone/java/com/google/android/accessibility/brailleime/input/BrailleInputPlane.java b/braille/brailleime/src/phone/java/com/google/android/accessibility/brailleime/input/BrailleInputPlane.java index 3d6fef221..3ba5a63e2 100644 --- a/braille/brailleime/src/phone/java/com/google/android/accessibility/brailleime/input/BrailleInputPlane.java +++ b/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); diff --git a/braille/brailleime/src/phone/java/com/google/android/accessibility/brailleime/input/BrailleInputView.java b/braille/brailleime/src/phone/java/com/google/android/accessibility/brailleime/input/BrailleInputView.java index d43b4b2f2..07a513d36 100644 --- a/braille/brailleime/src/phone/java/com/google/android/accessibility/brailleime/input/BrailleInputView.java +++ b/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); } diff --git a/braille/brailleime/src/phone/java/com/google/android/accessibility/brailleime/settings/BrailleImeGestureCommandActivity.java b/braille/brailleime/src/phone/java/com/google/android/accessibility/brailleime/settings/BrailleImeGestureCommandActivity.java index 76a5c66b1..3c60cec5a 100644 --- a/braille/brailleime/src/phone/java/com/google/android/accessibility/brailleime/settings/BrailleImeGestureCommandActivity.java +++ b/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) { diff --git a/braille/brailleime/src/phone/java/com/google/android/accessibility/brailleime/settings/BrailleImePreferencesActivity.java b/braille/brailleime/src/phone/java/com/google/android/accessibility/brailleime/settings/BrailleImePreferencesActivity.java index 596702c7e..9c137b039 100644 --- a/braille/brailleime/src/phone/java/com/google/android/accessibility/brailleime/settings/BrailleImePreferencesActivity.java +++ b/braille/brailleime/src/phone/java/com/google/android/accessibility/brailleime/settings/BrailleImePreferencesActivity.java @@ -123,7 +123,7 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { getPreferenceManager() .setSharedPreferencesName(BrailleUserPreferences.BRAILLE_SHARED_PREFS_FILENAME); PreferenceSettingsUtils.addPreferencesFromResource(this, R.xml.brailleime_preferences); - brailleGradePreference = findPreference(getString(R.string.pref_braille_contracted_mode)); + brailleGradePreference = findPreference(getString(com.google.android.accessibility.braille.common.R.string.pref_braille_contracted_mode)); getPreferenceManager() .getSharedPreferences() @@ -163,7 +163,7 @@ private void configurePrefs() { { // Typing codes preference. Preference typingCodesPref = - findPreference(getString(R.string.pref_brailleime_translator_codes_preferred)); + findPreference(getString(com.google.android.accessibility.braille.common.R.string.pref_brailleime_translator_codes_preferred)); typingCodesPref.setIntent(new Intent(getContext(), BrailleLanguagesActivity.class)); BraillePreferenceUtils.setupPreferredCodePreference( getContext(), @@ -177,7 +177,7 @@ private void configurePrefs() { { // Preferred input codes preference. ListPreference preferredInputCodePref = - findPreference(getString(R.string.pref_brailleime_translator_code)); + findPreference(getString(com.google.android.accessibility.braille.common.R.string.pref_brailleime_translator_code)); if (preferredInputCodePref != null) { BraillePreferenceUtils.setupLanguageListPreference( getContext(), @@ -204,7 +204,7 @@ private void configurePrefs() { { // Accumulate mode preference. SwitchPreference accumulateModePref = - findPreference(getString(R.string.pref_brailleime_accumulate_mode)); + findPreference(getString(com.google.android.accessibility.braille.common.R.string.pref_brailleime_accumulate_mode)); accumulateModePref.setChecked(BrailleUserPreferences.readAccumulateMode(getContext())); accumulateModePref.setOnPreferenceClickListener( preference -> { @@ -218,7 +218,7 @@ private void configurePrefs() { { // Reverse dots mode preference. SwitchPreference reverseDotsModePref = - findPreference(getString(R.string.pref_brailleime_reverse_dots_mode)); + findPreference(getString(com.google.android.accessibility.braille.common.R.string.pref_brailleime_reverse_dots_mode)); reverseDotsModePref.setChecked(BrailleUserPreferences.readReverseDotsMode(getContext())); reverseDotsModePref.setOnPreferenceClickListener( preference -> { @@ -232,7 +232,7 @@ private void configurePrefs() { { // Layout settings preference. ListPreference layoutModePref = - findPreference(getString(R.string.pref_brailleime_layout_mode)); + findPreference(getString(com.google.android.accessibility.braille.common.R.string.pref_brailleime_layout_mode)); if (layoutModePref != null) { layoutModePref.setEntryValues( Arrays.stream(TouchDots.values()).map(Enum::name).toArray(CharSequence[]::new)); @@ -279,7 +279,7 @@ private void updateBrailleGradeSummary() { 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))) { updateBrailleGradeSummary(); } } diff --git a/braille/brailleimeanalytics/build.gradle b/braille/brailleimeanalytics/build.gradle index 5932a84df..7884222ce 100644 --- a/braille/brailleimeanalytics/build.gradle +++ b/braille/brailleimeanalytics/build.gradle @@ -6,3 +6,5 @@ dependencies { implementation project(':braillecommon') implementation project(':brailleinterfaces') } + +android.namespace 'com.google.android.accessibility.brailleime.analytics' diff --git a/braille/brailleimeanalytics/src/main/AndroidManifest.xml b/braille/brailleimeanalytics/src/main/AndroidManifest.xml index 6d03c149b..8072ee00d 100644 --- a/braille/brailleimeanalytics/src/main/AndroidManifest.xml +++ b/braille/brailleimeanalytics/src/main/AndroidManifest.xml @@ -1,4 +1,2 @@ - - + diff --git a/braille/brltty/build.gradle b/braille/brltty/build.gradle index b38f7191e..484eac979 100644 --- a/braille/brltty/build.gradle +++ b/braille/brltty/build.gradle @@ -2,6 +2,7 @@ apply plugin: 'com.android.library' apply from: "../../shared.gradle" android { + namespace 'com.google.android.accessibility.braille.brltty' externalNativeBuild { ndkBuild { path file('src/phone/jni/Android.mk') @@ -18,8 +19,8 @@ dependencies { } task createBrlttyKeyTablesZip(type: Zip){ - archiveName="keytables.zip" - destinationDir = file('src/phone/res/raw/') + archiveFileName="keytables.zip" + destinationDirectory = file('src/phone/res/raw/') from fileTree('./src/phone/tables/') } diff --git a/braille/brltty/src/main/AndroidManifest.xml b/braille/brltty/src/main/AndroidManifest.xml index 8bb55cfb0..8072ee00d 100644 --- a/braille/brltty/src/main/AndroidManifest.xml +++ b/braille/brltty/src/main/AndroidManifest.xml @@ -1,2 +1,2 @@ - + diff --git a/braille/brltty/src/phone/AndroidManifest.xml b/braille/brltty/src/phone/AndroidManifest.xml index 5fbf6ec94..e162778e1 100644 --- a/braille/brltty/src/phone/AndroidManifest.xml +++ b/braille/brltty/src/phone/AndroidManifest.xml @@ -1,9 +1,6 @@ - - + + + + diff --git a/braille/common/build.gradle b/braille/common/build.gradle index 5ed33e129..fab89eb95 100644 --- a/braille/common/build.gradle +++ b/braille/common/build.gradle @@ -7,3 +7,5 @@ dependencies { implementation project(':proguard') implementation project(':utils') } + +android.namespace 'com.google.android.accessibility.braille.common' diff --git a/braille/common/src/main/AndroidManifest.xml b/braille/common/src/main/AndroidManifest.xml index 9ce1f7409..8072ee00d 100644 --- a/braille/common/src/main/AndroidManifest.xml +++ b/braille/common/src/main/AndroidManifest.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + diff --git a/braille/common/src/phone/AndroidManifest.xml b/braille/common/src/phone/AndroidManifest.xml index 2ad171dd0..ecd82f238 100644 --- a/braille/common/src/phone/AndroidManifest.xml +++ b/braille/common/src/phone/AndroidManifest.xml @@ -1,11 +1,7 @@ - - + + + - + diff --git a/braille/translate/build.gradle b/braille/translate/build.gradle index 7844d16e3..5d40ddde4 100644 --- a/braille/translate/build.gradle +++ b/braille/translate/build.gradle @@ -2,6 +2,7 @@ apply plugin: 'com.android.library' apply from: "../../shared.gradle" android { + namespace 'com.google.android.accessibility.braille.translate' externalNativeBuild { ndkBuild { path file('src/phone/jni/Android.mk') @@ -16,8 +17,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/braille/translate/src/main/AndroidManifest.xml b/braille/translate/src/main/AndroidManifest.xml index e9a0ab296..8072ee00d 100644 --- a/braille/translate/src/main/AndroidManifest.xml +++ b/braille/translate/src/main/AndroidManifest.xml @@ -1,2 +1,2 @@ - + diff --git a/braille/translate/src/phone/AndroidManifest.xml b/braille/translate/src/phone/AndroidManifest.xml index 214898eff..d53f687d1 100644 --- a/braille/translate/src/phone/AndroidManifest.xml +++ b/braille/translate/src/phone/AndroidManifest.xml @@ -1,9 +1,4 @@ - - + + diff --git a/build.gradle b/build.gradle index 177f1844b..ae5c2d56e 100644 --- a/build.gradle +++ b/build.gradle @@ -18,8 +18,7 @@ buildscript { google() } dependencies { - classpath 'org.aspectj:aspectjtools:1.8.1' - classpath 'com.android.tools.build:gradle:4.2.2' + classpath 'com.android.tools.build:gradle:8.4.0' } } @@ -31,15 +30,14 @@ allprojects { } android { - buildToolsVersion '29.0.0' + namespace talkbackApplicationId defaultConfig { applicationId talkbackApplicationId versionName talkbackVersionName + "-" + BUILD_TIMESTAMP - minSdkVersion 26 - targetSdkVersion 30 - compileSdkVersion 33 + minSdk 26 + targetSdk 30 + compileSdk 34 testInstrumentationRunner 'android.test.InstrumentationTestRunner' - multiDexEnabled true } packagingOptions { exclude 'LICENSE' diff --git a/build.sh b/build.sh index 59f9e6287..3ed1a354a 100755 --- a/build.sh +++ b/build.sh @@ -1,17 +1,8 @@ +#!/usr/bin/env bash ### Bash script for building Talkback-for-Partners Android apk -### -### The following environment variables must be set before executing this script -### ANDROID_SDK # path to local copy of Android SDK -### ANDROID_NDK # path to local copy of Android NDK -### JAVA_HOME # path to local copy of Java SDK. - -# For help in getting the correct version numbers of gradle, the gradle plugin, -# and Java, see the following: -# https://developer.android.com/build/releases/gradle-plugin#updating-gradle -# https://docs.gradle.org/current/userguide/compatibility.html -GRADLE_DOWNLOAD_VERSION=7.3.3 +WORK_DIR="$(dirname -- "${BASH_SOURCE[0]}")" GRADLE_TRACE=false # change to true to enable verbose logging of gradle - +GRADLE_WRAPPER="$WORK_DIR/gradlew" function log { if [[ -n $1 ]]; then @@ -20,79 +11,13 @@ function log { fi } -function fail_with_message { - echo - echo "Error: ${1}" - exit 1 -} - -function require_environment_variable() { - if [[ -z ${!1+set} ]]; then - fail_with_message "the environment variable $1 is not set" - exit 1 - else - log "${1}: ${!1}" - fi -} - -function require_folder_exists() { - if [[ ! -d "${1}" ]]; then - fail_with_message "the folder at ${1} does not exist" - exit 1 - else - log "ls ${1}"; ls "${1}" - fi -} - - log "pwd: $(pwd)" log "ls"; ls log - -require_environment_variable ANDROID_SDK -require_folder_exists "${ANDROID_SDK}" -require_environment_variable ANDROID_NDK -require_folder_exists "${ANDROID_NDK}" -require_environment_variable JAVA_HOME -require_folder_exists "${JAVA_HOME}" -log - - -log "Write local.properties file" -echo "sdk.dir=${ANDROID_SDK}" > local.properties -echo "ndk.dir=${ANDROID_NDK}" >> local.properties -log "cat local.properties"; cat local.properties -log - - -# Download the gradle binary at the version set atop this file -GRADLE_ZIP_REMOTE_FILE=gradle-${GRADLE_DOWNLOAD_VERSION}-bin.zip -GRADLE_ZIP_DEST_PATH=~/${GRADLE_DOWNLOAD_VERSION}.zip -log "Download gradle binary from the web ${GRADLE_ZIP_REMOTE_FILE} to ${GRADLE_ZIP_DEST_PATH} using wget" -time wget -O ${GRADLE_ZIP_DEST_PATH} https://services.gradle.org/distributions/${GRADLE_ZIP_REMOTE_FILE} -log - - -# Unzip the gradle binary -GRADLE_UNZIP_HOSTING_FOLDER=/opt/gradle-${GRADLE_DOWNLOAD_VERSION} -log "Unzip gradle zipfile ${GRADLE_ZIP_DEST_PATH} to ${GRADLE_UNZIP_HOSTING_FOLDER}" -sudo unzip -n -d ${GRADLE_UNZIP_HOSTING_FOLDER} ${GRADLE_ZIP_DEST_PATH} -GRADLE_BINARY=${GRADLE_UNZIP_HOSTING_FOLDER}/gradle-${GRADLE_DOWNLOAD_VERSION}/bin/gradle -log "\${GRADLE_BINARY} = ${GRADLE_BINARY}" -log "\${GRADLE_BINARY} -version" -${GRADLE_BINARY} -version -log - - -log "find gradle" -find gradle -log - - if [[ "$GRADLE_TRACE" = true ]]; then - log "${GRADLE_BINARY} dependencies" - ${GRADLE_BINARY} dependencies + log "${GRADLE_WRAPPER} dependencies" + ${GRADLE_WRAPPER} dependencies log fi @@ -103,15 +28,15 @@ if [[ "$GRADLE_TRACE" = true ]]; then GRADLE_DEBUG=--debug GRADLE_STACKTRACE=--stacktrace fi -log "${GRADLE_BINARY} assembleDebug" -${GRADLE_BINARY} ${GRADLE_DEBUG} ${GRADLE_STACKTRACE} assembleDebug +log "${GRADLE_WRAPPER} assembleDebug" +${GRADLE_WRAPPER} ${GRADLE_DEBUG} ${GRADLE_STACKTRACE} assembleDebug BUILD_EXIT_CODE=$? log if [[ $BUILD_EXIT_CODE -eq 0 ]]; then - log "find . -name *.apk" - find . -name "*.apk" + log "find $WORK_DIR -name *.apk" + find $WORK_DIR -name "*.apk" log fi diff --git a/gradle.properties b/gradle.properties index 4545319f7..093e0b204 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,2 @@ android.useAndroidX = true -android.enableJetifier = true org.gradle.jvmargs=-Xms512M -Xmx8G - -## Prevents "Execution failed for JetifyTransform, failed to transform" -android.jetifier.blacklist=proguard.jar diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 000000000..e6441136f Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..b82aa23a4 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 000000000..1aa94a426 --- /dev/null +++ b/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# 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 ;; #( + MSYS* | 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 + if ! command -v java >/dev/null 2>&1 + then + 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 +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 000000000..7101f8e46 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@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=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@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="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +: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 %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 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! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/shared.gradle b/shared.gradle index 07baa95d7..d9bfbf544 100644 --- a/shared.gradle +++ b/shared.gradle @@ -5,17 +5,15 @@ ext { } android { - compileSdkVersion 34 + compileSdk 34 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } defaultConfig { - vectorDrawables.useSupportLibrary = true - multiDexEnabled true minSdkVersion 26 } - flavorDimensions "target" + flavorDimensions += "target" productFlavors { phone { dimension "target" @@ -24,6 +22,9 @@ android { dimension "target" } } + buildFeatures { + buildConfig true + } } configurations.all { diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index 461e1d8f5..311ac3b5f 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -1,7 +1,5 @@ - +