From db7fe5e5f7b94bde5dd56fcdcd5a07abe1f53a43 Mon Sep 17 00:00:00 2001
From: Matthew Fritze <mfritze@google.com>
Date: Tue, 26 Feb 2019 14:14:56 -0800
Subject: [PATCH] Fix panel bugs

Add unique task affinity so the panel activity
always opens alone. Apparently the launchMode="singleTop" was
insufficient.

Test: manual app
Fixes: 126385021
Fixes: 126386586
Fixes: 126326438
Change-Id: I775e84701d006cfbe0d9ddfff83669b3f8487b33
---
 AndroidManifest.xml              | 1 +
 res/layout-land/panel_layout.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6724ff5355d..a5586f7955e 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" />
diff --git a/res/layout-land/panel_layout.xml b/res/layout-land/panel_layout.xml
index 3975bfeaa3f..049fd0b579b 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"