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

Merge "Dark theme settings activity" into qt-qpr1-dev am: 8b95d6ab2a

Browse Source 
Change-Id: Iff1b55f02a99f8237b080d1bf31d33749f61ba6d
This commit is contained in:
Automerger Merge Worker
2019-12-12 20:51:46 +00:00
parent c5075647ee 8b95d6ab2a
commit cafec428ef
3 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
AndroidManifest.xml
View File

@@ -935,6 +935,24 @@
android:value="true" />
</activity>
<activity
android:name="Settings$DarkThemeSettingsActivity"
android:label="@string/dark_ui_auto_mode_title"
android:enabled="true">
<intent-filter android:priority="32">
<action android:name="android.intent.action.MAIN" />
<category android:name="com.android.settings.SHORTCUT" />
</intent-filter>
<intent-filter android:priority="1">
<action android:name="android.settings.DARK_THEME_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.darkmode.DarkModeSettingsFragment" />
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
android:value="true" />
</activity>
<activity
android:name="Settings$NightDisplaySuggestionActivity"
android:enabled="@*android:bool/config_nightDisplayAvailable"

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

@@ -52,6 +52,7 @@ public class Settings extends SettingsActivity {
public static class LocalePickerActivity extends SettingsActivity { /* empty */ }
public static class LanguageAndInputSettingsActivity extends SettingsActivity { /* empty */ }
public static class UserDictionarySettingsActivity extends SettingsActivity { /* empty */ }
public static class DarkThemeSettingsActivity extends SettingsActivity { /* empty */ }
public static class DisplaySettingsActivity extends SettingsActivity { /* empty */ }
public static class NightDisplaySettingsActivity extends SettingsActivity { /* empty */ }
public static class NightDisplaySuggestionActivity extends NightDisplaySettingsActivity { /* empty */ }

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

@@ -74,6 +74,7 @@ import com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment;
import com.android.settings.deviceinfo.firmwareversion.FirmwareVersionSettings;
import com.android.settings.deviceinfo.legal.ModuleLicensesDashboard;
import com.android.settings.display.NightDisplaySettings;
import com.android.settings.display.darkmode.DarkModeSettingsFragment;
import com.android.settings.dream.DreamSettings;
import com.android.settings.enterprise.EnterprisePrivacySettings;
import com.android.settings.fuelgauge.AdvancedPowerUsageDetail;
@@ -281,7 +282,8 @@ public class SettingsGateway {
PreviouslyConnectedDeviceDashboardFragment.class.getName(),
BatterySaverScheduleSettings.class.getName(),
MobileNetworkListFragment.class.getName(),
GlobalActionsPanelSettings.class.getName()
GlobalActionsPanelSettings.class.getName(),
DarkModeSettingsFragment.class.getName()
};
public static final String[] SETTINGS_FOR_RESTRICTED = {