Add screen timeout destination to settings
When an intent with action android.settings.SCREEN_TIMEOUT_SETTINGS is launched, ScreenTimeoutSettings should be shown in settings Bug: 293813663 Test: manual and local build verify Change-Id: I1340cd3c233aa5d36f45b53b0fd2b6924f3a1d75
This commit is contained in:
@@ -491,6 +491,17 @@
|
|||||||
android:value="@string/menu_key_display"/>
|
android:value="@string/menu_key_display"/>
|
||||||
</activity>
|
</activity>
|
||||||
|
|
||||||
|
<activity android:name=".Settings$ScreenTimeoutActivity"
|
||||||
|
android:label="@string/screen_timeout"
|
||||||
|
android:exported="true">
|
||||||
|
<intent-filter>
|
||||||
|
<action android:name="android.settings.SCREEN_TIMEOUT_SETTINGS" />
|
||||||
|
<category android:name="android.intent.category.DEFAULT" />
|
||||||
|
</intent-filter>
|
||||||
|
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
|
||||||
|
android:value="com.android.settings.display.ScreenTimeoutSettings"/>
|
||||||
|
</activity>
|
||||||
|
|
||||||
<activity
|
<activity
|
||||||
android:name="Settings$ConfigureWifiSettingsActivity"
|
android:name="Settings$ConfigureWifiSettingsActivity"
|
||||||
android:label="@string/wifi_configure_settings_preference_title"
|
android:label="@string/wifi_configure_settings_preference_title"
|
||||||
|
@@ -478,4 +478,6 @@ public class Settings extends SettingsActivity {
|
|||||||
public static class OneHandedSettingsActivity extends SettingsActivity { /* empty */ }
|
public static class OneHandedSettingsActivity extends SettingsActivity { /* empty */ }
|
||||||
|
|
||||||
public static class PreviouslyConnectedDeviceActivity extends SettingsActivity { /* empty */ }
|
public static class PreviouslyConnectedDeviceActivity extends SettingsActivity { /* empty */ }
|
||||||
|
|
||||||
|
public static class ScreenTimeoutActivity extends SettingsActivity { /* empty */ }
|
||||||
}
|
}
|
||||||
|
@@ -100,6 +100,7 @@ import com.android.settings.deviceinfo.firmwareversion.FirmwareVersionSettings;
|
|||||||
import com.android.settings.deviceinfo.legal.ModuleLicensesDashboard;
|
import com.android.settings.deviceinfo.legal.ModuleLicensesDashboard;
|
||||||
import com.android.settings.display.AutoBrightnessSettings;
|
import com.android.settings.display.AutoBrightnessSettings;
|
||||||
import com.android.settings.display.NightDisplaySettings;
|
import com.android.settings.display.NightDisplaySettings;
|
||||||
|
import com.android.settings.display.ScreenTimeoutSettings;
|
||||||
import com.android.settings.display.SmartAutoRotatePreferenceFragment;
|
import com.android.settings.display.SmartAutoRotatePreferenceFragment;
|
||||||
import com.android.settings.display.darkmode.DarkModeSettingsFragment;
|
import com.android.settings.display.darkmode.DarkModeSettingsFragment;
|
||||||
import com.android.settings.dream.DreamSettings;
|
import com.android.settings.dream.DreamSettings;
|
||||||
@@ -369,7 +370,8 @@ public class SettingsGateway {
|
|||||||
LongBackgroundTasksDetails.class.getName(),
|
LongBackgroundTasksDetails.class.getName(),
|
||||||
RegionalPreferencesEntriesFragment.class.getName(),
|
RegionalPreferencesEntriesFragment.class.getName(),
|
||||||
BatteryInfoFragment.class.getName(),
|
BatteryInfoFragment.class.getName(),
|
||||||
UserAspectRatioDetails.class.getName()
|
UserAspectRatioDetails.class.getName(),
|
||||||
|
ScreenTimeoutSettings.class.getName(),
|
||||||
};
|
};
|
||||||
|
|
||||||
public static final String[] SETTINGS_FOR_RESTRICTED = {
|
public static final String[] SETTINGS_FOR_RESTRICTED = {
|
||||||
|
Reference in New Issue
Block a user