commit d3824aa426000d01a3e7e12f77e437963e49eef9
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Feb 26 23:40:15 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 26 23:40:15 2019 +0000
tree fcb3c5d641716023cdaa6d46c8ec916960295ebc
parent 98f58f9102b5413693e2d85d3cc80bab88d5775d
parent db7fe5e5f7b94bde5dd56fcdcd5a07abe1f53a43

Merge "Fix panel bugs"

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6724ff5..a5586f7 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3009,6 +3009,7 @@
             android:theme="@style/Theme.BottomDialog"
             android:excludeFromRecents="true"
             android:launchMode="singleTop"
+            android:taskAffinity=".panel.SettingsPanelActivity"
             android:exported="true">
                  <intent-filter>
                      <action android:name="android.settings.panel.action.INTERNET_CONNECTIVITY" />

res/layout-land/panel_layout.xml

diff --git a/res/layout-land/panel_layout.xml b/res/layout-land/panel_layout.xml
index 3975bfe..049fd0b 100644
--- a/res/layout-land/panel_layout.xml
+++ b/res/layout-land/panel_layout.xml
@@ -20,7 +20,7 @@
               android:orientation="vertical">
 
     <TextView
-        android:id="@+id/title"
+        android:id="@+id/panel_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center"