PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use correct title when opening from notification" into oc-dev am: f61d4f38be

Browse Source 
am: c783d634a3

Change-Id: I09962c3046fbb833cf08455593f73ab3ffa761d1
This commit is contained in:
Christine Franks
2017-04-12 18:04:59 +00:00
committed by android-build-merger
parent c879dfc11f c783d634a3
commit 594d15386c
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
AndroidManifest.xml
View File

@@ -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" />

2
res/values/strings.xml
View File

@@ -7614,8 +7614,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] -->