Merge "Remove parent activity from TTS_SETTINGS" into qt-dev am: 87631db975

am: 3f7b3d653f

Change-Id: I5934425f788e5c1c57b11f2af400d11d62d73d69
This commit is contained in:
Fan Zhang
2019-04-30 23:16:32 -07:00
committed by android-build-merger

View File

@@ -1472,8 +1472,7 @@
<activity <activity
android:name="Settings$TextToSpeechSettingsActivity" android:name="Settings$TextToSpeechSettingsActivity"
android:label="@string/tts_settings" android:label="@string/tts_settings">
android:parentActivityName="Settings">
<intent-filter android:priority="1"> <intent-filter android:priority="1">
<action android:name="com.android.settings.TTS_SETTINGS" /> <action android:name="com.android.settings.TTS_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />