Add ResultPayload for always-on ambient display.

Bug: 62022517
Test: robotest
Change-Id: Ib6382030ffa0c159ab6ca4b45dd966ee9287181f
Merged-In: Ib4ee4d8d999e5a1f9edf34ea6068644b41fc4838
This commit is contained in:
Andrew Sapperstein
2017-07-22 16:22:49 -07:00
parent 6fcc38975c
commit eb1a45b95b
2 changed files with 55 additions and 6 deletions

View File

@@ -15,21 +15,26 @@
*/
package com.android.settings.display;
import static android.provider.Settings.Secure.DOZE_ALWAYS_ON;
import android.content.Context;
import android.content.Intent;
import android.os.UserHandle;
import android.provider.Settings;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import com.android.internal.hardware.AmbientDisplayConfiguration;
import com.android.settings.R;
import com.android.settings.core.PreferenceController;
import com.android.settings.search.DatabaseIndexingUtils;
import com.android.settings.search.InlineSwitchPayload;
import com.android.settings.search.ResultPayload;
public class AmbientDisplayAlwaysOnPreferenceController extends PreferenceController
implements Preference.OnPreferenceChangeListener {
private final int ON = 1;
private final int OFF = 0;
private static final String KEY_ALWAYS_ON = "ambient_display_always_on";
private static final int MY_USER = UserHandle.myUserId();
@@ -59,8 +64,9 @@ public class AmbientDisplayAlwaysOnPreferenceController extends PreferenceContro
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
int enabled = (boolean) newValue ? 1 : 0;
Settings.Secure.putInt(mContext.getContentResolver(), DOZE_ALWAYS_ON, enabled);
int enabled = (boolean) newValue ? ON : OFF;
Settings.Secure.putInt(
mContext.getContentResolver(), Settings.Secure.DOZE_ALWAYS_ON, enabled);
if (mCallback != null) {
mCallback.onPreferenceChanged();
}
@@ -71,4 +77,14 @@ public class AmbientDisplayAlwaysOnPreferenceController extends PreferenceContro
public boolean isAvailable() {
return mConfig.alwaysOnAvailable();
}
@Override
public ResultPayload getResultPayload() {
final Intent intent = DatabaseIndexingUtils.buildSubsettingIntent(mContext,
AmbientDisplaySettings.class.getName(), KEY_ALWAYS_ON,
mContext.getString(R.string.ambient_display_screen_title));
return new InlineSwitchPayload(Settings.Secure.DOZE_ALWAYS_ON,
ResultPayload.SettingsSource.SECURE, ON, intent, isAvailable());
}
}