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

Merge Ambient display into Lockscreen settings.

Browse Source 
And remove the entry point from security page. Now we only have 1 entry
point from Display page.

Change-Id: I06bc15a6fd8802a4918d8772af2722d5aafa332e
Fixes: 71892510
Test: robotests
This commit is contained in:
Fan Zhang
2018-05-11 17:49:39 -07:00
parent b976044f57
commit 30d4d015b5
18 changed files with 184 additions and 507 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
View File

@@ -26,6 +26,7 @@ import com.android.settings.core.TogglePreferenceController;
import com.android.settings.search.DatabaseIndexingUtils;
import com.android.settings.search.InlineSwitchPayload;
import com.android.settings.search.ResultPayload;
import com.android.settings.security.LockscreenDashboardFragment;
public class AmbientDisplayAlwaysOnPreferenceController extends TogglePreferenceController {
@@ -96,7 +97,7 @@ public class AmbientDisplayAlwaysOnPreferenceController extends TogglePreference
@Override
public ResultPayload getResultPayload() {
final Intent intent = DatabaseIndexingUtils.buildSearchResultPageIntent(mContext,
AmbientDisplaySettings.class.getName(), getPreferenceKey(),
LockscreenDashboardFragment.class.getName(), getPreferenceKey(),
mContext.getString(R.string.ambient_display_screen_title));
return new InlineSwitchPayload(Settings.Secure.DOZE_ALWAYS_ON,