Cherish:CleanUp FOD
Revert "Cherish: Reorganize FOD animations" This reverts commit6d777e2d32. Revert "Cherish: Add Cherish FOD icons [2/2]" This reverts commitdfdb9fdaec. Revert "Cherish: add even more FOD icons [2/2]" This reverts commit13fa45dc48. Revert "Cherish: add more FOD animations [2/2]" This reverts commitc86a947fea. Revert "Cherish: add more FOD icons [2/2]" This reverts commitf75f9eea7a. Revert "Cherish: [SQUASH] Recognizing FP animation effects [2/2]" This reverts commit38f2036356. Revert "Cherish: FOD pressed colors [2/2]" This reverts commitdf36803f09. Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com> Revert "[SQUASH] Cherish: FOD icon picker [2/2]" This reverts commitd5de3f33af. Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com> Revert "Cherish: Add OP8T Cyberpunk 2077 FOD animation [2/2]" This reverts commite2f423252b. Revert "Cherish:Hide FOD Animations preferences if device does not support it" This reverts commitb5a1f3958b. Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com> Revert "Cherish:Add recognizing FP animation effects and Recognizing fingerprint animation [2/2]" This reverts commitc8a471c53d. Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com> Revert "Cherish: Add more FOD icons [2/2]" This reverts commitbdde870e34. Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com> Revert "Cherish: FOD icon picker [2/2]" This reverts commit814c31b7b0. Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
This commit is contained in:
@@ -1,47 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2019-2020 The Evolution X Project
|
||||
*
|
||||
* 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.cherish.settings.fragments;
|
||||
|
||||
import android.content.res.Resources;
|
||||
import android.os.Bundle;
|
||||
import android.provider.Settings;
|
||||
|
||||
import androidx.preference.Preference;
|
||||
import androidx.preference.PreferenceCategory;
|
||||
import androidx.preference.PreferenceScreen;
|
||||
|
||||
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.SettingsPreferenceFragment;
|
||||
|
||||
public class FODIconPickerFragment extends SettingsPreferenceFragment {
|
||||
|
||||
@Override
|
||||
public void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
|
||||
addPreferencesFromResource(R.xml.cherish_settings_fod_picker);
|
||||
|
||||
getActivity().getActionBar().setTitle(R.string.fod_icon_picker_title);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMetricsCategory() {
|
||||
return MetricsEvent.CHERISH_SETTINGS;
|
||||
}
|
||||
}
|
||||
@@ -53,8 +53,6 @@ public class LockScreenSettings extends SettingsPreferenceFragment implements
|
||||
private static final String CUSTOM_TEXT_CLOCK_FONT_SIZE = "custom_text_clock_font_size";
|
||||
private static final String DATE_FONT_SIZE = "lockdate_font_size";
|
||||
private static final String LOCKOWNER_FONT_SIZE = "lockowner_font_size";
|
||||
private static final String KEY_FOD_RECOGNIZING_ANIMATION = "fod_recognizing_animation";
|
||||
private static final String KEY_FOD_RECOGNIZING_ANIMATION_LIST = "fod_recognizing_animation_list";
|
||||
private static final String AOD_SCHEDULE_KEY = "always_on_display_schedule";
|
||||
|
||||
static final int MODE_DISABLED = 0;
|
||||
@@ -102,14 +100,6 @@ public class LockScreenSettings extends SettingsPreferenceFragment implements
|
||||
Settings.System.CUSTOM_TEXT_CLOCK_FONT_SIZE, 40));
|
||||
mCustomTextClockFontSize.setOnPreferenceChangeListener(this);
|
||||
|
||||
SystemSettingSwitchPreference mFODSwitchPref = (SystemSettingSwitchPreference) findPreference(KEY_FOD_RECOGNIZING_ANIMATION);
|
||||
SystemSettingListPreference mFODListViewPref = (SystemSettingListPreference) findPreference(KEY_FOD_RECOGNIZING_ANIMATION_LIST);
|
||||
|
||||
if (!resources.getBoolean(R.bool.config_showFODAnimationSettings)){
|
||||
prefScreen.removePreference(mFODSwitchPref);
|
||||
prefScreen.removePreference(mFODListViewPref);
|
||||
}
|
||||
|
||||
mAODPref = findPreference(AOD_SCHEDULE_KEY);
|
||||
updateAlwaysOnSummary();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user