From e12bf697b0d14b9bb871b177d0928c2789d923f0 Mon Sep 17 00:00:00 2001
From: Christine Franks <christyfranks@google.com>
Date: Tue, 11 Apr 2017 09:56:09 -0700
Subject: [PATCH] Use correct title when opening from notification

Bug: 36070413
Test: tap system alert window notification, which brings up Settings
with the correct title.

Change-Id: I6f346a7336a71c046cbc58b7291a851a7537d5ac
---
 AndroidManifest.xml    | 4 ++--
 res/values/strings.xml | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index da88f76f739..1082c492110 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2813,7 +2813,7 @@
         </provider>
 
         <activity android:name="Settings$OverlaySettingsActivity"
-                android:label="@string/draw_overlay_title"
+                android:label="@string/draw_overlay"
                 android:taskAffinity="">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.action.MANAGE_OVERLAY_PERMISSION" />
@@ -2824,7 +2824,7 @@
         </activity>
 
         <activity android:name="Settings$AppDrawOverlaySettingsActivity"
-                android:label="@string/draw_overlay_title"
+                android:label="@string/draw_overlay"
                 android:taskAffinity="">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.action.MANAGE_OVERLAY_PERMISSION" />
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f6b36b47a47..c9df09a6a46 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -7613,8 +7613,6 @@
     <string name="accessibility_lock_screen_progress"><xliff:g id="count" example="1">%1$d</xliff:g> of <xliff:g id="count" example="1">%2$d</xliff:g> characters used</string>
 
     <!-- System Alert Window settings -->
-    <!-- Title of display overlay preference item [CHAR LIMIT=55] -->
-    <string name="draw_overlay_title">Apps that can display over other apps</string>
     <!-- Title of display overlay screen [CHAR LIMIT=30] -->
     <string name="draw_overlay">Display over other apps</string>
     <!-- Settings title in main settings screen for SYSTEM_ALERT_WINDOW [CHAR LIMIT=45] -->