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

Commit 20d5923f authored by Aayush Gupta's avatar Aayush Gupta
Browse files

Merge remote-tracking branch 'origin/lineage-18.1' into v1-r

parents f78dc18d 864537e7
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -136,6 +136,10 @@
    <string name="app_notification_sound_timeout_value_15_minutes">10 minutes</string>
    <string name="app_notification_sound_timeout_value_30_minutes">30 minutes</string>

    <!-- One shot automatic brightness -->
    <string name="auto_brightness_one_shot_title">One shot auto-brightness</string>
    <string name="auto_brightness_one_shot_summary">Brightness adjustment will only occur at the moment the screen is turned on</string>

    <!-- Per-app data restrictions -->
    <string name="data_usage_app_restrict_all">Allow network access</string>
    <string name="data_usage_app_restrict_all_summary">Enable network usage</string>
+0 −3
Original line number Diff line number Diff line
@@ -2747,9 +2747,6 @@
    <string name="auto_brightness_disclaimer">Optimize brightness level for available light. When this feature is on, you can still adjust brightness temporarily.</string>
    <!-- Description about the feature adaptive brightness -->
    <string name="auto_brightness_description">Your screen brightness will automatically adjust to your environment and activities. You can move the slider manually to help adaptive brightness learn your preferences.</string>
    <!-- One shot automatic Brightness -->
    <string name="auto_brightness_one_shot_title">Only apply when screen is turned on</string>
    <string name="auto_brightness_one_shot_summary">Adjustment will occur one time</string>
    <!-- Display settings screen, display white balance settings title [CHAR LIMIT=30] -->
    <string name="display_white_balance_title">Display white balance</string>
+1 −1
Original line number Diff line number Diff line
@@ -17,12 +17,12 @@
package com.android.settings.display;

import android.content.Context;

import lineageos.providers.LineageSettings;

import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;


public class AutoBrightnessOneShotPreferenceController extends TogglePreferenceController {

    private final String SYSTEM_KEY = "auto_brightness_one_shot";