-
Notifications
You must be signed in to change notification settings - Fork 15
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "Ambient Play settings improvements"
This reverts commit 4d87090.
- Loading branch information
1 parent
c9aaa77
commit c336985
Showing
9 changed files
with
185 additions
and
177 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
77 changes: 77 additions & 0 deletions
77
src/com/android/settings/liquid/AmbientPlayKeyguardPreferenceController.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| /* | ||
| * Copyright (C) 2016 The Android Open Source Project | ||
| * Copyright (C) 2017 CypherOS | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.android.settings.liquid; | ||
|
|
||
| import android.content.Context; | ||
| import android.provider.Settings; | ||
| import android.support.v14.preference.SwitchPreference; | ||
| import android.support.v7.preference.Preference; | ||
|
|
||
| import com.android.settings.core.PreferenceControllerMixin; | ||
| import com.android.settings.overlay.FeatureFactory; | ||
| import com.android.settings.R; | ||
| import com.android.settingslib.core.AbstractPreferenceController; | ||
| import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| import static android.provider.Settings.Secure.AMBIENT_RECOGNITION_KEYGUARD; | ||
|
|
||
| import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_AMBIENT_DISPLAY; | ||
|
|
||
| public class AmbientPlayKeyguardPreferenceController extends AbstractPreferenceController implements | ||
| PreferenceControllerMixin, Preference.OnPreferenceChangeListener { | ||
|
|
||
| private static final String KEY_AMBIENT_DISPLAY_AMBIENT_PLAY_KEYGUARD = "ambient_display_ambient_play_keyguard"; | ||
|
|
||
| private final MetricsFeatureProvider mMetricsFeatureProvider; | ||
|
|
||
| public AmbientPlayKeyguardPreferenceController(Context context) { | ||
| super(context); | ||
| mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isAvailable() { | ||
| return true; | ||
| } | ||
|
|
||
| @Override | ||
| public String getPreferenceKey() { | ||
| return KEY_AMBIENT_DISPLAY_AMBIENT_PLAY_KEYGUARD; | ||
| } | ||
|
|
||
| @Override | ||
| public void updateState(Preference preference) { | ||
| int value = Settings.Secure.getInt(mContext.getContentResolver(), AMBIENT_RECOGNITION_KEYGUARD, 1); | ||
| ((SwitchPreference) preference).setChecked(value != 0); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean onPreferenceChange(Preference preference, Object newValue) { | ||
| final boolean enabled = (boolean) newValue; | ||
| Settings.Secure.putInt(mContext.getContentResolver(), | ||
| Settings.Secure.AMBIENT_RECOGNITION_KEYGUARD, enabled ? 1 : 0); | ||
| return true; | ||
| } | ||
|
|
||
| @Override | ||
| public void updateNonIndexableKeys(List<String> keys) { | ||
| keys.add(getPreferenceKey()); | ||
| } | ||
| } |
Oops, something went wrong.