From 55681ef63e5d266c026347cc19472dc50618a09b Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Tue, 22 May 2018 13:21:24 +0200 Subject: [PATCH 1/6] TalkBack: Force version name --- .../com.google.android.accessibility.talkback.txt | 8 ++++---- .../android-21.patch | 13 ------------- 2 files changed, 4 insertions(+), 17 deletions(-) delete mode 100644 metadata/com.google.android.accessibility.talkback/android-21.patch diff --git a/metadata/com.google.android.accessibility.talkback.txt b/metadata/com.google.android.accessibility.talkback.txt index dfcd763e22..29281b8e63 100644 --- a/metadata/com.google.android.accessibility.talkback.txt +++ b/metadata/com.google.android.accessibility.talkback.txt @@ -1,4 +1,3 @@ -Disabled:Possibly causes https://gitlab.com/fdroid/fdroidclient/issues/1416 Categories:System License:Apache-2.0 Web Site:https://support.google.com/accessibility/android/answer/6283677?hl=en @@ -28,10 +27,11 @@ Repo:https://github.com/google/talkback.git Build:6.1,50200001 commit=e69d4731fce02bb9e69613d0e48c29033cad4a98 - patch=play-services.patch,android-21.patch + patch=play-services.patch gradle=yes - prebuild=rm libs/*.jar - novcheck=yes + rm=libs + prebuild=sed -i 's/minSdkVersion 26/minSdkVersion 21/' build.gradle && \ + sed -i 's/android:versionCode=/android:versionName="6.1" android:versionCode=/' src/main/AndroidManifest.xml Auto Update Mode:None Update Check Mode:None diff --git a/metadata/com.google.android.accessibility.talkback/android-21.patch b/metadata/com.google.android.accessibility.talkback/android-21.patch deleted file mode 100644 index 058667f5f0..0000000000 --- a/metadata/com.google.android.accessibility.talkback/android-21.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/build.gradle b/build.gradle -index c67eb3b..de6b1ac 100644 ---- a/build.gradle -+++ b/build.gradle -@@ -25,7 +25,7 @@ allprojects { - android { - buildToolsVersion '27.0.0' - defaultConfig { -- minSdkVersion 26 -+ minSdkVersion 21 - targetSdkVersion 27 - testInstrumentationRunner 'android.test.InstrumentationTestRunner' - multiDexEnabled true From 3edfd839674e4726b61dbd70e6e6234b812207e0 Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Sun, 3 Feb 2019 11:54:29 +0100 Subject: [PATCH 2/6] TalkBack: Switch to YAML --- ....google.android.accessibility.talkback.txt | 37 ---------------- ....google.android.accessibility.talkback.yml | 43 +++++++++++++++++++ 2 files changed, 43 insertions(+), 37 deletions(-) delete mode 100644 metadata/com.google.android.accessibility.talkback.txt create mode 100644 metadata/com.google.android.accessibility.talkback.yml diff --git a/metadata/com.google.android.accessibility.talkback.txt b/metadata/com.google.android.accessibility.talkback.txt deleted file mode 100644 index 29281b8e63..0000000000 --- a/metadata/com.google.android.accessibility.talkback.txt +++ /dev/null @@ -1,37 +0,0 @@ -Categories:System -License:Apache-2.0 -Web Site:https://support.google.com/accessibility/android/answer/6283677?hl=en -Source Code:https://github.com/google/talkback -Issue Tracker: - -Auto Name:TalkBack -Summary:Accessibility improvements -Description: -TalkBack is an Accessibility Service that helps blind and vision-impaired users -interact with their devices more easily. - -This application adds spoken, audible, and vibration feedback to your device. - -It comes pre-installed on many devices so you won't be able to install this if -that is the case. - -It's only activated if you explicitly turn on Accessibility: - -# Go to Settings -# Select Accessibility -# Enable TalkBack checkboxes -. - -Repo Type:git -Repo:https://github.com/google/talkback.git - -Build:6.1,50200001 - commit=e69d4731fce02bb9e69613d0e48c29033cad4a98 - patch=play-services.patch - gradle=yes - rm=libs - prebuild=sed -i 's/minSdkVersion 26/minSdkVersion 21/' build.gradle && \ - sed -i 's/android:versionCode=/android:versionName="6.1" android:versionCode=/' src/main/AndroidManifest.xml - -Auto Update Mode:None -Update Check Mode:None diff --git a/metadata/com.google.android.accessibility.talkback.yml b/metadata/com.google.android.accessibility.talkback.yml new file mode 100644 index 0000000000..046ad1f9a1 --- /dev/null +++ b/metadata/com.google.android.accessibility.talkback.yml @@ -0,0 +1,43 @@ +Categories: + - System +License: Apache-2.0 +WebSite: https://support.google.com/accessibility/android/answer/6283677?hl=en +SourceCode: https://github.com/google/talkback + +AutoName: TalkBack +Summary: Accessibility improvements +Description: |- + TalkBack is an Accessibility Service that helps blind and vision-impaired users + interact with their devices more easily. + + This application adds spoken, audible, and vibration feedback to your device. + + It comes pre-installed on many devices so you won't be able to install this if + that is the case. + + It's only activated if you explicitly turn on Accessibility: + + # Go to Settings + # Select Accessibility + # Enable TalkBack checkboxes + +RepoType: git +Repo: https://github.com/google/talkback.git + +Builds: + - versionName: '6.1' + versionCode: 50200001 + commit: e69d4731fce02bb9e69613d0e48c29033cad4a98 + patch: + - play-services.patch + gradle: + - yes + rm: + - libs + prebuild: + - sed -i 's/minSdkVersion 26/minSdkVersion 21/' build.gradle + - sed -i 's/android:versionCode=/android:versionName="6.1" android:versionCode=/' + src/main/AndroidManifest.xml + +AutoUpdateMode: None +UpdateCheckMode: None From a2054d4c870371454c03aae121bc4fd4713f0691 Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Sun, 3 Feb 2019 11:57:11 +0100 Subject: [PATCH 3/6] TalkBack: Upgrade to 6.1.1 Use tags --- metadata/com.google.android.accessibility.talkback.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/metadata/com.google.android.accessibility.talkback.yml b/metadata/com.google.android.accessibility.talkback.yml index 046ad1f9a1..df32c7ca36 100644 --- a/metadata/com.google.android.accessibility.talkback.yml +++ b/metadata/com.google.android.accessibility.talkback.yml @@ -25,9 +25,9 @@ RepoType: git Repo: https://github.com/google/talkback.git Builds: - - versionName: '6.1' + - versionName: 6.1.1 versionCode: 50200001 - commit: e69d4731fce02bb9e69613d0e48c29033cad4a98 + commit: 6.1.1 patch: - play-services.patch gradle: @@ -36,7 +36,7 @@ Builds: - libs prebuild: - sed -i 's/minSdkVersion 26/minSdkVersion 21/' build.gradle - - sed -i 's/android:versionCode=/android:versionName="6.1" android:versionCode=/' + - sed -i 's/android:versionCode=/android:versionName="$$VERSION$$" android:versionCode=/' src/main/AndroidManifest.xml AutoUpdateMode: None From 5acb49c6450074bb58238406c7eb32721a4f1fd3 Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Sun, 3 Feb 2019 11:57:36 +0100 Subject: [PATCH 4/6] WIP --- metadata/com.google.android.accessibility.talkback.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata/com.google.android.accessibility.talkback.yml b/metadata/com.google.android.accessibility.talkback.yml index df32c7ca36..fdb0f895f9 100644 --- a/metadata/com.google.android.accessibility.talkback.yml +++ b/metadata/com.google.android.accessibility.talkback.yml @@ -40,4 +40,4 @@ Builds: src/main/AndroidManifest.xml AutoUpdateMode: None -UpdateCheckMode: None +UpdateCheckMode: Tags From 9a405ed3e02c8d80edfa57831ce1b663625c670a Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Sun, 3 Feb 2019 11:59:50 +0100 Subject: [PATCH 5/6] TalkBack: Enable auto update --- metadata/com.google.android.accessibility.talkback.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/metadata/com.google.android.accessibility.talkback.yml b/metadata/com.google.android.accessibility.talkback.yml index fdb0f895f9..29565a9638 100644 --- a/metadata/com.google.android.accessibility.talkback.yml +++ b/metadata/com.google.android.accessibility.talkback.yml @@ -39,5 +39,7 @@ Builds: - sed -i 's/android:versionCode=/android:versionName="$$VERSION$$" android:versionCode=/' src/main/AndroidManifest.xml -AutoUpdateMode: None +AutoUpdateMode: Version %v UpdateCheckMode: Tags +CurrentVersion: 6.1.1 +CurrentVersionCode: 50200001 From c8c5cd5c102fd3b56c221fb6c9efe6f77f27c232 Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Sun, 3 Feb 2019 12:01:23 +0100 Subject: [PATCH 6/6] TalkBack: Don't lower minSdkVersion We already have a version compatible with older Android in the repository anyway --- metadata/com.google.android.accessibility.talkback.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/metadata/com.google.android.accessibility.talkback.yml b/metadata/com.google.android.accessibility.talkback.yml index 29565a9638..d3cf6545e2 100644 --- a/metadata/com.google.android.accessibility.talkback.yml +++ b/metadata/com.google.android.accessibility.talkback.yml @@ -34,9 +34,7 @@ Builds: - yes rm: - libs - prebuild: - - sed -i 's/minSdkVersion 26/minSdkVersion 21/' build.gradle - - sed -i 's/android:versionCode=/android:versionName="$$VERSION$$" android:versionCode=/' + prebuild: sed -i 's/android:versionCode=/android:versionName="$$VERSION$$" android:versionCode=/' src/main/AndroidManifest.xml AutoUpdateMode: Version %v