From 1242e82ad375f9dcacf7e23249db505866cf9323 Mon Sep 17 00:00:00 2001
From: Pierre Rudloff <contact@rudloff.pro>
Date: Mon, 11 Feb 2019 11:00:39 +0100
Subject: [PATCH 1/2] TalkBack: Switch to YAML

---
 metadata/com.android.talkback.txt | 37 ----------------------------
 metadata/com.android.talkback.yml | 41 +++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 37 deletions(-)
 delete mode 100644 metadata/com.android.talkback.txt
 create mode 100644 metadata/com.android.talkback.yml

diff --git a/metadata/com.android.talkback.txt b/metadata/com.android.talkback.txt
deleted file mode 100644
index 2435294fce..0000000000
--- a/metadata/com.android.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:5.0.7_aosp,50007000
-    commit=12bdf2063e121a021f050c94cf5ebb2489c8af8a
-    patch=play-services-50007000.patch
-    output=build/outputs/apk/com.android.talkback-aosp-release.apk
-    rm=libs
-    build=gradle assembleRelease && \
-        zip -d build/outputs/apk/com.android.talkback-aosp-release.apk 'META-INF/*.*'
-
-Auto Update Mode:None
-Update Check Mode:None
diff --git a/metadata/com.android.talkback.yml b/metadata/com.android.talkback.yml
new file mode 100644
index 0000000000..f376a92744
--- /dev/null
+++ b/metadata/com.android.talkback.yml
@@ -0,0 +1,41 @@
+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: 5.0.7_aosp
+    versionCode: 50007000
+    commit: 12bdf2063e121a021f050c94cf5ebb2489c8af8a
+    patch:
+      - play-services-50007000.patch
+    output: build/outputs/apk/com.android.talkback-aosp-release.apk
+    rm:
+      - libs
+    build:
+      - gradle assembleRelease
+      - zip -d build/outputs/apk/com.android.talkback-aosp-release.apk 'META-INF/*.*'
+
+AutoUpdateMode: None
+UpdateCheckMode: None

From 508bd1f58816515a5b127e515cc53e1b634beff8 Mon Sep 17 00:00:00 2001
From: Pierre Rudloff <contact@rudloff.pro>
Date: Mon, 11 Feb 2019 11:04:47 +0100
Subject: [PATCH 2/2] Explain the difference between com.android.talkback and
 com.google.android.accessibility.talkback

---
 metadata/com.android.talkback.yml                      | 4 +++-
 metadata/com.google.android.accessibility.talkback.yml | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/metadata/com.android.talkback.yml b/metadata/com.android.talkback.yml
index f376a92744..81d94735f7 100644
--- a/metadata/com.android.talkback.yml
+++ b/metadata/com.android.talkback.yml
@@ -4,7 +4,7 @@ License: Apache-2.0
 WebSite: https://support.google.com/accessibility/android/answer/6283677?hl=en
 SourceCode: https://github.com/google/talkback
 
-AutoName: TalkBack
+AutoName: TalkBack (legacy)
 Summary: Accessibility improvements
 Description: |-
     TalkBack is an Accessibility Service that helps blind and vision-impaired users
@@ -21,6 +21,8 @@ Description: |-
     # Select Accessibility
     # Enable TalkBack checkboxes
 
+    This app is for Android versions older than 8.0. If your device runs Android 8.0 or later, you should use [[com.google.android.accessibility.talkback]] instead.
+
 RepoType: git
 Repo: https://github.com/google/talkback.git
 
diff --git a/metadata/com.google.android.accessibility.talkback.yml b/metadata/com.google.android.accessibility.talkback.yml
index d3cf6545e2..75efa5395c 100644
--- a/metadata/com.google.android.accessibility.talkback.yml
+++ b/metadata/com.google.android.accessibility.talkback.yml
@@ -21,6 +21,8 @@ Description: |-
     # Select Accessibility
     # Enable TalkBack checkboxes
 
+    This app is for Android 8.0 or later. If your device runs an older version of Android, you should use [[com.android.talkback]] instead.
+
 RepoType: git
 Repo: https://github.com/google/talkback.git