commit 4781fc1687d7b9891a4d55f80dea8f4059c52fcf
author Tsung-Mao Fang <tmfang@google.com> Mon Sep 06 02:41:26 2021 +0000
committer Tsung-Mao Fang <tmfang@google.com> Mon Sep 06 02:41:26 2021 +0000
tree b84e9c86feb0369520ead6b6a8add63bb827a977
parent 07037dbc3fdbaceb2c95e3d3909bf20563e9e12a

Revert "Revert "Support two pane design in the Settings app.""

This reverts commit 07037dbc3fdbaceb2c95e3d3909bf20563e9e12a.

Reason for revert: <Issue already was fixed in ag/15743576 and ag/15743577>

Bug: 197716926
Change-Id: I72b98f8feb513f34e88e735efd578a8e3d9a1963

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c88639f..d8bbe8f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -108,7 +108,9 @@
     <uses-permission android:name="android.permission.READ_DREAM_SUPPRESSION" />
     <uses-permission android:name="android.permission.MANAGE_APP_HIBERNATION" />
 
-    <application android:label="@string/settings_label"
+    <application
+            android:name=".SettingsApplication"
+            android:label="@string/settings_label"
             android:icon="@drawable/ic_launcher_settings"
             android:theme="@style/Theme.Settings"
             android:hardwareAccelerated="true"