Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove unused development setting" into rvc-dev

Browse Source
This commit is contained in:
Julia Reynolds
2020-04-29 15:25:24 +00:00
committed by Android (Google) Code Review
parent ae052226b5 ccd18a9d58
commit 74b8acae26
3 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/provider/Settings.java
View File

@@ -13829,16 +13829,6 @@ public final class Settings {
public static final String SHOW_NOTIFICATION_CHANNEL_WARNINGS =
"show_notification_channel_warnings";
/**
* When enabled, requires all notifications in the conversation section to be backed
* by a long-lived sharing shortcut
*
* The value 1 - require a shortcut, 0 - do not require a shortcut
* @hide
*/
public static final String REQUIRE_SHORTCUTS_FOR_CONVERSATIONS =
"require_shortcuts_for_conversations";
/**
* Whether cell is enabled/disabled
* @hide

5
packages/SettingsLib/res/values/strings.xml
View File

@@ -937,11 +937,6 @@
<!-- UI debug setting: show missing channel toasts summary [CHAR LIMIT=50] -->
<string name="show_notification_channel_warnings_summary">Displays on-screen warning when an app posts a notification without a valid channel</string>
<!-- UI debug setting: enforce shortcut requirements for conversation space [CHAR LIMIT=25] -->
<string name="enforce_shortcuts_for_conversations">Enforce shortcuts for conversation notifications</string>
<!-- UI debug setting: enforce shortcut requirements for conversation space summary [CHAR LIMIT=50] -->
<string name="enforce_shortcuts_for_conversations_summary">Require notifications to be backed by a long-lived sharing shortcut in order to appear in the conversation section</string>
<!-- UI debug setting: force allow apps on external storage [CHAR LIMIT=50] -->
<string name="force_allow_on_external">Force allow apps on external</string>
<!-- UI debug setting: force allow on external summary [CHAR LIMIT=150] -->

1
packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
View File

@@ -420,7 +420,6 @@ public class SettingsBackupTest {
Settings.Global.RECOMMENDED_NETWORK_EVALUATOR_CACHE_EXPIRY_MS,
Settings.Global.READ_EXTERNAL_STORAGE_ENFORCED_DEFAULT,
Settings.Global.REQUIRE_PASSWORD_TO_DECRYPT,
Settings.Global.REQUIRE_SHORTCUTS_FOR_CONVERSATIONS,
Settings.Global.SAFE_BOOT_DISALLOWED,
Settings.Global.SELINUX_STATUS,
Settings.Global.SELINUX_UPDATE_CONTENT_URL,