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

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

Merge "[Catalyst] Add more constants to SettingsContract" into main

parents 1d71ed9d ef3b2325

src/com/android/settings/contract/SettingsContract.kt

+12 −0
Original line number Diff line number Diff line
@@ -33,5 +33,17 @@ const val KEY_LOCATION = SettingsSlicesContract.KEY_LOCATION 
/** Contract key for the "Wi-fi" setting. */

const val KEY_WIFI = SettingsSlicesContract.KEY_WIFI



/** Contract key for the "Use Wi-Fi calling" setting. */

const val KEY_WIFI_CALLING = "wifi_calling"



/** Contract key for the "Use Data Saver" setting. */

const val KEY_DATA_SAVER = "data_saver"



/** Contract key for the "Mobile data" setting. */

const val KEY_MOBILE_DATA = "mobile_data"



/** Contract key for the "Adaptive brightness" setting. */

const val KEY_ADAPTIVE_BRIGHTNESS = "auto_brightness"



/** Contract key for the "Screen attention" setting. */

const val KEY_SCREEN_ATTENTION = "screen_attention"

src/com/android/settings/slices/CustomSliceRegistry.java

+2 −2
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ public class CustomSliceRegistry { 
            .scheme(ContentResolver.SCHEME_CONTENT)

            .authority(SettingsSliceProvider.SLICE_AUTHORITY)

            .appendEncodedPath(SettingsSlicesContract.PATH_SETTING_ACTION)

            .appendPath("mobile_data")

            .appendPath(SettingsContractKt.KEY_MOBILE_DATA)

            .build();



    /**
@@ -220,7 +220,7 @@ public class CustomSliceRegistry { 
            .scheme(ContentResolver.SCHEME_CONTENT)

            .authority(SettingsSliceProvider.SLICE_AUTHORITY)

            .appendPath(SettingsSlicesContract.PATH_SETTING_INTENT)

            .appendPath(WifiCallingSliceHelper.PATH_WIFI_CALLING)

            .appendPath(SettingsContractKt.KEY_WIFI_CALLING)

            .build();

    /**

     * Full {@link Uri} for the Wifi Calling Preference Slice.

src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java

+0 −5
Original line number Diff line number Diff line
@@ -63,11 +63,6 @@ public class WifiCallingSliceHelper { 


    private static final String TAG = "WifiCallingSliceHelper";



    /**

     * Settings slice path to wifi calling setting.

     */

    public static final String PATH_WIFI_CALLING = "wifi_calling";



    /**

     * Settings slice path to wifi calling preference setting.

     */