commit 788dbf7dd2f7bf25ddde793cc864a267ffc97b29
author Justin Klaassen <justinklaassen@google.com> Fri Jul 22 22:15:47 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jul 22 22:15:47 2016 +0000
tree 3086aa39a23e3ad433548940231b8427fede127f
parent a83ee331b2f968e9add04e22e3f58c33eb4fe1c3
parent 478dec45ce8f37570e432aa7470e6b08df8830c6

Add NightDisplaySettingsActivity am: eae3d9f932
am: 478dec45ce

Change-Id: Iea276484fd48b3a71fda30eae1cf153c3999a85a

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index df101ff..d90ce9d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -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

diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 3036bd18..feeabe7 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -50,6 +50,7 @@
     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

diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 85ad2a0..36c3ebc 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -81,6 +81,7 @@
 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 @@
             WifiAPITest.class.getName(),
             WifiInfo.class.getName(),
             MasterClear.class.getName(),
+            NightDisplaySettings.class.getName(),
     };