Merge branch 'feature/talkback' into 'master'

TalkBack 6 package

See merge request fdroid/fdroiddata!3061
This commit is contained in:
relan 2018-04-15 18:32:22 +00:00
commit cf1b15edb0
3 changed files with 94 additions and 0 deletions

View file

@ -0,0 +1,36 @@
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,android-21.patch
gradle=yes
prebuild=rm libs/*.jar
novcheck=yes
Auto Update Mode:None
Update Check Mode:None

View file

@ -0,0 +1,13 @@
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

View file

@ -0,0 +1,45 @@
diff --git a/shared.gradle b/shared.gradle
index dff2729..984fb05 100644
--- a/shared.gradle
+++ b/shared.gradle
@@ -8,8 +8,7 @@ android {
}
dependencies {
- compile 'com.google.guava:guava:22.0'
- compile 'com.google.android.gms:play-services:8.4.0'
+ compile 'com.google.guava:guava:22.0-android'
compile 'com.android.support:support-v4:27.0.0'
compile 'com.android.support:appcompat-v7:27.0.0'
}
diff --git a/talkback/src/main/java/overlay/base/com/android/talkback/TalkBackPreferencesActivity.java b/talkback/src/main/java/overlay/base/com/android/talkback/TalkBackPreferencesActivity.java
index d630c86..ad5d660 100644
--- a/talkback/src/main/java/overlay/base/com/android/talkback/TalkBackPreferencesActivity.java
+++ b/talkback/src/main/java/overlay/base/com/android/talkback/TalkBackPreferencesActivity.java
@@ -70,8 +70,6 @@ import com.google.android.accessibility.utils.ServiceStateListener;
import com.google.android.accessibility.utils.SharedPreferencesUtils;
import com.google.android.accessibility.utils.WebActivity;
import com.google.android.clockwork.remoteintent.RemoteIntent;
-import com.google.android.gms.common.ConnectionResult;
-import com.google.android.gms.common.GooglePlayServicesUtil;
import java.util.List;
/** Activity used to set TalkBack's service preferences. */
@@ -1015,17 +1013,6 @@ public class TalkBackPreferencesActivity extends Activity {
return;
}
- if (GooglePlayServicesUtil.isGooglePlayServicesAvailable(activity)
- != ConnectionResult.SUCCESS) {
- // Not needed, but playing safe since this is hard to test outside of China
- playStoreButton.setIntent(null);
- final PreferenceGroup category =
- (PreferenceGroup) findPreferenceByResId(R.string.pref_category_miscellaneous_key);
- if (category != null) {
- category.removePreference(playStoreButton);
- }
- }
-
if (playStoreButton.getIntent() != null
&& activity
.getPackageManager()