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

Commit e4c73c24 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove Night Light suggestion. DO NOT MERGE" into oc-dev

parents f84c8d34 40067bee

AndroidManifest.xml

+2 −12
Original line number Diff line number Diff line
@@ -901,24 +901,14 @@ 
                android:enabled="@*android:bool/config_nightDisplayAvailable"

                android:icon="@drawable/ic_settings_night_display"

                android:taskAffinity="">

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

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

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

            </intent-filter>

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

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

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

            </intent-filter>

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

                android:value="true" />

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

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

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

                android:value="30" />

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

                android:resource="@string/night_display_suggestion_title" />

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

                android:resource="@string/night_display_suggestion_summary" />

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

                android:value="true" />

        </activity>



        <activity android:name="Settings$DeviceInfoSettingsActivity"

res/values/strings.xml

+0 −6
Original line number Diff line number Diff line
@@ -7871,12 +7871,6 @@ 
    <!-- Summary of condition that work mode is off [CHAR LIMIT=NONE] -->

    <string name="condition_work_summary">Apps, background sync, and other features related to your work profile are turned off.</string>









    <!--  Night display: Title for the night display option Suggestion (renamed "Night Light" with title caps). [CHAR LIMIT=NONE] -->









    <string name="night_display_suggestion_title">Set Night Light schedule</string>

















    <!--  Night display: Summary for the night display option Suggestion (renamed "Night Light" with title caps). [CHAR LIMIT=30] -->









    <string name="night_display_suggestion_summary">Tint screen amber to help you fall asleep</string>

















    <!-- Title of condition that night display is on (renamed "Night Light" with title caps). [CHAR LIMIT=30] -->









    <string name="condition_night_display_title">Night Light is on</string>

































tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java



+0
−6






























Original line number
Diff line number
Diff line







@@ -53,12 +53,6 @@ public class SettingsSuggestionsTest {







        R.string.wallpaper_suggestion_title, R.string.wallpaper_suggestion_summary);









  }



















  @Test









  public void nightDisplaySettings_isValid() {









    assertSuggestionEquals("Settings$NightDisplaySettingsActivity",









        R.string.night_display_suggestion_title, R.string.night_display_suggestion_summary);









  }



















  @Test









  public void fingerprintSuggestion_isValid() {









    assertSuggestionEquals("com.android.settings.Settings$FingerprintSuggestionActivity",