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

AOKP animations: Add and entry for TRANSIT_TASK_OPEN_BEHIND

Browse Source 
Already in frameworks/base. Option was just missing from Settings

Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
This commit is contained in:
cristianomatos
2018-09-13 21:03:29 +05:30
committed by Hưng Phan
parent f588acecab
commit b56864fef9
3 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/values/cherish_strings.xml
View File

@@ -551,6 +551,7 @@
<string name="activity_open_title">Activity open animation</string> <string name="activity_open_title">Activity open animation</string>
<string name="activity_close_title">Activity close animation</string> <string name="activity_close_title">Activity close animation</string>
<string name="task_open_title">Task open 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_close_title">Task close animation</string>
<string name="task_move_to_front_title">Move to front 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="task_move_to_back_title">Move to back animation</string>

4
res/xml/cherish_settings_animations.xml
View File

@@ -35,6 +35,10 @@
android:key="task_open" android:key="task_open"
android:title="@string/task_open_title" /> android:title="@string/task_open_title" />
<ListPreference
android:key="task_open_behind"
android:title="@string/task_open_behind_title" />
<ListPreference <ListPreference
android:key="task_close" android:key="task_close"
android:title="@string/task_close_title" /> android:title="@string/task_close_title" />

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

@@ -53,6 +53,7 @@ public class AnimationsSettings extends SettingsPreferenceFragment
private static final String ACTIVITY_OPEN = "activity_open"; private static final String ACTIVITY_OPEN = "activity_open";
private static final String ACTIVITY_CLOSE = "activity_close"; private static final String ACTIVITY_CLOSE = "activity_close";
private static final String TASK_OPEN = "task_open"; 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_CLOSE = "task_close";
private static final String TASK_MOVE_TO_FRONT = "task_move_to_front"; 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 TASK_MOVE_TO_BACK = "task_move_to_back";
@@ -71,6 +72,7 @@ public class AnimationsSettings extends SettingsPreferenceFragment
ListPreference mActivityOpenPref; ListPreference mActivityOpenPref;
ListPreference mActivityClosePref; ListPreference mActivityClosePref;
ListPreference mTaskOpenPref; ListPreference mTaskOpenPref;
ListPreference mTaskOpenBehind;
ListPreference mTaskClosePref; ListPreference mTaskClosePref;
ListPreference mTaskMoveToFrontPref; ListPreference mTaskMoveToFrontPref;
ListPreference mTaskMoveToBackPref; ListPreference mTaskMoveToBackPref;
@@ -146,6 +148,12 @@ public class AnimationsSettings extends SettingsPreferenceFragment
mTaskOpenPref.setEntries(mAnimationsStrings); mTaskOpenPref.setEntries(mAnimationsStrings);
mTaskOpenPref.setEntryValues(mAnimationsNum); 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 = (ListPreference) findPreference(TASK_CLOSE);
mTaskClosePref.setOnPreferenceChangeListener(this); mTaskClosePref.setOnPreferenceChangeListener(this);
mTaskClosePref.setSummary(getProperSummary(mTaskClosePref)); mTaskClosePref.setSummary(getProperSummary(mTaskClosePref));
@@ -260,6 +268,10 @@ public class AnimationsSettings extends SettingsPreferenceFragment
int val = Integer.parseInt((String) newValue); int val = Integer.parseInt((String) newValue);
result = Settings.Global.putInt(mContext.getContentResolver(), result = Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.ACTIVITY_ANIMATION_CONTROLS[9], val); 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);
} }
preference.setSummary(getProperSummary(preference)); preference.setSummary(getProperSummary(preference));
return result; return result;
@@ -287,6 +299,8 @@ public class AnimationsSettings extends SettingsPreferenceFragment
mString = Settings.Global.ACTIVITY_ANIMATION_CONTROLS[8]; mString = Settings.Global.ACTIVITY_ANIMATION_CONTROLS[8];
} else if (preference == mWallpaperIntraClose) { } else if (preference == mWallpaperIntraClose) {
mString = Settings.Global.ACTIVITY_ANIMATION_CONTROLS[9]; 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); int mNum = Settings.Global.getInt(mContext.getContentResolver(), mString, 0);
return mAnimationsStrings[mNum]; return mAnimationsStrings[mNum];