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

Commit bd105d62 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add entry point for adaptive brightness settings" am: d3d24b65 am: f7836dd7 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1698500

Change-Id: I50db46670b28fe29d5f5c3911ea09fd5b99f1c9d
parents bf0755ee f7836dd7

AndroidManifest.xml

+11 −0
Original line number Diff line number Diff line
@@ -325,6 +325,17 @@ 
                android:value="true" />

        </activity>



        <activity android:name=".Settings$AdaptiveBrightnessActivity"

            android:label="@string/auto_brightness_title"

            android:exported="true">

            <intent-filter>

                <action android:name="android.settings.ADAPTIVE_BRIGHTNESS_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.AutoBrightnessSettings"/>

        </activity>



        <activity

            android:name="Settings$ConfigureWifiSettingsActivity"

            android:label="@string/wifi_configure_settings_preference_title"

src/com/android/settings/Settings.java

+2 −0
Original line number Diff line number Diff line
@@ -322,4 +322,6 @@ public class Settings extends SettingsActivity { 
     * Activity for AppDashboard.

     */

    public static class AppDashboardActivity extends SettingsActivity {}



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

}

src/com/android/settings/core/gateway/SettingsGateway.java

+5 −1
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ import com.android.settings.deviceinfo.StorageDashboardFragment; 
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.AutoBrightnessSettings;

import com.android.settings.display.NightDisplaySettings;

import com.android.settings.display.SmartAutoRotatePreferenceFragment;

import com.android.settings.display.darkmode.DarkModeSettingsFragment;
@@ -313,7 +314,8 @@ public class SettingsGateway { 
            MediaControlsSettings.class.getName(),

            NetworkProviderSettings.class.getName(),

            AlarmsAndRemindersDetails.class.getName(),

            MediaManagementAppsDetails.class.getName()

            MediaManagementAppsDetails.class.getName(),

            AutoBrightnessSettings.class.getName()

    };



    public static final String[] SETTINGS_FOR_RESTRICTED = {
@@ -344,6 +346,8 @@ public class SettingsGateway { 
            Settings.ConfigureNotificationSettingsActivity.class.getName(),

            Settings.ManageApplicationsActivity.class.getName(),

            Settings.PaymentSettingsActivity.class.getName(),

            // Home page > Display

            Settings.AdaptiveBrightnessActivity.class.getName(),

            // Home page > Security & screen lock

            Settings.LocationSettingsActivity.class.getName(),

            // Home page > System