Merge "Revert "Make subsettings display edge-to-edge"" into qt-dev am: 9a51ede665

am: 7db72f0ef1

Change-Id: Ie400dae74f651ba127a372d5109967f2256f509e
This commit is contained in:
Fan Zhang
2019-05-14 11:34:47 -07:00
committed by android-build-merger
6 changed files with 11 additions and 14 deletions

View File

@@ -162,8 +162,7 @@
</receiver>
<activity android:name=".SubSettings"
android:parentActivityName="Settings"
android:theme="@style/Theme.SubSettings"/>
android:parentActivityName="Settings" />
<activity android:name=".Settings$CreateShortcutActivity"
android:label="@string/settings_shortcut">