Merge "Use correct title when opening from notification" into oc-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ecba241..c7610f6 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2796,7 +2796,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" />
@@ -2807,7 +2807,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 57abe34..d5a4189 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -7615,8 +7615,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] -->