commit 9e98b8cf0fd0669fdc3c351aafb91fa8e4a0d9ad
author Fan Zhang <zhfan@google.com> Tue May 14 16:30:16 2019 +0000
committer Fan Zhang <zhfan@google.com> Tue May 14 16:31:08 2019 +0000
tree 3cdc132e52db69814cc7dbda4e27257366d33ff0
parent c2a85a374d28612c8d51d72523b49f9c2856f96e

Revert "Make subsettings display edge-to-edge"

This reverts commit c2a85a374d28612c8d51d72523b49f9c2856f96e.

Bug: 132672399
Bug: 132182711
Test: n/a

Reason for revert: b/132672399

Change-Id: Icb34ae5b16b7a32215fe2c1a5f0d0d028c91b2ca

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0603796..8e62c45 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -164,8 +164,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">