psmattas/android_packages_apps_Cherish
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[SQUASH]Revert "Cherish:AOKP custom system animations [2/2]"

Browse Source 
Revert "AOKP animations: Add and entry for TRANSIT_TASK_OPEN_BEHIND"

This reverts commit b56864fef9.

Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>

Revert "Cherish:AOKP custom system animations [2/2]"

This reverts commit 608b76ded5.

causing crash & freeze if using Bubbles

Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
This commit is contained in:
Hưng Phan
2021-02-17 16:22:39 +07:00
parent 39bde07eb4
commit 9792412040
3 changed files with 2 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
res/values/cherish_strings.xml
View File

@@ -532,25 +532,6 @@
<string name="lockscreen_weather_omni_style_title">Omni style</string>
<string name="lockscreen_weather_pixel_style_title">Pixel style</string>
<!-- AOKP custom system animations -->
<string name="animation_settings_title">Animations</string>
<string name="animation_settings_summary">System Wide Animation Options</string>
<string name="animation_title">Animations</string>
<string name="system_animation_title">System Animations</string>
<string name="activity_open_title">Activity open animation</string>
<string name="activity_close_title">Activity close animation</string>
<string name="task_open_title">Task open animation</string>
<string name="task_open_behind_title">Task open behind animation</string>
<string name="task_close_title">Task close animation</string>
<string name="task_move_to_front_title">Move to front animation</string>
<string name="task_move_to_back_title">Move to back animation</string>
<string name="wallpaper_open_title">Wallpaper open animation</string>
<string name="wallpaper_close_title">Wallpaper close animation</string>
<string name="wallpaper_intra_open_title">Wallpaper intra open animation</string>
<string name="wallpaper_intra_close_title">Wallpaper intra close animation</string>
<string name="animation_duration_title">Animation duration</string>
<string name="animation_duration_default">Default</string>
<!-- Toast Animation -->
<string name="toast_animation_title">Toast animation</string>
<string name="toast_none_animation">None</string>

64
res/xml/cherish_settings_animations.xml
View File

@@ -20,70 +20,6 @@
android:title="@string/animations_title"
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings" >
<PreferenceCategory
android:title="@string/system_animation_title">
<com.cherish.settings.preferences.CustomSeekBarPreference
android:key="animation_duration"
android:max="1500"
android:persistent="false"
android:title="@string/animation_duration_title"
settings:min="0"
settings:units="ms"
settings:interval="50"/>
<com.cherish.settings.preferences.GlobalSettingSwitchPreference
android:key="disable_transition_animations"
android:title="@string/disable_transition_animations_title"
android:summary="@string/disable_transition_animations_summary"
android:defaultValue="false" />
<ListPreference
android:key="activity_open"
android:title="@string/activity_open_title" />
<ListPreference
android:key="activity_close"
android:title="@string/activity_close_title" />
<ListPreference
android:key="task_open"
android:title="@string/task_open_title" />
<ListPreference
android:key="task_open_behind"
android:title="@string/task_open_behind_title" />
<ListPreference
android:key="task_close"
android:title="@string/task_close_title" />
<ListPreference
android:key="task_move_to_front"
android:title="@string/task_move_to_front_title" />
<ListPreference
android:key="task_move_to_back"
android:title="@string/task_move_to_back_title" />
<ListPreference
android:key="wallpaper_open"
android:title="@string/wallpaper_open_title" />
<ListPreference
android:key="wallpaper_close"
android:title="@string/wallpaper_close_title" />
<ListPreference
android:key="wallpaper_intra_open"
android:title="@string/wallpaper_intra_open_title" />
<ListPreference
android:key="wallpaper_intra_close"
android:title="@string/wallpaper_intra_close_title" />
</PreferenceCategory>
<ListPreference
android:key="pref_scrollingcache"
android:dialogTitle="@string/pref_scrollingcache_title"

188
src/com/cherish/settings/fragments/AnimationsSettings.java
View File

@@ -40,7 +40,6 @@ import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.util.cherish.AwesomeAnimationHelper;
import com.cherish.settings.preferences.CustomSeekBarPreference;
@@ -52,42 +51,18 @@ import java.util.List;
public class AnimationsSettings extends SettingsPreferenceFragment
implements OnPreferenceChangeListener {
private static final String ACTIVITY_OPEN = "activity_open";
private static final String ACTIVITY_CLOSE = "activity_close";
private static final String TASK_OPEN = "task_open";
private static final String TASK_OPEN_BEHIND = "task_open_behind";
private static final String TASK_CLOSE = "task_close";
private static final String TASK_MOVE_TO_FRONT = "task_move_to_front";
private static final String TASK_MOVE_TO_BACK = "task_move_to_back";
private static final String WALLPAPER_OPEN = "wallpaper_open";
private static final String WALLPAPER_CLOSE = "wallpaper_close";
private static final String WALLPAPER_INTRA_OPEN = "wallpaper_intra_open";
private static final String WALLPAPER_INTRA_CLOSE = "wallpaper_intra_close";
private static final String KEY_TOAST_ANIMATION = "toast_animation";
private static final String KEY_LISTVIEW_ANIMATION = "listview_animation";
private static final String KEY_LISTVIEW_INTERPOLATOR = "listview_interpolator";
private static final String SCROLLINGCACHE_PREF = "pref_scrollingcache";
private static final String SCROLLINGCACHE_PERSIST_PROP = "persist.sys.scrollingcache";
private static final String SCROLLINGCACHE_DEFAULT = "2";
private static final String ANIMATION_DURATION = "animation_duration";
private static final String KEY_SCREEN_OFF_ANIMATION = "screen_off_animation";
private ListPreference mToastAnimation;
private ListPreference mScrollingCachePref;
private ListPreference mListViewAnimation;
private ListPreference mListViewInterpolator;
private ListPreference mActivityOpenPref;
private ListPreference mActivityClosePref;
private ListPreference mTaskOpenPref;
private ListPreference mTaskOpenBehind;
private ListPreference mTaskClosePref;
private ListPreference mTaskMoveToFrontPref;
private ListPreference mTaskMoveToBackPref;
private ListPreference mWallpaperOpen;
private ListPreference mWallpaperClose;
private ListPreference mWallpaperIntraOpen;
private ListPreference mWallpaperIntraClose;
private CustomSeekBarPreference mAnimationDuration;
private ListPreference mScreenOffAnimation;
private int[] mAnimations;
@@ -135,85 +110,6 @@ public class AnimationsSettings extends SettingsPreferenceFragment
SystemProperties.get(SCROLLINGCACHE_PERSIST_PROP, SCROLLINGCACHE_DEFAULT)));
mScrollingCachePref.setOnPreferenceChangeListener(this);
mAnimations = AwesomeAnimationHelper.getAnimationsList();
int animqty = mAnimations.length;
mAnimationsStrings = new String[animqty];
mAnimationsNum = new String[animqty];
for (int i = 0; i < animqty; i++) {
mAnimationsStrings[i] = AwesomeAnimationHelper.getProperName(mContext, mAnimations[i]);
mAnimationsNum[i] = String.valueOf(mAnimations[i]);
}
mAnimationDuration = (CustomSeekBarPreference) findPreference(ANIMATION_DURATION);
mAnimationDuration.setValue(Settings.Global.getInt(resolver, Settings.Global.ANIMATION_CONTROLS_DURATION, 0));
mAnimationDuration.setOnPreferenceChangeListener(this);
mActivityOpenPref = (ListPreference) findPreference(ACTIVITY_OPEN);
mActivityOpenPref.setOnPreferenceChangeListener(this);
mActivityOpenPref.setSummary(getProperSummary(mActivityOpenPref));
mActivityOpenPref.setEntries(mAnimationsStrings);
mActivityOpenPref.setEntryValues(mAnimationsNum);
mActivityClosePref = (ListPreference) findPreference(ACTIVITY_CLOSE);
mActivityClosePref.setOnPreferenceChangeListener(this);
mActivityClosePref.setSummary(getProperSummary(mActivityClosePref));
mActivityClosePref.setEntries(mAnimationsStrings);
mActivityClosePref.setEntryValues(mAnimationsNum);
mTaskOpenPref = (ListPreference) findPreference(TASK_OPEN);
mTaskOpenPref.setOnPreferenceChangeListener(this);
mTaskOpenPref.setSummary(getProperSummary(mTaskOpenPref));
mTaskOpenPref.setEntries(mAnimationsStrings);
mTaskOpenPref.setEntryValues(mAnimationsNum);
mTaskOpenBehind = (ListPreference) findPreference(TASK_OPEN_BEHIND);
mTaskOpenBehind.setOnPreferenceChangeListener(this);
mTaskOpenBehind.setSummary(getProperSummary(mTaskOpenBehind));
mTaskOpenBehind.setEntries(mAnimationsStrings);
mTaskOpenBehind.setEntryValues(mAnimationsNum);
mTaskClosePref = (ListPreference) findPreference(TASK_CLOSE);
mTaskClosePref.setOnPreferenceChangeListener(this);
mTaskClosePref.setSummary(getProperSummary(mTaskClosePref));
mTaskClosePref.setEntries(mAnimationsStrings);
mTaskClosePref.setEntryValues(mAnimationsNum);
mTaskMoveToFrontPref = (ListPreference) findPreference(TASK_MOVE_TO_FRONT);
mTaskMoveToFrontPref.setOnPreferenceChangeListener(this);
mTaskMoveToFrontPref.setSummary(getProperSummary(mTaskMoveToFrontPref));
mTaskMoveToFrontPref.setEntries(mAnimationsStrings);
mTaskMoveToFrontPref.setEntryValues(mAnimationsNum);
mTaskMoveToBackPref = (ListPreference) findPreference(TASK_MOVE_TO_BACK);
mTaskMoveToBackPref.setOnPreferenceChangeListener(this);
mTaskMoveToBackPref.setSummary(getProperSummary(mTaskMoveToBackPref));
mTaskMoveToBackPref.setEntries(mAnimationsStrings);
mTaskMoveToBackPref.setEntryValues(mAnimationsNum);
mWallpaperOpen = (ListPreference) findPreference(WALLPAPER_OPEN);
mWallpaperOpen.setOnPreferenceChangeListener(this);
mWallpaperOpen.setSummary(getProperSummary(mWallpaperOpen));
mWallpaperOpen.setEntries(mAnimationsStrings);
mWallpaperOpen.setEntryValues(mAnimationsNum);
mWallpaperClose = (ListPreference) findPreference(WALLPAPER_CLOSE);
mWallpaperClose.setOnPreferenceChangeListener(this);
mWallpaperClose.setSummary(getProperSummary(mWallpaperClose));
mWallpaperClose.setEntries(mAnimationsStrings);
mWallpaperClose.setEntryValues(mAnimationsNum);
mWallpaperIntraOpen = (ListPreference) findPreference(WALLPAPER_INTRA_OPEN);
mWallpaperIntraOpen.setOnPreferenceChangeListener(this);
mWallpaperIntraOpen.setSummary(getProperSummary(mWallpaperIntraOpen));
mWallpaperIntraOpen.setEntries(mAnimationsStrings);
mWallpaperIntraOpen.setEntryValues(mAnimationsNum);
mWallpaperIntraClose = (ListPreference) findPreference(WALLPAPER_INTRA_CLOSE);
mWallpaperIntraClose.setOnPreferenceChangeListener(this);
mWallpaperIntraClose.setSummary(getProperSummary(mWallpaperIntraClose));
mWallpaperIntraClose.setEntries(mAnimationsStrings);
mWallpaperIntraClose.setEntryValues(mAnimationsNum);
mScreenOffAnimation = (ListPreference) findPreference(KEY_SCREEN_OFF_ANIMATION);
int screenOffAnimation = Settings.System.getInt(getContentResolver(),
Settings.System.SCREEN_OFF_ANIMATION, 0);
@@ -230,8 +126,6 @@ public class AnimationsSettings extends SettingsPreferenceFragment
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
ContentResolver resolver = getActivity().getContentResolver();
boolean result = false;
if (preference == mToastAnimation) {
int index = mToastAnimation.findIndexOfValue((String) newValue);
Settings.Global.putString(getContentResolver(), Settings.Global.TOAST_ANIMATION, (String) newValue);
@@ -264,85 +158,7 @@ public class AnimationsSettings extends SettingsPreferenceFragment
SystemProperties.set(SCROLLINGCACHE_PERSIST_PROP, (String) newValue);
}
return true;
} else if (preference == mActivityOpenPref) {
int val = Integer.parseInt((String) newValue);
result = Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.ACTIVITY_ANIMATION_CONTROLS[0], val);
} else if (preference == mActivityClosePref) {
int val = Integer.parseInt((String) newValue);
result = Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.ACTIVITY_ANIMATION_CONTROLS[1], val);
} else if (preference == mTaskOpenPref) {
int val = Integer.parseInt((String) newValue);
result = Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.ACTIVITY_ANIMATION_CONTROLS[2], val);
} else if (preference == mTaskClosePref) {
int val = Integer.parseInt((String) newValue);
result = Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.ACTIVITY_ANIMATION_CONTROLS[3], val);
} else if (preference == mTaskMoveToFrontPref) {
int val = Integer.parseInt((String) newValue);
result = Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.ACTIVITY_ANIMATION_CONTROLS[4], val);
} else if (preference == mTaskMoveToBackPref) {
int val = Integer.parseInt((String) newValue);
result = Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.ACTIVITY_ANIMATION_CONTROLS[5], val);
} else if (preference == mWallpaperOpen) {
int val = Integer.parseInt((String) newValue);
result = Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.ACTIVITY_ANIMATION_CONTROLS[6], val);
} else if (preference == mWallpaperClose) {
int val = Integer.parseInt((String) newValue);
result = Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.ACTIVITY_ANIMATION_CONTROLS[7], val);
} else if (preference == mWallpaperIntraOpen) {
int val = Integer.parseInt((String) newValue);
result = Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.ACTIVITY_ANIMATION_CONTROLS[8], val);
} else if (preference == mWallpaperIntraClose) {
int val = Integer.parseInt((String) newValue);
result = Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.ACTIVITY_ANIMATION_CONTROLS[9], val);
} else if (preference == mTaskOpenBehind) {
int val = Integer.parseInt((String) newValue);
result = Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.ACTIVITY_ANIMATION_CONTROLS[10], val);
} else if (preference == mAnimationDuration) {
int val = (Integer) newValue;
Settings.Global.putInt(getContentResolver(), Settings.Global.ANIMATION_CONTROLS_DURATION, val);
return true;
}
preference.setSummary(getProperSummary(preference));
return result;
}
private String getProperSummary(Preference preference) {
String mString = "";
if (preference == mActivityOpenPref) {
mString = Settings.Global.ACTIVITY_ANIMATION_CONTROLS[0];
} else if (preference == mActivityClosePref) {
mString = Settings.Global.ACTIVITY_ANIMATION_CONTROLS[1];
} else if (preference == mTaskOpenPref) {
mString = Settings.Global.ACTIVITY_ANIMATION_CONTROLS[2];
} else if (preference == mTaskClosePref) {
mString = Settings.Global.ACTIVITY_ANIMATION_CONTROLS[3];
} else if (preference == mTaskMoveToFrontPref) {
mString = Settings.Global.ACTIVITY_ANIMATION_CONTROLS[4];
} else if (preference == mTaskMoveToBackPref) {
mString = Settings.Global.ACTIVITY_ANIMATION_CONTROLS[5];
} else if (preference == mWallpaperOpen) {
mString = Settings.Global.ACTIVITY_ANIMATION_CONTROLS[6];
} else if (preference == mWallpaperClose) {
mString = Settings.Global.ACTIVITY_ANIMATION_CONTROLS[7];
} else if (preference == mWallpaperIntraOpen) {
mString = Settings.Global.ACTIVITY_ANIMATION_CONTROLS[8];
} else if (preference == mWallpaperIntraClose) {
mString = Settings.Global.ACTIVITY_ANIMATION_CONTROLS[9];
} else if (preference == mTaskOpenBehind) {
mString = Settings.Global.ACTIVITY_ANIMATION_CONTROLS[10];
}
int mNum = Settings.Global.getInt(mContext.getContentResolver(), mString, 0);
return mAnimationsStrings[mNum];
}
return false;
}
}