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

Merge "Check if the bedtime settings intent is null before launch" into main

Browse Source
This commit is contained in:
Treehugger Robot
2023-11-07 02:58:40 +00:00
committed by Android (Google) Code Review
parent 2ddabf5785 9ad7284d3f
commit 01e207ede7
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/display/darkmode/DarkModeCustomBedtimePreferenceController.java
View File

@@ -20,6 +20,7 @@ import static android.app.UiModeManager.MODE_NIGHT_CUSTOM_TYPE_BEDTIME;
import android.app.UiModeManager; import android.app.UiModeManager;
import android.content.Context; import android.content.Context;
import android.content.Intent;
import androidx.preference.Preference; import androidx.preference.Preference;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
@@ -52,7 +53,12 @@ public class DarkModeCustomBedtimePreferenceController extends BasePreferenceCon
super.displayPreference(screen); super.displayPreference(screen);
mFooterPreference = screen.findPreference(getPreferenceKey()); mFooterPreference = screen.findPreference(getPreferenceKey());
mFooterPreference.setLearnMoreAction( mFooterPreference.setLearnMoreAction(
v -> v.getContext().startActivity(mBedtimeSettings.getBedtimeSettingsIntent())); v -> {
Intent bedtimeSettingsIntent = mBedtimeSettings.getBedtimeSettingsIntent();
if (bedtimeSettingsIntent != null) {
v.getContext().startActivity(bedtimeSettingsIntent);
}
});
mFooterPreference.setLearnMoreText( mFooterPreference.setLearnMoreText(
mContext.getString(R.string.dark_ui_bedtime_footer_action)); mContext.getString(R.string.dark_ui_bedtime_footer_action));
} }