Merge "Fix navigation back problem from Assist app"

This commit is contained in:
TreeHugger Robot
2019-03-28 09:21:24 +00:00
committed by Android (Google) Code Review

View File

@@ -620,8 +620,7 @@
<activity <activity
android:name="Settings$ManageAssistActivity" android:name="Settings$ManageAssistActivity"
android:label="@string/assist_and_voice_input_title" android:label="@string/assist_and_voice_input_title">
android:parentActivityName="Settings">
<intent-filter android:priority="1"> <intent-filter android:priority="1">
<action android:name="android.settings.VOICE_INPUT_SETTINGS" /> <action android:name="android.settings.VOICE_INPUT_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />