Merge "Add shadow to searchbar when user scrolls vertically" into oc-dr1-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 10ec779..7e67962 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3074,7 +3074,7 @@
<activity android:name=".support.SupportDashboardActivity"
android:label="@string/page_tab_title_support"
android:icon="@drawable/ic_help"
- android:theme="@android:style/Theme.NoDisplay"
+ android:theme="@android:style/Theme.DeviceDefault.Light.Panel"
android:enabled="@bool/config_support_enabled">
<intent-filter android:priority="-2">
<action android:name="com.android.settings.action.SETTINGS"/>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 100d295..4b54fa8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -6671,7 +6671,7 @@
<string name="zen_mode_summary_combination"><xliff:g id="mode" example="Priority only">%1$s</xliff:g>: <xliff:g id="exit condition" example="Until you turn this off">%2$s</xliff:g></string>
<!-- Do not disturb: Title for the Visual interruptions option and associated settings page. [CHAR LIMIT=30] -->
- <string name="zen_mode_visual_interruptions_settings_title">Block visual disturbances</string>
+ <string name="zen_mode_visual_interruptions_settings_title">Block visual signals</string>
<!-- Work Sounds: Work sound settings section header. [CHAR LIMIT=50] -->
<string name="sound_work_settings">Work profile sounds</string>
diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java
index 59e588d..e6b10c3 100644
--- a/src/com/android/settings/notification/ZenModeSettings.java
+++ b/src/com/android/settings/notification/ZenModeSettings.java
@@ -172,9 +172,7 @@
? getString(R.string.switch_off_text)
: getString(R.string.zen_mode_rule_summary_enabled_combination, mode);
- return isSystemRule ? ruleState
- : getString(R.string.zen_mode_rule_summary_provider_combination,
- providerLabel, ruleState);
+ return ruleState;
}
private static ManagedServiceSettings.Config getConditionProviderConfig() {
diff --git a/src/com/android/settings/support/SupportDashboardActivity.java b/src/com/android/settings/support/SupportDashboardActivity.java
index d3fcf9a..819d5f7 100644
--- a/src/com/android/settings/support/SupportDashboardActivity.java
+++ b/src/com/android/settings/support/SupportDashboardActivity.java
@@ -47,8 +47,8 @@
supportFeatureProvider.startSupportV2(this);
} else {
startActivity(new Intent(this, LegacySupportActivity.class));
+ finish();
}
- finish();
}
/**