Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53e9f352 authored by Justin Klaassen's avatar Justin Klaassen Committed by Android (Google) Code Review
Browse files

Merge "Add NightDisplaySettingsActivity" into nyc-mr1-dev

parents bbb844f9 eae3d9f9

AndroidManifest.xml

+19 −0
Original line number Diff line number Diff line
@@ -959,6 +959,25 @@ 
                android:value="com.android.settings.DisplaySettings" />

        </activity-alias>



        <activity android:name="Settings$NightDisplaySettingsActivity"

                android:label="@string/night_display_title"

                android:icon="@drawable/ic_settings_night_display"

                android:taskAffinity="">

            <intent-filter android:priority="1">

                <action android:name="android.settings.NIGHT_DISPLAY_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.display.NightDisplaySettings" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                android:value="true" />

        </activity>



        <activity android:name="Settings$DeviceInfoSettingsActivity"

                android:theme="@style/Theme.SubSettingsDialogWhenLarge"

                android:label="@string/device_info_settings"

src/com/android/settings/Settings.java

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ public class Settings extends SettingsActivity { 
    public static class UserDictionarySettingsActivity extends SettingsActivity { /* empty */ }

    public static class HomeSettingsActivity extends SettingsActivity { /* empty */ }

    public static class DisplaySettingsActivity extends SettingsActivity { /* empty */ }

    public static class NightDisplaySettingsActivity extends SettingsActivity { /* empty */ }

    public static class DeviceInfoSettingsActivity extends SettingsActivity { /* empty */ }

    public static class ApplicationSettingsActivity extends SettingsActivity { /* empty */ }

    public static class ManageApplicationsActivity extends SettingsActivity { /* empty */ }

src/com/android/settings/SettingsActivity.java

+2 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ import com.android.settings.deviceinfo.PublicVolumeSettings; 
import com.android.settings.deviceinfo.SimStatus;

import com.android.settings.deviceinfo.Status;

import com.android.settings.deviceinfo.StorageSettings;

import com.android.settings.display.NightDisplaySettings;

import com.android.settings.fuelgauge.BatterySaverSettings;

import com.android.settings.fuelgauge.PowerUsageDetail;

import com.android.settings.fuelgauge.PowerUsageSummary;
@@ -351,6 +352,7 @@ public class SettingsActivity extends SettingsDrawerActivity 
            WifiAPITest.class.getName(),

            WifiInfo.class.getName(),

            MasterClear.class.getName(),

            NightDisplaySettings.class.getName(),

    };