PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Screen Attention and Screen timeout Settings.

Browse Source 
Bug: 155051311
Test: atest
Change-Id: I6f6ee52618eab629a41b28982be32ead5f9ba08d
This commit is contained in:
Yi Jiang
2020-09-10 14:26:51 -07:00
parent e94d2581f8
commit f5d1841c9d
17 changed files with 661 additions and 541 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/slices/CustomSliceRegistry.java
View File

@@ -26,8 +26,8 @@ import android.util.ArrayMap;
import androidx.annotation.VisibleForTesting;
import com.android.settings.display.AdaptiveSleepPreferenceController;
import com.android.settings.display.AlwaysOnDisplaySlice;
import com.android.settings.display.ScreenTimeoutPreferenceController;
import com.android.settings.flashlight.FlashlightSlice;
import com.android.settings.fuelgauge.batterytip.BatteryTipPreferenceController;
import com.android.settings.homepage.contextualcards.deviceinfo.StorageSlice;
@@ -63,7 +63,7 @@ public class CustomSliceRegistry {
.scheme(ContentResolver.SCHEME_CONTENT)
.authority(SettingsSliceProvider.SLICE_AUTHORITY)
.appendPath(SettingsSlicesContract.PATH_SETTING_INTENT)
.appendPath(AdaptiveSleepPreferenceController.PREF_NAME)
.appendPath(ScreenTimeoutPreferenceController.PREF_NAME)
.build();
/**