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

Merge "Add screen timeout destination to settings" into main

Browse Source
This commit is contained in:
YK Hung
2023-12-12 10:11:43 +00:00
committed by Android (Google) Code Review
parent 249434d02b 336c441db5
commit cf48086210
3 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/Settings.java
View File

@@ -478,4 +478,6 @@ public class Settings extends SettingsActivity {
public static class OneHandedSettingsActivity extends SettingsActivity { /* empty */ }
public static class PreviouslyConnectedDeviceActivity extends SettingsActivity { /* empty */ }
public static class ScreenTimeoutActivity extends SettingsActivity { /* empty */ }
}

4
src/com/android/settings/core/gateway/SettingsGateway.java
View File

@@ -100,6 +100,7 @@ import com.android.settings.deviceinfo.firmwareversion.FirmwareVersionSettings;
import com.android.settings.deviceinfo.legal.ModuleLicensesDashboard;
import com.android.settings.display.AutoBrightnessSettings;
import com.android.settings.display.NightDisplaySettings;
import com.android.settings.display.ScreenTimeoutSettings;
import com.android.settings.display.SmartAutoRotatePreferenceFragment;
import com.android.settings.display.darkmode.DarkModeSettingsFragment;
import com.android.settings.dream.DreamSettings;
@@ -369,7 +370,8 @@ public class SettingsGateway {
LongBackgroundTasksDetails.class.getName(),
RegionalPreferencesEntriesFragment.class.getName(),
BatteryInfoFragment.class.getName(),
UserAspectRatioDetails.class.getName()
UserAspectRatioDetails.class.getName(),
ScreenTimeoutSettings.class.getName(),
};
public static final String[] SETTINGS_FOR_RESTRICTED = {