commit 87c7f56d3521e2519908e43ba3e820f4b5c7ace4
author Yanting Yang <yantingyang@google.com> Thu Mar 28 15:18:40 2019 +0800
committer Yanting Yang <yantingyang@google.com> Thu Mar 28 15:18:40 2019 +0800
tree 3bb8cd2fad3c64f2dcebae3fd297a6a75a455617
parent 41562c66aaa44fb1c5cf298e58017557693d31cd

Fix navigation back problem from Assist app

Fixes: 127907113
Test: visual
Change-Id: I07196ee9f92f9d84fa75eb32cb6564b362f1293d

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4166d6f..421de25 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -607,8 +607,7 @@
 
         <activity
             android:name="Settings$ManageAssistActivity"
-            android:label="@string/assist_and_voice_input_title"
-            android:parentActivityName="Settings">
+            android:label="@string/assist_and_voice_input_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.VOICE_INPUT_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />