Merge "Format battery java test code" into main
diff --git a/aconfig/Android.bp b/aconfig/Android.bp
index f485869..eb9a6b4 100644
--- a/aconfig/Android.bp
+++ b/aconfig/Android.bp
@@ -6,17 +6,7 @@
name: "aconfig_settings_flags",
package: "com.android.settings.flags",
srcs: [
- "settings_accessibility_flag_declarations.aconfig",
- "settings_connecteddevice_flag_declarations.aconfig",
- "settings_development_flag_declarations.aconfig",
- "settings_globalintl_flag_declarations.aconfig",
- "settings_experience_flag_declarations.aconfig",
- "settings_notification_flag_declarations.aconfig",
- "settings_onboarding_experience_flag_declarations.aconfig",
- "settings_telephony_flag_declarations.aconfig",
- "settings_biometrics_integration_declarations.aconfig",
- "settings_voice_activation_apps_flag_declarations.aconfig",
- "settings_biometrics_framework_flag_declarations.aconfig",
+ "*.aconfig",
],
}
diff --git a/aconfig/settings_panel_flag_declarations.aconfig b/aconfig/settings_panel_flag_declarations.aconfig
new file mode 100644
index 0000000..10eb655
--- /dev/null
+++ b/aconfig/settings_panel_flag_declarations.aconfig
@@ -0,0 +1,8 @@
+package: "com.android.settings.flags"
+
+flag {
+ name: "enable_volume_plus_quick_settings"
+ namespace: "pixel_cross_device_control"
+ description: "Gates whether to enable VolumePlus quick settings panel."
+ bug: "309052662"
+}
diff --git a/src/com/android/settings/display/darkmode/DarkModeCustomBedtimePreferenceController.java b/src/com/android/settings/display/darkmode/DarkModeCustomBedtimePreferenceController.java
index c6e379c..488befb 100644
--- a/src/com/android/settings/display/darkmode/DarkModeCustomBedtimePreferenceController.java
+++ b/src/com/android/settings/display/darkmode/DarkModeCustomBedtimePreferenceController.java
@@ -20,6 +20,7 @@
import android.app.UiModeManager;
import android.content.Context;
+import android.content.Intent;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
@@ -52,7 +53,12 @@
super.displayPreference(screen);
mFooterPreference = screen.findPreference(getPreferenceKey());
mFooterPreference.setLearnMoreAction(
- v -> v.getContext().startActivity(mBedtimeSettings.getBedtimeSettingsIntent()));
+ v -> {
+ Intent bedtimeSettingsIntent = mBedtimeSettings.getBedtimeSettingsIntent();
+ if (bedtimeSettingsIntent != null) {
+ v.getContext().startActivity(bedtimeSettingsIntent);
+ }
+ });
mFooterPreference.setLearnMoreText(
mContext.getString(R.string.dark_ui_bedtime_footer_action));
}